From c9d69d13e214c0071a65ba967276f057d204f8f8 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 22 Sep 2009 15:29:54 +0000 Subject: enabled sndfile plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1248 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/CMakeLists.txt | 4 ++-- src/plugins/Input/Input.pro | 4 ++-- src/plugins/Input/sndfile/decoder_sndfile.cpp | 8 ++++---- src/plugins/Input/sndfile/decoder_sndfile.h | 6 +++--- src/plugins/Input/sndfile/decodersndfilefactory.cpp | 14 +++++--------- src/plugins/Input/sndfile/decodersndfilefactory.h | 9 +++------ .../Input/sndfile/translations/sndfile_plugin_cs.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_de.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_it.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_lt.ts | 16 ++++++++-------- .../Input/sndfile/translations/sndfile_plugin_pl.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_ru.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_tr.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_uk_UA.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_zh_CN.ts | 8 ++++---- .../Input/sndfile/translations/sndfile_plugin_zh_TW.ts | 8 ++++---- 16 files changed, 63 insertions(+), 70 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index a22de859b..7fe2b17f4 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -2,11 +2,11 @@ INCLUDE(FindPkgConfig) SET(USE_MAD TRUE CACHE BOOL "enable/disable mad plugin") -#SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin") +SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin") SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin") #SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg plugin") #SET(USE_MPC TRUE CACHE BOOL "enable/disable mpc plugin") -#SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin") +SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin") #SET(USE_WAVPACK TRUE CACHE BOOL "enable/disable wavpack plugin") #SET(USE_MODPLUG TRUE CACHE BOOL "enable/disable modplug plugin") #SET(USE_AAC TRUE CACHE BOOL "enable/disable aac plugin") diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index 467a495ed..4cac7e372 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -4,7 +4,7 @@ SUBDIRS += mad cue TEMPLATE = subdirs unix{ -SUBDIRS += vorbis# sndfile wavpack +SUBDIRS += vorbis sndfile# wavpack contains(CONFIG, MODPLUG_PLUGIN){ # SUBDIRS += modplug message(***************************) @@ -20,7 +20,7 @@ contains(CONFIG, MUSEPACK_PLUGIN){ } contains(CONFIG, FLAC_PLUGIN){ -# SUBDIRS += flac + SUBDIRS += flac message(***********************) message(* FLAC plugin enabled *) message(***********************) diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index 77e4438c2..45ea15cbe 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp @@ -30,8 +30,8 @@ // Decoder class -DecoderSndFile::DecoderSndFile(QObject *parent, DecoderFactory *d, Output *o, const QString &path) - : Decoder(parent, d, o) +DecoderSndFile::DecoderSndFile(const QString &path) + : Decoder() { m_path = path; m_bitrate = 0; @@ -91,12 +91,12 @@ int DecoderSndFile::bitrate() return m_bitrate; } -qint64 DecoderSndFile::readAudio(char *audio, qint64 maxSize) +qint64 DecoderSndFile::read(char *audio, qint64 maxSize) { return sizeof(short)* sf_read_short (m_sndfile, (short *)audio, maxSize / sizeof(short)); } -void DecoderSndFile::seekAudio(qint64 pos) +void DecoderSndFile::seek(qint64 pos) { sf_seek(m_sndfile, m_freq * pos/1000, SEEK_SET); } diff --git a/src/plugins/Input/sndfile/decoder_sndfile.h b/src/plugins/Input/sndfile/decoder_sndfile.h index 9b1bb6fb0..5c00e616f 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.h +++ b/src/plugins/Input/sndfile/decoder_sndfile.h @@ -30,17 +30,17 @@ extern "C"{ class DecoderSndFile : public Decoder { public: - DecoderSndFile(QObject *, DecoderFactory *, Output *, const QString &); + DecoderSndFile(const QString &path); virtual ~DecoderSndFile(); // Standard Decoder API 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); // helper functions void deinit(); diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index cce4e9801..be9e98feb 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -75,11 +75,9 @@ const DecoderProperties DecoderSndFileFactory::properties() const return properties; } -Decoder *DecoderSndFileFactory::create(QObject *parent, QIODevice *input, - Output *output, const QString &path) +Decoder *DecoderSndFileFactory::create(const QString &path, QIODevice *) { - Q_UNUSED(input); - return new DecoderSndFile(parent, this, output, path); + return new DecoderSndFile(path); } QList DecoderSndFileFactory::createPlayList(const QString &fileName, bool useMetaData) @@ -119,10 +117,8 @@ QList DecoderSndFileFactory::createPlayList(const QString &fileName, return list; } -QObject* DecoderSndFileFactory::showDetails(QWidget *parent, const QString &path) +MetaDataModel* DecoderSndFileFactory::createMetaDataModel(const QString&, QObject *) { - Q_UNUSED(parent); - Q_UNUSED(path); return 0; } @@ -147,4 +143,4 @@ QTranslator *DecoderSndFileFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN(DecoderSndFileFactory) +Q_EXPORT_PLUGIN2(sndfile, DecoderSndFileFactory) diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.h b/src/plugins/Input/sndfile/decodersndfilefactory.h index 0a5b160e5..2c8a34523 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.h +++ b/src/plugins/Input/sndfile/decodersndfilefactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,9 +30,6 @@ #include #include - - - class DecoderSndFileFactory : public QObject, DecoderFactory { @@ -43,9 +40,9 @@ public: bool supports(const QString &source) const; bool canDecode(QIODevice *input) const; const DecoderProperties properties() const; - Decoder *create(QObject *, QIODevice *, Output *, const QString &path); + Decoder *create(const QString &path, 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/sndfile/translations/sndfile_plugin_cs.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_cs.ts index ab078bd0d..28c04a70c 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_cs.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_cs.ts @@ -14,22 +14,22 @@ Soubory PCM - + About Sndfile Audio Plugin O modulu Sndfile - + Qmmp Sndfile Audio Plugin Vstupní modul Qmmp Sndfile - + Compiled against Zkompilováno s - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_de.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_de.ts index 8ebf2e136..11f431e88 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_de.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_de.ts @@ -14,22 +14,22 @@ PCM-Dateien - + About Sndfile Audio Plugin Über Sndfile-Audio-Modul - + Qmmp Sndfile Audio Plugin Qmmp Sndfile-Audio-Modul - + Compiled against Kompiliert gegen - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_it.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_it.ts index e2c33fbd4..e03d61a1c 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_it.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_it.ts @@ -14,22 +14,22 @@ Brani PCM - + About Sndfile Audio Plugin Info sul modulo audio Sndfile - + Qmmp Sndfile Audio Plugin Modulo audio Sndfile per Qmmp - + Compiled against Compilato su - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_lt.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_lt.ts index cecaa45ea..39ef4efcf 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_lt.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_lt.ts @@ -1,35 +1,35 @@ - - + + DecoderSndFileFactory - + Sndfile Plugin Sndfile įskiepis - + PCM Files PCM bylos - + About Sndfile Audio Plugin Apie Sndfile Audio įskiepį - + Qmmp Sndfile Audio Plugin Qmmp Sndfile Audio įskiepis - + Compiled against Compiled against - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Sukūrė: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_pl.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_pl.ts index 9124f19b7..70426ece5 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_pl.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_pl.ts @@ -14,22 +14,22 @@ Pliki PCM - + About Sndfile Audio Plugin O wtyczce Sndfile Audio - + Qmmp Sndfile Audio Plugin Wtyczka Sndfile Audio dla Qmmp - + Compiled against Skompilowano przy użyciu - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_ru.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_ru.ts index 1f7262ec6..5842f2dc8 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_ru.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_ru.ts @@ -14,22 +14,22 @@ Файлы PCM - + About Sndfile Audio Plugin Об аудио-модуле Sndfile - + Qmmp Sndfile Audio Plugin Модуль SndFile для Qmmp - + Compiled against Собрано с - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_tr.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_tr.ts index a66316108..9fd98c7c1 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_tr.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_tr.ts @@ -14,22 +14,22 @@ PCM Dosyaları - + About Sndfile Audio Plugin Sndfile Ses Eklentisi Hakkında - + Qmmp Sndfile Audio Plugin Qmmp Sndfile Ses Eklentisi - + Compiled against Derlendi - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_uk_UA.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_uk_UA.ts index 06d72eba5..23acc3081 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_uk_UA.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_uk_UA.ts @@ -14,22 +14,22 @@ Файли PCM - + About Sndfile Audio Plugin Про аудіо-модуль Sndfile - + Qmmp Sndfile Audio Plugin Модуль SndFile для Qmmp - + Compiled against Зкомпільовано з - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_CN.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_CN.ts index 172f8ddfe..13fa4d9e1 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_CN.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_CN.ts @@ -14,22 +14,22 @@ PCM 文件 - + About Sndfile Audio Plugin 关于 Sndfile 音频插件 - + Qmmp Sndfile Audio Plugin Qmmp Sndfile 音频插件 - + Compiled against 编译依赖 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_TW.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_TW.ts index cbc9f15f1..c36795f2b 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_TW.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_TW.ts @@ -14,22 +14,22 @@ PCM 檔案 - + About Sndfile Audio Plugin 關於 Sndfile 聲訊插件 - + Qmmp Sndfile Audio Plugin Qmmp Sndfile 聲訊插件 - + Compiled against 編譯依賴於 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> -- cgit v1.2.3-13-gbd6f