From 136ed47dafbd60544add69a7f2d720b7929bd83e Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 20 Jul 2009 16:02:04 +0000 Subject: enabled sndfile plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1052 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/CMakeLists.txt | 8 +- src/plugins/Input/Input.pro | 2 +- src/plugins/Input/sndfile/decoder_sndfile.cpp | 193 +++------------------ src/plugins/Input/sndfile/decoder_sndfile.h | 27 +-- .../sndfile/translations/sndfile_plugin_cs.ts | 11 +- .../sndfile/translations/sndfile_plugin_de.ts | 12 +- .../sndfile/translations/sndfile_plugin_it.ts | 16 +- .../sndfile/translations/sndfile_plugin_ru.ts | 16 +- .../sndfile/translations/sndfile_plugin_uk_UA.ts | 16 +- .../sndfile/translations/sndfile_plugin_zh_CN.ts | 15 +- .../sndfile/translations/sndfile_plugin_zh_TW.ts | 15 +- 11 files changed, 86 insertions(+), 245 deletions(-) (limited to 'src') diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index 403ce0725..fe3909cb9 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -21,7 +21,7 @@ add_subdirectory(mad) ENDIF(USE_MAD AND TAGLIB_FOUND) IF(USE_FLAC AND TAGLIB_FOUND) -add_subdirectory(flac) +#add_subdirectory(flac) ENDIF(USE_FLAC AND TAGLIB_FOUND) IF(USE_VORBIS AND TAGLIB_FOUND) @@ -37,7 +37,7 @@ add_subdirectory(mpc) ENDIF(USE_MPC AND TAGLIB_FOUND) IF(USE_SNDFILE) -#add_subdirectory(sndfile) +add_subdirectory(sndfile) ENDIF(USE_SNDFILE) IF(USE_WAVPACK) @@ -53,11 +53,11 @@ IF(USE_AAC) ENDIF(USE_AAC) IF(USE_CUE) -add_subdirectory(cue) +#add_subdirectory(cue) ENDIF(USE_CUE) IF(USE_MPLAYER) -add_subdirectory(mplayer) +#add_subdirectory(mplayer) ENDIF(USE_MPLAYER) IF(USE_CDA) diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index 9bd6f6dcd..1f31ec065 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(***************************) diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp index 9152913fe..77e4438c2 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.cpp +++ b/src/plugins/Input/sndfile/decoder_sndfile.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 * @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -35,92 +34,23 @@ DecoderSndFile::DecoderSndFile(QObject *parent, DecoderFactory *d, Output *o, c : Decoder(parent, d, o) { m_path = path; - m_inited = FALSE; - m_user_stop = FALSE; - m_output_buf = 0; - m_output_bytes = 0; - m_output_at = 0; - bks = 0; - m_done = FALSE; - m_finish = FALSE; - m_freq = 0; m_bitrate = 0; - m_seekTime = -1.0; - m_totalTime = 0.0; - m_chan = 0; - m_output_size = 0; - m_buf = 0; + m_totalTime = 0; m_sndfile = 0; + m_freq = 0; } - DecoderSndFile::~DecoderSndFile() { deinit(); } - -void DecoderSndFile::stop() -{ - m_user_stop = TRUE; -} - - -void DecoderSndFile::flush(bool final) -{ - ulong min = final ? 0 : bks; - - while ((! m_done && ! m_finish) && m_output_bytes > min) - { - output()->recycler()->mutex()->lock (); - - while ((! m_done && ! m_finish) && output()->recycler()->full()) - { - mutex()->unlock(); - - output()->recycler()->cond()->wait(output()->recycler()->mutex()); - - mutex()->lock (); - m_done = m_user_stop; - } - - if (m_user_stop || m_finish) - { - m_inited = FALSE; - m_done = TRUE; - } - else - { - m_output_bytes -= produceSound(m_output_buf, m_output_bytes, m_bitrate, m_chan); - m_output_size += bks; - m_output_at = m_output_bytes; - } - - if (output()->recycler()->full()) - { - output()->recycler()->cond()->wakeOne(); - } - - output()->recycler()->mutex()->unlock(); - } -} - - bool DecoderSndFile::initialize() { - bks = Buffer::size(); - m_inited = m_user_stop = m_done = m_finish = FALSE; - m_freq = m_bitrate = 0; - m_output_size = 0; - m_seekTime = -1.0; + m_bitrate = 0; m_totalTime = 0.0; SF_INFO snd_info; - if (!m_output_buf) - m_output_buf = new char[globalBufferSize]; - m_output_at = 0; - m_output_bytes = 0; - memset (&snd_info, 0, sizeof(snd_info)); snd_info.format=0; m_sndfile = sf_open(m_path.toLocal8Bit(), SFM_READ, &snd_info); @@ -131,123 +61,42 @@ bool DecoderSndFile::initialize() } m_freq = snd_info.samplerate; - m_chan = snd_info.channels; - + int chan = snd_info.channels; m_totalTime = snd_info.frames * 1000 / m_freq; - m_bitrate = QFileInfo(m_path).size () * 8.0 / m_totalTime + 0.5; - configure(m_freq, m_chan, 16); - m_buf = new short[bks / sizeof(short)]; - m_inited = TRUE; + configure(m_freq, chan, 16); qDebug("DecoderSndFile: detected format: %08X", snd_info.format); qDebug("DecoderSndFile: initialize succes"); return TRUE; } +void DecoderSndFile::deinit() +{ + m_totalTime = 0; + m_bitrate = 0; + m_freq = 0; + if (m_sndfile) + sf_close(m_sndfile); + m_sndfile = 0; +} qint64 DecoderSndFile::totalTime() { - if (! m_inited) - return 0; - return m_totalTime; } - -void DecoderSndFile::seek(qint64 pos) +int DecoderSndFile::bitrate() { - m_seekTime = pos; + return m_bitrate; } - -void DecoderSndFile::deinit() +qint64 DecoderSndFile::readAudio(char *audio, qint64 maxSize) { - m_inited = m_user_stop = m_done = m_finish = FALSE; - m_freq = m_bitrate = m_chan = 0; - m_output_size = 0; - if (m_inited) - { - delete m_buf; - m_buf = 0; - sf_close(m_sndfile); - m_sndfile = 0; - } + return sizeof(short)* sf_read_short (m_sndfile, (short *)audio, maxSize / sizeof(short)); } -void DecoderSndFile::run() +void DecoderSndFile::seekAudio(qint64 pos) { - - long len = 0; - - mutex()->lock (); - - if (!m_inited) - { - mutex()->unlock(); - return; - } - mutex()->unlock(); - - while (!m_done && !m_finish) - { - mutex()->lock (); - // decode - - if (m_seekTime >= 0) - { - m_output_size = sf_seek(m_sndfile, m_freq*m_seekTime/1000, SEEK_SET); - m_seekTime = -1.0; - } - - len = sizeof(short)* sf_read_short (m_sndfile, m_buf, bks / sizeof(short)); - - if (len > 0) - { - memmove((char *)(m_output_buf + m_output_at), (char *) m_buf, len); - m_output_at += len; - m_output_bytes += len; - - if (output()) - flush(); - } - else if (len == 0) - { - flush(TRUE); - - if (output()) - { - output()->recycler()->mutex()->lock (); - // end of stream - while (! output()->recycler()->empty() && ! m_user_stop) - { - output()->recycler()->cond()->wakeOne(); - mutex()->unlock(); - output()->recycler()->cond()->wait(output()->recycler()->mutex()); - mutex()->lock (); - } - output()->recycler()->mutex()->unlock(); - } - - m_done = TRUE; - if (! m_user_stop) - { - m_finish = TRUE; - } - } - else - { - // error in read - qWarning("DecoderSndFile: Error while decoding stream, File appears to be corrupted"); - m_finish = TRUE; - } - mutex()->unlock(); - } - - mutex()->lock (); - if (m_finish) - finish(); - mutex()->unlock(); - - deinit(); + 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 c62544193..9b1bb6fb0 100644 --- a/src/plugins/Input/sndfile/decoder_sndfile.h +++ b/src/plugins/Input/sndfile/decoder_sndfile.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 * @@ -36,30 +36,19 @@ public: // Standard Decoder API bool initialize(); qint64 totalTime(); - void seek(qint64); - void stop(); - + int bitrate(); private: - // thread run function - void run(); + qint64 readAudio(char *audio, qint64 maxSize); + void seekAudio(qint64 time); + // helper functions - void flush(bool = FALSE); void deinit(); - // output buffer - char *m_output_buf; - SNDFILE *m_sndfile; - ulong m_output_bytes, m_output_at; - //struct sndfile_data *m_data; - short *m_buf; - unsigned int bks; - bool m_done, m_finish, m_inited, m_user_stop; - long m_freq, m_bitrate; - int m_chan; - qint64 m_output_size; - qint64 m_totalTime, m_seekTime; + int m_bitrate; + quint32 m_freq; + qint64 m_totalTime; QString m_path; }; diff --git a/src/plugins/Input/sndfile/translations/sndfile_plugin_cs.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_cs.ts index 391499027..ab078bd0d 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_cs.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_cs.ts @@ -1,5 +1,6 @@ - + + DecoderSndFileFactory @@ -13,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 28e72feb4..8ebf2e136 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_de.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_de.ts @@ -4,32 +4,32 @@ DecoderSndFileFactory - + Sndfile Plugin Sndfile-Modul - + PCM Files 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 aba6f4c79..e2c33fbd4 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_it.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_it.ts @@ -1,35 +1,35 @@ - - + + DecoderSndFileFactory - + Sndfile Plugin Modulo Sndfile - + PCM Files 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_ru.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_ru.ts index 453193760..1f7262ec6 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_ru.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_ru.ts @@ -1,35 +1,35 @@ - - + + DecoderSndFileFactory - + Sndfile Plugin Модуль Sndfile - + PCM Files Файлы 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_uk_UA.ts b/src/plugins/Input/sndfile/translations/sndfile_plugin_uk_UA.ts index 7250965d2..06d72eba5 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_uk_UA.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_uk_UA.ts @@ -1,35 +1,35 @@ - - + + DecoderSndFileFactory - + Sndfile Plugin Модуль Sndfile - + PCM Files Файли 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 be0f23d45..172f8ddfe 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_CN.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_CN.ts @@ -1,34 +1,35 @@ - + + DecoderSndFileFactory - + Sndfile Plugin Sndfile 插件 - + PCM Files 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 74dd14453..cbc9f15f1 100644 --- a/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_TW.ts +++ b/src/plugins/Input/sndfile/translations/sndfile_plugin_zh_TW.ts @@ -1,34 +1,35 @@ - + + DecoderSndFileFactory - + Sndfile Plugin Sndfile 插件 - + PCM Files 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