diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-08-15 17:28:33 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-08-15 17:28:33 +0000 |
| commit | 6a5a5359f1842f1b8546db9d47b70867977a768a (patch) | |
| tree | 74c9199e24fc7e5c96c1dc594ad8362bcbfa41a9 | |
| parent | 42e54e2fdacda654a7360b8332dc622f99d3fa6c (diff) | |
| download | qmmp-6a5a5359f1842f1b8546db9d47b70867977a768a.tar.gz qmmp-6a5a5359f1842f1b8546db9d47b70867977a768a.tar.bz2 qmmp-6a5a5359f1842f1b8546db9d47b70867977a768a.zip | |
EAC3, DTS, and Dolby TrueHD support (patch by Makis Kalofolias)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2303 90c681e8-e032-0410-971d-27865f9a5e38
21 files changed, 266 insertions, 102 deletions
@@ -48,6 +48,7 @@ Thanks to: Vadim Kalinnikov <moose@ylsoftware.com> - project hosting Erik Ölsar <erlk.ozlr@gmail.com> - skinned cursors, ui improvements Funda Wang <fundawang@gmail.com> - cmake files fixes + Makis Kalofolias <makskafl@gmail.com> - EAC3, DTS, and Dolby TrueHD support Michail Zheludkov <zheludkovm@mail.ru> - ffmpeg plugin fixes Michał Grosicki <grosik88@o2.pl> - alsa plugin fixes Panagiotis Papadopoulos <pano_90@gmx.net> - ui fixes, bug reports diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 9bce3d8c3..f3694e924 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -104,11 +104,11 @@ bool DecoderFFmpeg::initialize() av_register_all(); AVProbeData pd; - uint8_t buf[8192 + AVPROBE_PADDING_SIZE]; + uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE]; pd.filename = m_path.toLocal8Bit().constData(); pd.buf_size = input()->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE); pd.buf = buf; - if(pd.buf_size < 8192) + if(pd.buf_size < PROBE_BUFFER_SIZE) { qWarning("DecoderFFmpeg: too small buffer size: %d bytes", pd.buf_size); return false; diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h index cd30dc4c1..e70751fbd 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h @@ -27,6 +27,7 @@ extern "C"{ } #include <qmmp/decoder.h> +#define PROBE_BUFFER_SIZE 8192 #define INPUT_BUFFER_SIZE 16384 class DecoderFFmpeg : public Decoder diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index ae0e8a4a6..24c7b8648 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -51,11 +51,11 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const QStringList filters = properties().filters; AVProbeData pd; - uint8_t buf[8192 + AVPROBE_PADDING_SIZE]; + uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE]; pd.filename = 0; pd.buf_size = i->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE); pd.buf = buf; - if(pd.buf_size < 8192) + if(pd.buf_size < PROBE_BUFFER_SIZE) return false; AVInputFormat *fmt = av_probe_input_format(&pd, 1); if(!fmt) @@ -69,7 +69,11 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const return true; if(filters.contains("*.aac") && !memcmp(fmt->name, "aac", 3)) return true; - if(filters.contains("*.ac3") && !memcmp(fmt->name, "ac3", 3)) + if(filters.contains("*.ac3") && !memcmp(fmt->name, "eac3", 4)) + return true; + if(filters.contains("*.dts") && !memcmp(fmt->name, "dts", 3)) + return true; + if(filters.contains("*.mka") && !memcmp(fmt->name, "mka", 3)) return true; return false; } @@ -99,7 +103,11 @@ const DecoderProperties DecoderFFmpegFactory::properties() const properties.contentTypes << "audio/m4a"; } if(filters.contains("*.ac3")) - properties.contentTypes << "audio/ac3"; + properties.contentTypes << "audio/ac3" << "audio/eac3"; + if(filters.contains("*.dts")) + properties.contentTypes << "audio/dts"; + if(filters.contains("*.mka")) + properties.contentTypes << "audio/true-hd" << "audio/x-matroska"; properties.shortName = "ffmpeg"; properties.hasAbout = true; properties.hasSettings = true; diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index 3046967a4..f7c18fc6b 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp @@ -58,8 +58,12 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.raCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_RA_288)); ui.raCheckBox->setChecked(filters.contains("*.ra") && avcodec_find_decoder(CODEC_ID_RA_288)); ui.shCheckBox->setChecked(filters.contains("*.shn") && avcodec_find_decoder(CODEC_ID_SHORTEN)); - ui.ac3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AC3)); - ui.ac3CheckBox->setChecked(filters.contains("*.ac3") && avcodec_find_decoder(CODEC_ID_AC3)); + ui.ac3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_EAC3)); + ui.ac3CheckBox->setChecked(filters.contains("*.ac3") && avcodec_find_decoder(CODEC_ID_EAC3)); + ui.dtsCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_DTS)); + ui.dtsCheckBox->setChecked(filters.contains("*.dts") && avcodec_find_decoder(CODEC_ID_DTS)); + ui.mkaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TRUEHD)); + ui.mkaCheckBox->setChecked(filters.contains("*.mka") && avcodec_find_decoder(CODEC_ID_TRUEHD)); } SettingsDialog::~SettingsDialog() @@ -87,6 +91,10 @@ void SettingsDialog::accept() filters << "*.shn"; if (ui.ac3CheckBox->isChecked()) filters << "*.ac3"; + if (ui.dtsCheckBox->isChecked()) + filters << "*.dts"; + if (ui.mkaCheckBox->isChecked()) + filters << "*.mka"; 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 4c394e778..7fdae7871 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.ui +++ b/src/plugins/Input/ffmpeg/settingsdialog.ui @@ -114,7 +114,21 @@ <item> <widget class="QCheckBox" name="ac3CheckBox"> <property name="text"> - <string>AC-3</string> + <string>AC3/EAC</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="dtsCheckBox"> + <property name="text"> + <string>DTS/DTS-Core</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mkaCheckBox"> + <property name="text"> + <string>Matroska Audio (Dolby TrueHD Lossless)</string> </property> </widget> </item> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts index 91bd80e68..dc4ccbc29 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>O modulu FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Vstupní modul Qmmp FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autor: Ilja Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>Modul FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>Formáty FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Přeloženo s libavformat-%1.%2.%3 a libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts index 7807ca0d2..01e26ae72 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>Über FFmpeg-Audio-Modul</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Qmmp FFmpeg-Audio-Modul</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autor: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>FFmpeg-Modul</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>FFmpeg-Formate</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Kompiliert gegen libavformat-%1.%2.%3 und libavcodec-%4.%5.%6</translation> </message> @@ -122,7 +122,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts index 642fd9b76..56cd8168e 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>Acerca del módulo de audio FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Módulo de audio FFmpeg para Qmmp</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Escrito por: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>Módulo FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>Formatos FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Compilado con libavformat-%1.%2.%3 y libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts index d2c86d5fa..987b3b12d 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>Info sul modulo audi FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Modulo audio FFmpeg per Qmmp</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autore: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>Modulo FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>Formati FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Compilato con libavformat-%1.%2.%3 e libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts index b3079e572..8995d0707 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>FFmpeg プラグイン</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>FFmpeg 用の形式</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>FFmpeg 音響プラグインについて</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>QMMP FFmpeg 音響プラグイン</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>libavformat-%1.%2.%3 と libavcodec-%4.%5.%6 対応でコンパイル</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>制作: Илья Котов (Ilya Kotov) <forkotov02@hotmail.ru></translation> </message> @@ -131,7 +131,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> </context> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts index 41950f4cc..427063bf5 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>Apie FFmpeg įskiepį</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>FFmpeg Qmmp audio įskiepis</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Sukūrė: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>FFmpeg įskiepis</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>FFmpeg bylų tipai</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Surinkta iš libavformat-%1.%2.%3 ir libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts index d765b0b7c..d0d800237 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>Over de FFmpeg Audio Module</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>FFmpeg Audio Module voor Qmmp</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Auteur: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>FFmpeg Module</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>FFmpeg Formaat</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Gebouwd tegen libavformat-%1.%2.%3 en libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts index 6b3a7a36f..d8f166bbb 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>Wtyczka FFMPEG</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>Formaty FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>O wtyczce FFmpeg Audio</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Wtyczka FFmpeg Audio dla Qmmp</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Skompilowane przy użyciu libavformat-%1.%2.%3 i libavcodec-%4.%5.%6</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autor: Ilja Kotov <forkotov02@hotmail.ru></translation> </message> @@ -131,8 +131,18 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> - <translation></translation> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> + <translation type="unfinished"></translation> </message> </context> </TS> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts index e3804425c..d14b1ac51 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>Об аудио-модуле FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Аудио-модуль FFmpeg для Qmmp</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Разработчик: Илья Котов <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>Модуль FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>Форматы FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Собрано с libavformat-%1.%2.%3 и libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts index bcbaa608a..36522265d 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>FFmpeg Eklentisi</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>FFmpeg Biçimleri</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>FFmpeg Ses Eklentisi Hakkında</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Qmmp FFmpeg Ses Eklentisi</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>libavformat-%1.%2.%3 ve libavcodec-%4.%5.%6 ile derlenmiştir</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Yazan: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> @@ -131,7 +131,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> </context> 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 bf5ea570e..d1470c600 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>Про аудіо-модуль FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Аудіо-модуль FFmpeg для Qmmp</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Розробник: Ілля Котов <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>Модуль FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>Формати FFmpeg</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>Зібрано з libavformat-%1.%2.%3 та libavcodec-%4.%5.%6</translation> </message> @@ -121,8 +121,18 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> - <translation></translation> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../settingsdialog.ui" line="14"/> 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 ced9e9199..a51de4152 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>关于 FFmpeg 音频插件</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Qmmp FFmpeg 音频插件</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>作者:Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>FFmpeg 插件</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>FFmpeg 格式</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>编译依赖 libavformat-%1.%2.%3 和 libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> 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 4a69c924e..f0d8d9958 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 @@ <context> <name>DecoderFFmpegFactory</name> <message> - <location filename="../decoderffmpegfactory.cpp" line="187"/> + <location filename="../decoderffmpegfactory.cpp" line="195"/> <source>About FFmpeg Audio Plugin</source> <translation>關於 FFmpeg 聲訊插件</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="189"/> + <location filename="../decoderffmpegfactory.cpp" line="197"/> <source>Qmmp FFmpeg Audio Plugin</source> <translation>Qmmp FFmpeg 聲訊插件</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="199"/> + <location filename="../decoderffmpegfactory.cpp" line="207"/> <source>Written by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>作者:Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="84"/> + <location filename="../decoderffmpegfactory.cpp" line="88"/> <source>FFmpeg Plugin</source> <translation>FFmpeg 插件</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="86"/> + <location filename="../decoderffmpegfactory.cpp" line="90"/> <source>FFmpeg Formats</source> <translation>FFmpeg 格式</translation> </message> <message> - <location filename="../decoderffmpegfactory.cpp" line="191"/> + <location filename="../decoderffmpegfactory.cpp" line="199"/> <source>Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6</source> <translation>編譯依賴 libavformat-%1.%2.%3 與 libavcodec-%4.%5.%6</translation> </message> @@ -121,7 +121,17 @@ </message> <message> <location filename="../settingsdialog.ui" line="117"/> - <source>AC-3</source> + <source>AC3/EAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="124"/> + <source>DTS/DTS-Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="131"/> + <source>Matroska Audio (Dolby TrueHD Lossless)</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/qmmpui/txt/thanks.txt b/src/qmmpui/txt/thanks.txt index 2e52ed482..7e7189f37 100644 --- a/src/qmmpui/txt/thanks.txt +++ b/src/qmmpui/txt/thanks.txt @@ -11,6 +11,7 @@ Thanks to: Vadim Kalinnikov <moose@ylsoftware.com> - project hosting Erik Ölsar <erlk.ozlr@gmail.com> - skinned cursors, ui improvements Funda Wang <fundawang@gmail.com> - cmake files fixes + Makis Kalofolias <makskafl@gmail.com> - EAC3, DTS, and Dolby TrueHD support Michail Zheludkov <zheludkovm@mail.ru> - ffmpeg plugin fixes Michał Grosicki <grosik88@o2.pl> - alsa plugin fixes Panagiotis Papadopoulos <pano_90@gmx.net> - ui fixes, bug reports diff --git a/src/qmmpui/txt/thanks_ru.txt b/src/qmmpui/txt/thanks_ru.txt index c6edb7110..6d866d5c1 100644 --- a/src/qmmpui/txt/thanks_ru.txt +++ b/src/qmmpui/txt/thanks_ru.txt @@ -11,6 +11,7 @@ Вадим Калинников <moose@ylsoftware.com> - хоcтинг проекта Erik Ölsar <erlk.ozlr@gmail.com> - растровые курсоры, улучшения в интерфейсе пользователя Funda Wang <fundawang@gmail.com> - исправления файлов cmake + Makis Kalofolias <makskafl@gmail.com> - поддержка EAC3, DTS и Dolby TrueHD Михаил Желудков <zheludkovm@mail.ru> - исправления в модуле ffmpeg Michał Grosicki <grosik88@o2.pl> - исправления в модуле alsa Panagiotis Papadopoulos <pano_90@gmx.net> - улучшения в интерфейсе пользователя, сообщения об ошибках |
