From 0a29533bd30a575ba9f892014775eddd22e53ec8 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 11 May 2010 18:25:52 +0000 Subject: added shorten audio format git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1731 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 13 ++++++++++++- src/plugins/Input/ffmpeg/settingsdialog.cpp | 15 ++++++++++++--- src/plugins/Input/ffmpeg/settingsdialog.ui | 9 ++++++++- .../Input/ffmpeg/translations/ffmpeg_plugin_cs.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_de.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_it.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_lt.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_pl.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_ru.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_tr.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts | 17 +++++++++++------ 13 files changed, 142 insertions(+), 65 deletions(-) (limited to 'src/plugins/Input/ffmpeg') diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 37f54d017..2e6f163a1 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2009 by Ilya Kotov * + * Copyright (C) 2008-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -54,6 +54,9 @@ 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) { @@ -73,6 +76,9 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const 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(); @@ -106,6 +112,9 @@ const DecoderProperties DecoderFFmpegFactory::properties() const 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(); DecoderProperties properties; @@ -119,6 +128,8 @@ const DecoderProperties DecoderFFmpegFactory::properties() const if(filters.contains("*.aac")) properties.contentType += " audio/aac audio/aacp"; if(filters.contains("*.m4a")) + properties.contentType += " 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.shortName = "ffmpeg"; diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index 5044f789e..3691b6e21 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -40,7 +40,6 @@ extern "C" #else #include #endif - } #include "settingsdialog.h" @@ -55,6 +54,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) filters << "*.wma"; #if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(44<<8)+0)) filters << "*.ape"; +#endif +#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) + filters << "*.shn"; #endif filters = settings.value("FFMPEG/filters", filters).toStringList(); avcodec_init(); @@ -81,9 +83,14 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.mp4CheckBox->setChecked(filters.contains("*.m4a") && avcodec_find_decoder(CODEC_ID_AAC)); ui.raCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_RA_288)); ui.raCheckBox->setChecked(filters.contains("*.ra") && avcodec_find_decoder(CODEC_ID_RA_288)); +#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) + ui.shCheckBox->setChecked(filters.contains("*.shn") && avcodec_find_decoder(CODEC_ID_SHORTEN)); +#else + ui.shCheckBox->setChecked(false); + ui.shCheckBox->setEnabled(false); +#endif } - SettingsDialog::~SettingsDialog() { } @@ -107,6 +114,8 @@ void SettingsDialog::accept() filters << "*.m4a"; if (ui.raCheckBox->isChecked()) filters << "*.ra"; + if (ui.shCheckBox->isChecked()) + filters << "*.shn"; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("FFMPEG/filters", filters); QDialog::accept(); diff --git a/src/plugins/Input/ffmpeg/settingsdialog.ui b/src/plugins/Input/ffmpeg/settingsdialog.ui index 958251d8e..b521b641e 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.ui +++ b/src/plugins/Input/ffmpeg/settingsdialog.ui @@ -7,7 +7,7 @@ 0 0 302 - 298 + 311 @@ -111,6 +111,13 @@ + + + + Shorten + + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts index 68ffa02b3..4adbe0c51 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts index aaa190c5d..40847013e 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts index cde3ca55f..100fc434f 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts index 5d3a56387..9d29c08ec 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts index c6bd2ffb9..ad9b0a159 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> @@ -129,5 +129,10 @@ RealAudio 1.0/2.0 + + + Shorten + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts index dae43b3a5..dfaee7c45 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts index 818dfb86b..b70442464 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> @@ -129,5 +129,10 @@ RealAudio 1.0/2.0 RealAudio 1.0/2.0 + + + Shorten + + 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 596d32db2..dad99abe5 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings 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 11d990e0d..5a169595f 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings 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 451042f53..c181cd093 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 @@ -119,6 +119,11 @@ RealAudio 1.0/2.0 + + + Shorten + + FFmpeg Plugin Settings -- cgit v1.2.3-13-gbd6f