Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
This commit is contained in:
vanhofen
2017-05-30 01:27:37 +02:00
37 changed files with 440 additions and 329 deletions

View File

@@ -59,25 +59,28 @@ class CFile
{
FILE_UNKNOWN = 0,
FILE_AAC,
FILE_AVI,
FILE_ASF,
FILE_DIR,
FILE_ISO,
FILE_TEXT,
FILE_AVI,
FILE_BIN_PACKAGE,
FILE_CDR,
FILE_MP3,
FILE_MKV,
FILE_OGG,
FILE_WAV,
FILE_DIR,
FILE_FLAC,
FILE_FLV,
FILE_XML,
FILE_PLAYLIST,
STREAM_AUDIO,
FILE_ISO,
FILE_MKV,
FILE_MP3,
FILE_MPG,
FILE_OGG,
FILE_PICTURE,
STREAM_PICTURE,
FILE_BIN_PACKAGE,
FILE_PKG_PACKAGE
FILE_PKG_PACKAGE,
FILE_PLAYLIST,
FILE_TEXT,
FILE_TS,
FILE_VOB,
FILE_WAV,
FILE_XML,
STREAM_AUDIO,
STREAM_PICTURE
};
FileType getType(void) const;