[quarkplayer] r1439 committed - Improve FilesTypes, lossy formats have the priority: matters in the ca...
quark...@googlecode.com
Author: tkrotoff
Date: Sat Feb 26 03:57:34 2011
Log: Improve FilesTypes, lossy formats have the priority: matters in the
case of .m4a (these stupid asses gave the same file extension for ALAC and
AAC)
http://code.google.com/p/quarkplayer/source/detail?r=1439
Modified:
/trunk/libs/FileTypes/FileType.h
/trunk/libs/FileTypes/FileTypes.cpp
=======================================
--- /trunk/libs/FileTypes/FileType.h Fri Aug 13 02:18:04 2010
+++ /trunk/libs/FileTypes/FileType.h Sat Feb 26 03:57:34 2011
@@ -69,6 +69,18 @@
//Audio
+ //Lossy audio
+ MP2,
+ MP3,
+ Speex,
+ Vorbis,
+ AAC,
+ MPC,
+ VQF,
+ RealAudio,
+ MID,
+ MOD,
+
//Lossless audio
AIFF,
AU,
@@ -81,18 +93,7 @@
WavPack,
WMA,
OptimFROG,
-
- //Lossy audio
- MP2,
- MP3,
- Speex,
- Vorbis,
- AAC,
- MPC,
- VQF,
- RealAudio,
- MID,
- MOD,
+ Shorten,
//Playlist
ASX,
=======================================
--- /trunk/libs/FileTypes/FileTypes.cpp Fri Aug 13 02:18:04 2010
+++ /trunk/libs/FileTypes/FileTypes.cpp Sat Feb 26 03:57:34 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -24,7 +24,7 @@
#include <QtCore/QFileInfo>
#include <QtCore/QSet>
-static const int FILETYPELIST_SIZE = 63;
+static const int FILETYPELIST_SIZE = 64;
//See http://en.wikipedia.org/wiki/List_of_file_formats
static const FileType FILETYPELIST[FILETYPELIST_SIZE] = {
@@ -44,9 +44,9 @@
{ FileType::Video, FileType::MKV, "Matroska
(MKV)", "Matroska", "mkv,mka,mks", "video/x-matroska,audio/x-matroska" },
{ FileType::Video, FileType::MOV, "QuickTime Movie
(MOV)", ".mov", "mov,qt", "video/quicktime" },
{ FileType::Video, FileType::MP4, "MPEG-4 Part 14
(MP4)", "MPEG-4_Part_14", "mp4", "video/mp4" },
- { FileType::Video, FileType::NSV, "Nullsoft Streaming Video
(NSV)", "Nullsoft_Streaming_Video", "nsv", "" },
+ { FileType::Video, FileType::NSV, "Nullsoft Streaming Video
(NSV)", "Nullsoft_Streaming_Video", "nsv", "application/x-winamp" },
{ FileType::Video, FileType::OGM, "Ogg Media
(OGM)", "Ogg_Media", "ogm", "application/ogg,application/x-ogg,video/x-ogg"
},
- { FileType::Video, FileType::Tarkin, "Tarkin", "Tarkin_(codec)", "", "" },
+ { FileType::Video,
FileType::Tarkin, "Tarkin", "Tarkin_(codec)", "", "video/x-ogg-tarkin,application/ogg-tarkin"
},
{ FileType::Video,
FileType::Theora, "Theora", "Theora", "ogv,ogg", "video/ogg,video/x-ogg" },
{ FileType::Video,
FileType::RealMedia, "RealMedia", "RealMedia", "rv,rmvb", "application/vnd.rn-realmedia"
},
{ FileType::Video, FileType::WMV, "Windows Media Video
(WMV)", "Windows_Media_Video", "wmv", "video/x-ms-wmv" },
@@ -61,20 +61,6 @@
//Audio
//See http://en.wikipedia.org/wiki/List_of_file_formats#Sound_and_music
- //Lossless audio
- //See http://en.wikipedia.org/wiki/List_of_file_formats#Lossless_audio
- { FileType::Audio, FileType::AIFF, "Audio Interchange File Format
(AIFF)", "Audio_Interchange_File_Format", "aiff,aif,aifc", "audio/x-aiff,audio/aiff"
},
- { FileType::Audio,
FileType::AU, "Au", "Au_file_format", "au,snd", "audio/basic" },
- { FileType::Audio, FileType::CDDA, "CD Audio
Track", "Red_Book_(audio_CD_standard)", "cda", "" },
- { FileType::Audio, FileType::WAV, "Waveform
(WAV)", "WAV", "wav", "audio/wav,audio/wave,audio/x-wav" },
- { FileType::Audio, FileType::FLAC, "Free Lossless Audio Codec
(FLAC)", "Free_Lossless_Audio_Codec", "flac", "audio/x-flac,audio/x-oggflac"
},
- { FileType::Audio, FileType::AppleLossless, "Apple Lossless
(M4A)", "Apple_Lossless", "m4a", "" },
- { FileType::Audio, FileType::APE, "Monkey's Audio
(APE)", "Monkey's_Audio", "ape", "" },
- { FileType::Audio, FileType::TTA, "True Audio
(TTA)", "TTA_(codec)", "tta", "" },
- { FileType::Audio, FileType::WavPack, "WavPack (WV)", "WavPack", "wv", ""
},
- { FileType::Audio, FileType::WMA, "Windows Media Audio
(WMA)", "Windows_Media_Audio", "wma", "audio/x-ms-wma" },
- { FileType::Audio,
FileType::OptimFROG, "OptimFROG", "OptimFROG", "ofr", "application/octet-stream"
},
-
//Lossy audio
//See http://en.wikipedia.org/wiki/List_of_file_formats#Lossy_audio
{ FileType::Audio, FileType::MP2, "MPEG-1 Audio Layer 2
(MP2)", "MPEG-1_Audio_Layer_II", "mp2", "audio/mpeg" },
@@ -82,12 +68,27 @@
{ FileType::Audio,
FileType::Speex, "Speex", "Speex", "spx", "audio/speex" },
{ FileType::Audio,
FileType::Vorbis, "Vorbis", "Vorbis", "ogg,oga", "audio/ogg,audio/x-ogg,audio/vorbis"
},
{ FileType::Audio, FileType::AAC, "Advanced Audio Coding
(AAC)", "Advanced_Audio_Coding", "m4a,m4b,m4p,m4v,m4r,3gp,mp4,aac", "audio/aac,audio/aacp"
},
+ { FileType::Audio, FileType::WMA, "Windows Media Audio
(WMA)", "Windows_Media_Audio", "wma", "audio/x-ms-wma" },
{ FileType::Audio, FileType::MPC, "Musepack
(MPC)", "Musepack", "mpc,mp+,mpp", "audio/x-musepack,audio/musepack" },
- { FileType::Audio, FileType::VQF, "TwinVQ (VQF)", "TwinVQ", "vqf", "" },
+ { FileType::Audio, FileType::VQF, "TwinVQ
(VQF)", "TwinVQ", "vqf", "audio/x-twinvq" },
{ FileType::Audio,
FileType::RealAudio, "RealAudio", "RealAudio", "ra,ram,rm", "audio/vnd.rn-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudioplugin"
},
{ FileType::Audio, FileType::MID, "MIDI File
(SMF)", "Musical_Instrument_Digital_Interface", "mid,midi", "application/x-midi,audio/midi,audio/x-mid,audio/x-midi"
},
{ FileType::Audio,
FileType::MOD, "MOD", "MOD_(file_format)", "mod", "audio/mod,audio/x-mod" },
+ //Lossless audio
+ //See http://en.wikipedia.org/wiki/List_of_file_formats#Lossless_audio
+ { FileType::Audio, FileType::AIFF, "Audio Interchange File Format
(AIFF)", "Audio_Interchange_File_Format", "aiff,aif,aifc", "audio/x-aiff,audio/aiff"
},
+ { FileType::Audio,
FileType::AU, "Au", "Au_file_format", "au,snd", "audio/basic" },
+ { FileType::Audio, FileType::CDDA, "CD Audio
Track", "Red_Book_(audio_CD_standard)", "cda", "audio/x-cda" },
+ { FileType::Audio, FileType::WAV, "Waveform
(WAV)", "WAV", "wav", "audio/wav,audio/wave,audio/x-wav" },
+ { FileType::Audio, FileType::FLAC, "Free Lossless Audio Codec
(FLAC)", "Free_Lossless_Audio_Codec", "flac", "audio/x-flac,audio/x-oggflac"
},
+ { FileType::Audio, FileType::AppleLossless, "Apple Lossless
(M4A)", "Apple_Lossless", "m4a", "" },
+ { FileType::Audio, FileType::APE, "Monkey's Audio
(APE)", "Monkey's_Audio", "ape", "audio/x-ape,application/x-extension-ape"
},
+ { FileType::Audio, FileType::TTA, "True Audio
(TTA)", "TTA_(codec)", "tta", "audio/x-tta,audio/tta" },
+ { FileType::Audio, FileType::WavPack, "WavPack
(WV)", "WavPack", "wv", "audio/x-wavpack" },
+ { FileType::Audio,
FileType::OptimFROG, "OptimFROG", "OptimFROG", "ofr", "" },
+ { FileType::Audio, FileType::Shorten, "Shorten
(SHN)", "Shorten", "shn", "application/x-shorten" },
+
//Playlist
//See http://en.wikipedia.org/wiki/List_of_file_formats#Playlist_formats
{ FileType::Playlist, FileType::ASX, "Advanced Stream Redirector
(ASX)", "Advanced_Stream_Redirector", "asx,wax,wvx", "video/x-ms-asf" },