From aa3f57c0236c77f2fd90415fc1f3062a93b25b93 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 24 Nov 2010 18:17:51 +0000 Subject: some api changes, partial mpris 2.0 implementation git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1991 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 37 +++++++--------------- .../Input/ffmpeg/translations/ffmpeg_plugin_cs.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_de.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_es.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_it.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_ja.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_lt.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_nl.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_pl.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_ru.ts | 12 +++---- .../Input/ffmpeg/translations/ffmpeg_plugin_tr.ts | 12 +++---- .../ffmpeg/translations/ffmpeg_plugin_uk_UA.ts | 12 +++---- .../ffmpeg/translations/ffmpeg_plugin_zh_CN.ts | 12 +++---- .../ffmpeg/translations/ffmpeg_plugin_zh_TW.ts | 12 +++---- 14 files changed, 89 insertions(+), 104 deletions(-) (limited to 'src/plugins/Input/ffmpeg') diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 2e6f163a1..d126d714b 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -51,14 +51,7 @@ extern "C" bool DecoderFFmpegFactory::supports(const QString &source) const { - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QStringList filters; - filters << "*.wma" << "*.ape"; -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) - filters << "*.shn"; -#endif - filters = settings.value("FFMPEG/filters", filters).toStringList(); - foreach(QString filter, filters) + foreach(QString filter, properties().filters) { QRegExp regexp(filter, Qt::CaseInsensitive, QRegExp::Wildcard); if (regexp.exactMatch(source)) @@ -70,17 +63,7 @@ bool DecoderFFmpegFactory::supports(const QString &source) const bool DecoderFFmpegFactory::canDecode(QIODevice *i) const { av_register_all(); - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QStringList filters; -#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(44<<8)+0)) - filters << "*.wma" << "*.ape"; -#else - filters << "*.wma"; -#endif -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) - filters << "*.shn"; -#endif - filters = settings.value("FFMPEG/filters", filters).toStringList(); + QStringList filters = properties().filters; AVProbeData pd; uint8_t buf[8192 + AVPROBE_PADDING_SIZE]; @@ -119,19 +102,21 @@ const DecoderProperties DecoderFFmpegFactory::properties() const filters = settings.value("FFMPEG/filters", filters).toStringList(); DecoderProperties properties; properties.name = tr("FFmpeg Plugin"); - properties.filter = filters.join(" "); + properties.filters = filters; properties.description = tr("FFmpeg Formats"); if(filters.contains("*.wma")) - properties.contentType += "audio/x-ms-wma"; + properties.contentTypes << "audio/x-ms-wma"; if(filters.contains("*.mp3")) - properties.contentType += " audio/mpeg"; + properties.contentTypes << "audio/mpeg"; if(filters.contains("*.aac")) - properties.contentType += " audio/aac audio/aacp"; + properties.contentTypes << "audio/aac" << "audio/aacp"; if(filters.contains("*.m4a")) - properties.contentType += " audio/x-ffmpeg-shorten"; + properties.contentTypes << "audio/x-ffmpeg-shorten"; if(filters.contains("*.shn")) - properties.contentType += " audio/3gpp audio/3gpp2 audio/mp4 audio/MP4A-LATM audio/mpeg4-generic"; - properties.contentType = properties.contentType.trimmed(); + { + properties.contentTypes << "audio/3gpp" << "audio/3gpp2" << "audio/mp4"; + properties.contentTypes << "audio/MP4A-LATM" << "audio/mpeg4-generic"; + } properties.shortName = "ffmpeg"; properties.hasAbout = true; properties.hasSettings = true; diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts index 4adbe0c51..5b1181810 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin O modulu FFmpeg - + Qmmp FFmpeg Audio Plugin Vstupní modul Qmmp FFmpeg - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin Modul FFmpeg - + FFmpeg Formats Formáty FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Přeloženo s libavformat-%1.%2.%3 a libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts index 40847013e..d4a9c3a68 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Über FFmpeg-Audio-Modul - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg-Audio-Modul - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg-Modul - + FFmpeg Formats FFmpeg-Formate - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Kompiliert gegen libavformat-%1.%2.%3 und libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts index d125f74c9..d344c0044 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Acerca del módulo de audio FFmpeg - + Qmmp FFmpeg Audio Plugin Módulo de audio FFmpeg para Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Escrito por: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin Módulo FFmpeg - + FFmpeg Formats Formatos FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Compilado con libavformat-%1.%2.%3 y libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts index 100fc434f..2028baee5 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Info sul modulo audi FFmpeg - + Qmmp FFmpeg Audio Plugin Modulo audio FFmpeg per Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin Modulo FFmpeg - + FFmpeg Formats Formati FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Compilato con libavformat-%1.%2.%3 e libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts index 652c4feb3..a0f658c29 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg プラグイン - + FFmpeg Formats FFmpeg 用の形式 - + About FFmpeg Audio Plugin FFmpeg 音響プラグインについて - + Qmmp FFmpeg Audio Plugin QMMP FFmpeg 音響プラグイン - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 libavformat-%1.%2.%3 と libavcodec-%4.%5.%6 対応でコンパイル - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts index 9d29c08ec..fe9cbc272 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Apie FFmpeg įskiepį - + Qmmp FFmpeg Audio Plugin FFmpeg Qmmp audio įskiepis - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Sukūrė: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg įskiepis - + FFmpeg Formats FFmpeg bylų tipai - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Surinkta iš libavformat-%1.%2.%3 ir libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts index ffe94687c..a21bcdbd7 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Over de FFmpeg Audio Module - + Qmmp FFmpeg Audio Plugin FFmpeg Audio Module voor Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Auteur: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg Module - + FFmpeg Formats FFmpeg Formaat - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Gebouwd tegen libavformat-%1.%2.%3 en libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts index 3b4f6b7bb..1486420e5 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Wtyczka FFMPEG - + FFmpeg Formats Formaty FFmpeg - + About FFmpeg Audio Plugin O wtyczce FFmpeg Audio - + Qmmp FFmpeg Audio Plugin Wtyczka FFmpeg Audio dla Qmmp - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Skompilowane przy użyciu libavformat-%1.%2.%3 i libavcodec-%4.%5.%6 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts index dfaee7c45..ad4a27b9e 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Об аудио-модуле FFmpeg - + Qmmp FFmpeg Audio Plugin Аудио-модуль FFmpeg для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> - + FFmpeg Plugin Модуль FFmpeg - + FFmpeg Formats Форматы FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Собрано с libavformat-%1.%2.%3 и libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts index b70442464..74ee59da3 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg Eklentisi - + FFmpeg Formats FFmpeg Biçimleri - + About FFmpeg Audio Plugin FFmpeg Ses Eklentisi Hakkında - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg Ses Eklentisi - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 libavformat-%1.%2.%3 ve libavcodec-%4.%5.%6 ile derlenmiştir - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts index 9afeaef0f..d7307bb04 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Про аудіо-модуль FFmpeg - + Qmmp FFmpeg Audio Plugin Аудіо-модуль FFmpeg для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> - + FFmpeg Plugin Модуль FFmpeg - + FFmpeg Formats Формати FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Зібрано з libavformat-%1.%2.%3 та libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts index 5a169595f..729e63a4b 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin 关于 FFmpeg 音频插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 音频插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg 插件 - + FFmpeg Formats FFmpeg 格式 - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 编译依赖 libavformat-%1.%2.%3 和 libavcodec-%4.%5.%6 diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts index c181cd093..bdf67ec98 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin 關於 FFmpeg 聲訊插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 聲訊插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg 插件 - + FFmpeg Formats FFmpeg 格式 - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 編譯依賴 libavformat-%1.%2.%3 與 libavcodec-%4.%5.%6 -- cgit v1.2.3-13-gbd6f