From 7f084cab97cf3ad20b24e0fd1ddc58829b6c07bd Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 22 Sep 2009 16:10:25 +0000 Subject: enabled cda plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1249 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/CMakeLists.txt | 2 +- src/plugins/Input/Input.pro | 2 +- src/plugins/Input/cdaudio/decoder_cdaudio.cpp | 10 ++++------ src/plugins/Input/cdaudio/decoder_cdaudio.h | 6 +++--- src/plugins/Input/cdaudio/decodercdaudiofactory.cpp | 9 ++++----- src/plugins/Input/cdaudio/decodercdaudiofactory.h | 8 ++------ .../Input/cdaudio/translations/cdaudio_plugin_cs.ts | 10 +++++----- .../Input/cdaudio/translations/cdaudio_plugin_de.ts | 14 +++++++------- .../Input/cdaudio/translations/cdaudio_plugin_it.ts | 10 +++++----- .../Input/cdaudio/translations/cdaudio_plugin_lt.ts | 14 +++++++------- .../Input/cdaudio/translations/cdaudio_plugin_pl.ts | 10 +++++----- .../Input/cdaudio/translations/cdaudio_plugin_ru.ts | 10 +++++----- .../Input/cdaudio/translations/cdaudio_plugin_tr.ts | 10 +++++----- .../Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts | 10 +++++----- .../Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts | 10 +++++----- .../Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts | 10 +++++----- 16 files changed, 69 insertions(+), 76 deletions(-) (limited to 'src') diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index 7fe2b17f4..efcc4774f 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -12,7 +12,7 @@ SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin") #SET(USE_AAC TRUE CACHE BOOL "enable/disable aac plugin") SET(USE_CUE TRUE CACHE BOOL "enable/disable cue plugin") #SET(USE_MPLAYER TRUE CACHE BOOL "enable/disable mplayer support") -#SET(USE_CDA TRUE CACHE BOOL "enable/disable cd audio support") +SET(USE_CDA TRUE CACHE BOOL "enable/disable cd audio support") pkg_check_modules(TAGLIB taglib) diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index 4cac7e372..0962c76f9 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -48,7 +48,7 @@ contains(CONFIG, MPLAYER_PLUGIN){ } contains(CONFIG, CDAUDIO_PLUGIN){ -# SUBDIRS += cdaudio + SUBDIRS += cdaudio message(***************************) message(* CD Audio plugin enabled *) message(***************************) diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 9c14445a0..6fa6e2e02 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -56,8 +56,7 @@ static void log_handler (cdio_log_level_t level, const char message[]) // Decoder class -DecoderCDAudio::DecoderCDAudio(QObject *parent, DecoderFactory *d, const QString &url, Output *o) - : Decoder(parent, d, o) +DecoderCDAudio::DecoderCDAudio(const QString &url) : Decoder() { m_bitrate = 0; m_totalTime = 0; @@ -258,8 +257,7 @@ bool DecoderCDAudio::initialize() m_first_sector = tracks[track_at].first_sector; m_current_sector = tracks[track_at].first_sector; m_last_sector = tracks[track_at].last_sector; - stateHandler()->dispatch(tracks[track_at].info.metaData()); //send metadata - //m_inited = TRUE; + StateHandler::instance()->dispatch(tracks[track_at].info.metaData()); //send metadata qDebug("DecoderCDAudio: initialize succes"); return TRUE; } @@ -275,7 +273,7 @@ int DecoderCDAudio::bitrate() return m_bitrate; } -qint64 DecoderCDAudio::readAudio(char *audio, qint64 maxSize) +qint64 DecoderCDAudio::read(char *audio, qint64 maxSize) { long len = 0; lsn_t secorts_to_read = qMin(CDDA_SECTORS, (m_last_sector - m_current_sector + 1)); @@ -300,7 +298,7 @@ qint64 DecoderCDAudio::readAudio(char *audio, qint64 maxSize) return len; } -void DecoderCDAudio::seekAudio(qint64 pos) +void DecoderCDAudio::seek(qint64 pos) { m_current_sector = m_first_sector + pos * 75 / 1000; } diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.h b/src/plugins/Input/cdaudio/decoder_cdaudio.h index 0b1980570..7c7ace199 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.h +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.h @@ -43,7 +43,7 @@ public: class DecoderCDAudio : public Decoder { public: - DecoderCDAudio(QObject *, DecoderFactory *, const QString &url, Output *); + DecoderCDAudio(const QString &url); virtual ~DecoderCDAudio(); static QList generateTrackList(const QString &device = QString()); @@ -53,10 +53,10 @@ public: bool initialize(); qint64 totalTime(); int bitrate(); + qint64 read(char *audio, qint64 maxSize); + void seek(qint64 time); private: - qint64 readAudio(char *audio, qint64 maxSize); - void seekAudio(qint64 time); // libcdio variables lsn_t m_first_sector; lsn_t m_last_sector; diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index ac846f069..2e1b3d00f 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -50,11 +50,10 @@ const DecoderProperties DecoderCDAudioFactory::properties() const return properties; } -Decoder *DecoderCDAudioFactory::create(QObject *parent, QIODevice *input, - Output *output, const QString &url) +Decoder *DecoderCDAudioFactory::create(const QString &url, QIODevice *input) { Q_UNUSED(input); - return new DecoderCDAudio(parent, this, url, output); + return new DecoderCDAudio(url); } QList DecoderCDAudioFactory::createPlayList(const QString &fileName, bool useMetaData) @@ -67,7 +66,7 @@ QList DecoderCDAudioFactory::createPlayList(const QString &fileName, return list; } -QObject* DecoderCDAudioFactory::showDetails(QWidget *parent, const QString &path) +MetaDataModel* DecoderCDAudioFactory::createMetaDataModel(const QString &path, QObject *parent) { Q_UNUSED(parent); Q_UNUSED(path); @@ -97,4 +96,4 @@ QTranslator *DecoderCDAudioFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN(DecoderCDAudioFactory) +Q_EXPORT_PLUGIN2(cdaudio, DecoderCDAudioFactory) diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.h b/src/plugins/Input/cdaudio/decodercdaudiofactory.h index bc4cce48d..ba7d9ad5e 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.h +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.h @@ -30,21 +30,17 @@ #include #include - - - class DecoderCDAudioFactory : public QObject, DecoderFactory { Q_OBJECT Q_INTERFACES(DecoderFactory); - public: bool supports(const QString &source) const; bool canDecode(QIODevice *input) const; const DecoderProperties properties() const; - Decoder *create(QObject *, QIODevice *, Output *, const QString &); + Decoder *create(const QString &, QIODevice *); QList createPlayList(const QString &fileName, bool useMetaData); - QObject* showDetails(QWidget *parent, const QString &path); + MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts index 5cad38233..7c6ea1d30 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts @@ -9,27 +9,27 @@ Modul pro zvuková CD - + About CD Audio Plugin O modulu pro zvuková CD - + Qmmp CD Audio Plugin Modul Qmmp pro zvuková CD - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Použití: otevřete cdda:/// v dialogu Přidat URL nebo z příkazové řádky - + Compiled against libcdio version: Přeloženo s libcdio verze: diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts index dc1b1cf63..d555daf5e 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts @@ -1,6 +1,6 @@ - - + + DecoderCDAudioFactory @@ -9,27 +9,27 @@ CD-Audio-Modul - + About CD Audio Plugin Über CD-Audio-Modul - + Qmmp CD Audio Plugin Qmmp CD-Audio-Modul - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Verwendung: Geben Sie cdda:/// in den „URL hinzufügen“-Dialog oder in die Befehlszeile ein - + Compiled against libcdio version: Kompiliert gegen „libcdio“-Version: diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts index 1a6b1ab6e..dede31eb3 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts @@ -9,27 +9,27 @@ Modulo CD-Audio - + About CD Audio Plugin Informazioni sul modulo CD-Audio - + Qmmp CD Audio Plugin Modulo CD-Audio per Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Uso: aprire cdda:// nella finestra di dialgo degli URL, o via linea di comando - + Compiled against libcdio version: Compilato con libcdio, versione: diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts index e7e1321e1..270d9d579 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts @@ -1,6 +1,6 @@ - - + + DecoderCDAudioFactory @@ -9,27 +9,27 @@ CD Audio Įskiepis - + About CD Audio Plugin Apie CD Audio įskiepį - + Qmmp CD Audio Plugin Apie CD Audio Qmmp įskiepį - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Sukūrė: Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Naudojimas: atverti cdda:/// naudojant Prideti interneto adresą arba komandinė eilutę - + Compiled against libcdio version: Surinkta iš libcdio versijos : diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts index aaa1697fb..61049c20b 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl.ts @@ -9,27 +9,27 @@ Wtyczka CD Audio - + About CD Audio Plugin O wtyczce CD Audio - + Qmmp CD Audio Plugin Wtyczka CD Audio dla Qmmp - + Compiled against libcdio version: Skompilowane przy użyciu biblioteki libcdio w wersji: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Instrukcja: otwórz cdda:/// używając Dodaj URL lib z linii poleceń diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts index 658c9b255..488bba2d1 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts @@ -9,27 +9,27 @@ Модуль CD Audio - + About CD Audio Plugin О Модуле CD Audio - + Qmmp CD Audio Plugin Модуль CD Audio для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Использование: откройте cdda:/// с помощью диалога добавления URL или командной строки - + Compiled against libcdio version: Собрано с libcdio версии: diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts index bd6b08c7f..7a04a718d 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts @@ -9,27 +9,27 @@ CD Ses Eklentisi - + About CD Audio Plugin CD Ses Eklentisi Hakkında - + Qmmp CD Audio Plugin Qmmp CD Ses Eklentisi - + Compiled against libcdio version: Derlendiği libcdio sürümü: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Kullanımı: komut satırından veya URL Ekle diyaloğundan open cdda:/// şeklindedir diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts index 864dda6f7..b0506d4dc 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts @@ -9,27 +9,27 @@ Модуль AudioCD - + About CD Audio Plugin Про модуль AudioCD - + Qmmp CD Audio Plugin Модуль AudioCD для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Використання: відкрийте cdda:/// використовуючи діалог "Додати адресу" чи командний рядок - + Compiled against libcdio version: Зібрано з libcdio версії: diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts index bc804186c..806ecb21e 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts @@ -9,27 +9,27 @@ CD 音频插件 - + About CD Audio Plugin 关于 CD 音频插件 - + Qmmp CD Audio Plugin Qmmp CD 音频插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line 用法：open cdda:/// 使用添加 URL 对话或命令行 - + Compiled against libcdio version: 编译依赖 libcdio 版本： diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts index 5a9b4e3e6..0b4f60b65 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts @@ -9,27 +9,27 @@ CD 聲訊插件 - + About CD Audio Plugin 關於 CD 聲訊插件 - + Qmmp CD Audio Plugin Qmmp CD 聲訊插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line 用法：open cdda:/// 使用添加 URL會話或命令行 - + Compiled against libcdio version: 編譯依賴 libcdio 版本： -- cgit v1.2.3-13-gbd6f