From: Nikolay Tischenko Date: Sat, 5 Mar 2011 14:52:36 +0000 (+0600) Subject: Add M4A to files pattern X-Git-Url: http://git.maemo.org/git/?p=someplayer;a=commitdiff_plain;h=0c2de8577ffd94b4df4b5ab37a0349c72295fce4 Add M4A to files pattern tuned TagLib to use M4A and ASF --- diff --git a/debian/control b/debian/control index 8080efb..61ca2b3 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Architecture: armel Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-plugins-good-extra Description: Alternate audioplayer for Maemo 5 Qt4- and Phonon-based player with compiled in TagLib library - supports mp3, flac, ogg, wma, aac formats + supports mp3, flac, ogg, wma, aac, asf, ape, wav, m4a formats XSBC-Maemo-Display-Name: SomePlayer XSBC-Bugtracker: http://someplayer.some-body.ru/bt/ XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHBy diff --git a/src/directoryview.cpp b/src/directoryview.cpp index 3fe368c..8953d74 100644 --- a/src/directoryview.cpp +++ b/src/directoryview.cpp @@ -36,7 +36,7 @@ DirectoryView::DirectoryView(QWidget *parent) : ui->setupUi(this); Config config; _icons_theme = config.getValue("ui/iconstheme").toString(); - REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav"; + REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav" << "m4a"; setWindowFlags(windowFlags() | Qt::Window); setAttribute(Qt::WA_Maemo5StackedWindow); _model = new QStandardItemModel(0, 2, this); diff --git a/src/mediascanner.cpp b/src/mediascanner.cpp index 4c36403..7270745 100644 --- a/src/mediascanner.cpp +++ b/src/mediascanner.cpp @@ -27,7 +27,7 @@ using namespace SomePlayer::Storage; MediaScanner::MediaScanner(QObject *parent) : QThread(parent), _stopped(false), _initialized(false) { - REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav"; + REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav" << "m4a"; } void MediaScanner::run() { diff --git a/src/taglib/asf/asfattribute.cpp b/src/taglib/asf/asfattribute.cpp index 85db872..3969f91 100644 --- a/src/taglib/asf/asfattribute.cpp +++ b/src/taglib/asf/asfattribute.cpp @@ -27,7 +27,6 @@ #include #endif -#ifdef WITH_ASF #include #include @@ -338,5 +337,3 @@ ASF::Attribute::setStream(int value) { d->stream = value; } - -#endif diff --git a/src/taglib/asf/asffile.cpp b/src/taglib/asf/asffile.cpp index 012f39b..6d7e31c 100644 --- a/src/taglib/asf/asffile.cpp +++ b/src/taglib/asf/asffile.cpp @@ -27,7 +27,6 @@ #include #endif -#ifdef WITH_ASF #include #include @@ -559,5 +558,3 @@ ASF::File::renderString(const String &str, bool includeLength) } return data; } - -#endif diff --git a/src/taglib/asf/asfproperties.cpp b/src/taglib/asf/asfproperties.cpp index 68e2d4c..b0552e4 100644 --- a/src/taglib/asf/asfproperties.cpp +++ b/src/taglib/asf/asfproperties.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_ASF - #include #include #include "asfproperties.h" @@ -104,4 +102,3 @@ void ASF::Properties::setChannels(int length) d->channels = length; } -#endif diff --git a/src/taglib/asf/asftag.cpp b/src/taglib/asf/asftag.cpp index f910ccb..acf4fec 100644 --- a/src/taglib/asf/asftag.cpp +++ b/src/taglib/asf/asftag.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_ASF - #include "asftag.h" using namespace TagLib; @@ -216,4 +214,3 @@ bool ASF::Tag::isEmpty() const { d->attributeListMap.isEmpty(); } -#endif diff --git a/src/taglib/fileref.cpp b/src/taglib/fileref.cpp index fec4516..fb3bbb4 100644 --- a/src/taglib/fileref.cpp +++ b/src/taglib/fileref.cpp @@ -142,17 +142,13 @@ StringList FileRef::defaultFileExtensions() l.append("wv"); l.append("spx"); l.append("tta"); -#ifdef TAGLIB_WITH_MP4 l.append("m4a"); l.append("m4b"); l.append("m4p"); l.append("3g2"); l.append("mp4"); -#endif -#ifdef TAGLIB_WITH_ASF l.append("wma"); l.append("asf"); -#endif l.append("aif"); l.append("aiff"); l.append("wav"); @@ -240,14 +236,10 @@ File *FileRef::create(FileName fileName, bool readAudioProperties, return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle); if(ext == "TTA") return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle); -#ifdef TAGLIB_WITH_MP4 if(ext == "M4A" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2") return new MP4::File(fileName, readAudioProperties, audioPropertiesStyle); -#endif -#ifdef TAGLIB_WITH_ASF if(ext == "WMA" || ext == "ASF") return new ASF::File(fileName, readAudioProperties, audioPropertiesStyle); -#endif if(ext == "AIF") return new RIFF::AIFF::File(fileName, readAudioProperties, audioPropertiesStyle); if(ext == "WAV") diff --git a/src/taglib/mp4/mp4atom.cpp b/src/taglib/mp4/mp4atom.cpp index 6d86a6e..7e20d25 100644 --- a/src/taglib/mp4/mp4atom.cpp +++ b/src/taglib/mp4/mp4atom.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_MP4 - #include #include #include "mp4atom.h" @@ -193,5 +191,3 @@ MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const } return path; } - -#endif diff --git a/src/taglib/mp4/mp4coverart.cpp b/src/taglib/mp4/mp4coverart.cpp index 983df02..6de10ae 100644 --- a/src/taglib/mp4/mp4coverart.cpp +++ b/src/taglib/mp4/mp4coverart.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_MP4 - #include #include #include "mp4coverart.h" @@ -85,5 +83,3 @@ MP4::CoverArt::data() const { return d->data; } - -#endif diff --git a/src/taglib/mp4/mp4file.cpp b/src/taglib/mp4/mp4file.cpp index 21a5429..d81bb44 100644 --- a/src/taglib/mp4/mp4file.cpp +++ b/src/taglib/mp4/mp4file.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_MP4 - #include #include #include "mp4atom.h" @@ -134,5 +132,3 @@ MP4::File::save() return d->tag->save(); } - -#endif diff --git a/src/taglib/mp4/mp4item.cpp b/src/taglib/mp4/mp4item.cpp index 0af331f..ac1ee77 100644 --- a/src/taglib/mp4/mp4item.cpp +++ b/src/taglib/mp4/mp4item.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_MP4 - #include #include #include "mp4item.h" @@ -146,4 +144,3 @@ MP4::Item::isValid() const return d->valid; } -#endif diff --git a/src/taglib/mp4/mp4properties.cpp b/src/taglib/mp4/mp4properties.cpp index c973d3a..d10aec5 100644 --- a/src/taglib/mp4/mp4properties.cpp +++ b/src/taglib/mp4/mp4properties.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_MP4 - #include #include #include "mp4file.h" @@ -166,4 +164,3 @@ MP4::Properties::bitsPerSample() const return d->bitsPerSample; } -#endif diff --git a/src/taglib/mp4/mp4tag.cpp b/src/taglib/mp4/mp4tag.cpp index f8acc87..212006d 100644 --- a/src/taglib/mp4/mp4tag.cpp +++ b/src/taglib/mp4/mp4tag.cpp @@ -27,8 +27,6 @@ #include #endif -#ifdef WITH_MP4 - #include #include #include "mp4atom.h" @@ -633,4 +631,3 @@ MP4::Tag::itemListMap() return d->items; } -#endif diff --git a/src/taglib/taglib_config.h.in b/src/taglib/taglib_config.h.in index 7be1170..e490fa1 100644 --- a/src/taglib/taglib_config.h.in +++ b/src/taglib/taglib_config.h.in @@ -1,5 +1,5 @@ /* With ASF support */ -#undef TAGLIB_WITH_ASF +// #undef TAGLIB_WITH_ASF /* With MP4 support */ -#undef TAGLIB_WITH_MP4 +// #undef TAGLIB_WITH_MP4