Reorder enums

This commit is contained in:
Martchus 2018-03-21 20:31:29 +01:00
parent f5bd1dc4e8
commit 20b4cc833f
2 changed files with 12 additions and 12 deletions

View File

@ -37,9 +37,12 @@ enum class GeneralMediaFormat : unsigned int {
Amr, /**< AMR */ Amr, /**< AMR */
Avc, /**< Advanced Video Coding */ Avc, /**< Advanced Video Coding */
Bitmap, /**< Windows Bitmap */ Bitmap, /**< Windows Bitmap */
Daala, /**< Daala ("next-generation video codec" by Xiph) */
Dirac, /**< Dirac */ Dirac, /**< Dirac */
DolbyMlp, /**< Dolby MLP */
Dts, /**< DTS */ Dts, /**< DTS */
DtsHd, /**< DTS-HD */ DtsHd, /**< DTS-HD */
DvbSub, /**< DVBSUB */
EAc3, /**< Dolby Digital Plus */ EAc3, /**< Dolby Digital Plus */
Evrc, /**< EVRC */ Evrc, /**< EVRC */
Flac, /**< FLAC */ Flac, /**< FLAC */
@ -51,19 +54,19 @@ enum class GeneralMediaFormat : unsigned int {
ImageSubtitle, /**< Image subtitle */ ImageSubtitle, /**< Image subtitle */
InteractionStream, /**< Interaction Stream */ InteractionStream, /**< Interaction Stream */
Jpeg, /**< JPEG */ Jpeg, /**< JPEG */
OggKate, /**< Karaoke And Text Encapsulation */
Opus, /**< Opus */
MicrosoftAudioCodecManager, /**< Microsoft Audio Codec Manager (ACM) */ MicrosoftAudioCodecManager, /**< Microsoft Audio Codec Manager (ACM) */
MicrosoftMpeg4, /**< Microsoft MPEG-4 */ MicrosoftMpeg4, /**< Microsoft MPEG-4 */
MicrosoftVideoCodecManager, /**< Microsoft Video Codec Manager (VCM) */ MicrosoftVideoCodecManager, /**< Microsoft Video Codec Manager (VCM) */
DolbyMlp, /**< Dolby MLP */ MonkeysAudio, /**< Monkey's Audio */
Mpc, /**< Musepack */
Mpeg1Audio, /**< MPEG-1 Audio */ Mpeg1Audio, /**< MPEG-1 Audio */
Mpeg1Video, /**< MPEG-1 Vudio */ Mpeg1Video, /**< MPEG-1 Vudio */
Mpeg2Audio, /**< MPEG-2 Audio */ Mpeg2Audio, /**< MPEG-2 Audio */
Mpeg2Video, /**< MPEG-2 Video */ Mpeg2Video, /**< MPEG-2 Video */
Mpeg4Video, /**< MPEG-4 Video */
Mpeg4TimedText, /**< MPEG-4 Timed Text / Streaming text format / Part 17 */ Mpeg4TimedText, /**< MPEG-4 Timed Text / Streaming text format / Part 17 */
Mpc, /**< Musepack */ Mpeg4Video, /**< MPEG-4 Video */
OggKate, /**< Karaoke And Text Encapsulation */
Opus, /**< Opus */
Pcm, /**< Pulse Code Modulation */ Pcm, /**< Pulse Code Modulation */
Png, /**< PNG */ Png, /**< PNG */
ProRes, /**< ProRes */ ProRes, /**< ProRes */
@ -74,6 +77,7 @@ enum class GeneralMediaFormat : unsigned int {
RealVideo, /**< Real Video */ RealVideo, /**< Real Video */
Sa0c, /**< SAOC */ Sa0c, /**< SAOC */
Smv, /**< SMV */ Smv, /**< SMV */
Speex, /**< Speex */
StreamingTextStream, /**< Streaming Text Stream */ StreamingTextStream, /**< Streaming Text Stream */
SynthesizedTextureStream, /**< Synthesized Texture Stream */ SynthesizedTextureStream, /**< Synthesized Texture Stream */
Systems, /**< Systems */ Systems, /**< Systems */
@ -92,10 +96,6 @@ enum class GeneralMediaFormat : unsigned int {
WavPack, /**< WavPack */ WavPack, /**< WavPack */
WindowsMediaAudio, /**< Windows Media Audio */ WindowsMediaAudio, /**< Windows Media Audio */
WindowsMediaVideo, /**< Windows Media Video */ WindowsMediaVideo, /**< Windows Media Video */
DvbSub, /**< DVBSUB */
Speex, /**< Speex */
Daala, /**< Daala ("next-generation video codec" by Xiph) */
MonkeysAudio, /**< Monkey's Audio */
}; };
/*! /*!

View File

@ -36,6 +36,7 @@ enum class ContainerFormat : unsigned int {
Lzip, /**< lz compressed file */ Lzip, /**< lz compressed file */
Lzw, /**< LZW */ Lzw, /**< LZW */
Matroska, /**< Matroska (subset of EBML) */ Matroska, /**< Matroska (subset of EBML) */
MonkeysAudio, /**< Monkey's Audio */
Mp4, /**< MPEG-4 Part 14 (subset of QuickTime container) */ Mp4, /**< MPEG-4 Part 14 (subset of QuickTime container) */
MpegAudioFrames, /**< MPEG-1 Layer 1/2/3 frames */ MpegAudioFrames, /**< MPEG-1 Layer 1/2/3 frames */
Ogg, /**< Ogg */ Ogg, /**< Ogg */
@ -54,14 +55,13 @@ enum class ContainerFormat : unsigned int {
Utf16Text, /**< UTF-16 text */ Utf16Text, /**< UTF-16 text */
Utf32Text, /**< UTF-32 text */ Utf32Text, /**< UTF-32 text */
Utf8Text, /**< UTF-8 text */ Utf8Text, /**< UTF-8 text */
WavPack, /**< WavPack */
Webm, /**< WebM (subset of Matroska) */ Webm, /**< WebM (subset of Matroska) */
WindowsBitmap, /**< Microsoft Windows Bitmap */ WindowsBitmap, /**< Microsoft Windows Bitmap */
WindowsIcon, /**< Microsoft Windows Icon */ WindowsIcon, /**< Microsoft Windows Icon */
Zip, /**< ZIP archive */
Xz, /**< xz compressed file */ Xz, /**< xz compressed file */
YUV4Mpeg2, /**< YUV4MPEG2 */ YUV4Mpeg2, /**< YUV4MPEG2 */
WavPack, /**< WavPack */ Zip, /**< ZIP archive */
MonkeysAudio, /**< Monkey's Audio */
}; };
TAG_PARSER_EXPORT ContainerFormat parseSignature(const char *buffer, int bufferSize); TAG_PARSER_EXPORT ContainerFormat parseSignature(const char *buffer, int bufferSize);