From 9dfbc84364ebb83fe318ddacdf1d9ad49e21671f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 27 Dec 2009 10:21:26 +0000 Subject: ogg vorbis plugin: added replay gain support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1457 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/mad/decoder_mad.cpp | 14 ++------------ src/plugins/Input/mad/decoder_mad.h | 3 +-- src/plugins/Input/mad/decodermadfactory.cpp | 9 ++++++++- src/plugins/Input/mad/translations/mad_plugin_cs.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_de.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_it.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_lt.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_pl.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_ru.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_tr.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts | 14 +++++++------- src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts | 14 +++++++------- 13 files changed, 81 insertions(+), 85 deletions(-) (limited to 'src/plugins/Input/mad') diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index f76ff9350..1e4fea68f 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -13,13 +13,12 @@ #include #include #include "tagextractor.h" -#include "replaygainreader.h" #include "decoder_mad.h" #define XING_MAGIC (('X' << 24) | ('i' << 16) | ('n' << 8) | 'g') #define INPUT_BUFFER_SIZE (32*1024) -DecoderMAD::DecoderMAD(const QString &url, QIODevice *i) : Decoder(i) +DecoderMAD::DecoderMAD(QIODevice *i) : Decoder(i) { m_inited = false; m_totalTime = 0; @@ -33,7 +32,6 @@ DecoderMAD::DecoderMAD(const QString &url, QIODevice *i) : Decoder(i) m_output_at = 0; m_skip_frames = 0; m_eof = false; - m_url = url; } DecoderMAD::~DecoderMAD() @@ -98,15 +96,7 @@ bool DecoderMAD::initialize() mad_frame_mute (&frame); stream.next_frame = 0; stream.sync = 0; - - if(!m_url.contains("://")) - { - ReplayGainReader rg(m_url); - configure(m_freq, m_channels, 16, rg.replayGainInfo()); - } - else - configure(m_freq, m_channels, 16); - + configure(m_freq, m_channels, 16); m_inited = TRUE; return TRUE; } diff --git a/src/plugins/Input/mad/decoder_mad.h b/src/plugins/Input/mad/decoder_mad.h index a98f7fbf7..c78e3f8c8 100644 --- a/src/plugins/Input/mad/decoder_mad.h +++ b/src/plugins/Input/mad/decoder_mad.h @@ -22,7 +22,7 @@ extern "C" class DecoderMAD : public Decoder { public: - DecoderMAD(const QString &url, QIODevice *i); + DecoderMAD(QIODevice *i); virtual ~DecoderMAD(); // standard decoder API @@ -46,7 +46,6 @@ private: uint m_bitrate; long m_freq, m_len; qint64 m_output_bytes, m_output_at; - QString m_url; // file input buffer char *m_input_buf; diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index 2ec86e011..2a7df8189 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -31,6 +31,7 @@ #include #include #include "mpegmetadatamodel.h" +#include "replaygainreader.h" #include "settingsdialog.h" #include "decoder_mad.h" #include "decodermadfactory.h" @@ -95,7 +96,13 @@ const DecoderProperties DecoderMADFactory::properties() const Decoder *DecoderMADFactory::create(const QString &url, QIODevice *input) { - return new DecoderMAD(url, input); + Decoder *d = new DecoderMAD(input); + if(!url.contains("://")) //local file + { + ReplayGainReader rg(url); + d->setReplayGainInfo(rg.replayGainInfo()); + } + return d; } QList DecoderMADFactory::createPlayList(const QString &fileName, bool useMetaData) diff --git a/src/plugins/Input/mad/translations/mad_plugin_cs.ts b/src/plugins/Input/mad/translations/mad_plugin_cs.ts index ac90ee91e..d0bc46a5a 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_cs.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_cs.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Modul MPEG - + MPEG Files Soubory MPEG - + About MPEG Audio Plugin O modulu MPEG - + Qmmp MPEG Audio Plugin Vstupní modul Qmmp MPEG - + Compiled against libmad version: Zkompilováno s libmad verze: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Zdrojový kód je založen na projektu mq3 diff --git a/src/plugins/Input/mad/translations/mad_plugin_de.ts b/src/plugins/Input/mad/translations/mad_plugin_de.ts index 091f7a4aa..aaf31a68e 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_de.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_de.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG-Modul - + MPEG Files MPEG-Dateien - + About MPEG Audio Plugin Über MPEG-Audio-Modul - + Qmmp MPEG Audio Plugin Qmmp MPEG-Audio-Modul - + Compiled against libmad version: Kompiliert gegen libmad-Version: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Quellcode basiert auf dem mq3-Projekt diff --git a/src/plugins/Input/mad/translations/mad_plugin_it.ts b/src/plugins/Input/mad/translations/mad_plugin_it.ts index df9f0126e..d8571e4f5 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_it.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_it.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Modulo MPEG - + MPEG Files Brani MPEG - + About MPEG Audio Plugin Info sul modulo audio MPEG - + Qmmp MPEG Audio Plugin Modulo audio MPEG per Qmmp - + Compiled against libmad version: Compilato con libmad-Version: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Codice sorgente basato sul progetto mq3 diff --git a/src/plugins/Input/mad/translations/mad_plugin_lt.ts b/src/plugins/Input/mad/translations/mad_plugin_lt.ts index 9e6851995..44e981e2a 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_lt.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_lt.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG įskiepis - + MPEG Files MPEG bylos - + About MPEG Audio Plugin Apie MPEG audio įskiepį - + Qmmp MPEG Audio Plugin Qmmp MPEG įskiepis - + Compiled against libmad version: Sukurta libmad pagrindu: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Sukūrė: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Išvesties kodas sukurtas mq3 pagrindu diff --git a/src/plugins/Input/mad/translations/mad_plugin_pl.ts b/src/plugins/Input/mad/translations/mad_plugin_pl.ts index 209d3303d..3e1454134 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_pl.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_pl.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Wtyczka MPEG - + MPEG Files Pliki MPEG - + About MPEG Audio Plugin O wtyczce Audio MPEG - + Qmmp MPEG Audio Plugin Wtyczka MPEG Audio dla Qmmp - + Compiled against libmad version: Skompilowane przy użyciu biblioteki libmad w wersji: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Kod źródłowy oparty na projekcie mq3 diff --git a/src/plugins/Input/mad/translations/mad_plugin_ru.ts b/src/plugins/Input/mad/translations/mad_plugin_ru.ts index a913f51d7..58e7df962 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_ru.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_ru.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Модуль MPEG - + MPEG Files Файлы MPEG - + About MPEG Audio Plugin Об аудио-модуле MPEG - + Qmmp MPEG Audio Plugin Аудио-модуль MPEG для Qmmp - + Compiled against libmad version: Собрано с версией libmad: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> - + Source code based on mq3 progect Исходный код основан на проекте mq3 diff --git a/src/plugins/Input/mad/translations/mad_plugin_tr.ts b/src/plugins/Input/mad/translations/mad_plugin_tr.ts index 731fefe6d..3f567928c 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_tr.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_tr.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG Eklentisi - + MPEG Files MPEG Dosyaları - + About MPEG Audio Plugin MPEG Ses Eklentisi Hakkında - + Qmmp MPEG Audio Plugin Qmmp MPEG Ses Eklentisi - + Compiled against libmad version: Derlendiği libmad sürümü: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect Kaynak kodu mq3 projesi temellidir diff --git a/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts b/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts index c509c85ca..351759f83 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Модуль MPEG - + MPEG Files Файли MPEG - + About MPEG Audio Plugin Про аудіо-модуль MPEG - + Qmmp MPEG Audio Plugin Аудіо-модуль MPEG для Qmmp - + Compiled against libmad version: Зібрано з версією libmad: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> - + Source code based on mq3 progect Вихідний код базується на проекті mq3 diff --git a/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts b/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts index 5b7aef659..4e1138c22 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG 插件 - + MPEG Files MPEG 文件 - + About MPEG Audio Plugin 关于 MPEG 音频插件 - + Qmmp MPEG Audio Plugin Qmmp MPEG 音频插件 - + Compiled against libmad version: 编译基于 libmad 的版本： - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect 源代码基于 mq3 项目 diff --git a/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts b/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts index db84455c7..042c22d25 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG 插件 - + MPEG Files MPEG 檔案 - + About MPEG Audio Plugin 關於 MPEG 聲訊插件 - + Qmmp MPEG Audio Plugin Qmmp MPEG 聲訊插件 - + Compiled against libmad version: 編譯基於 libmad 的版本： - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 progect 源碼基於 mq3 項目 -- cgit v1.2.3-13-gbd6f