diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-02-22 14:53:23 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-02-22 14:53:23 +0000 |
| commit | 36460a06f31ca92371d84d59bd9dd52f0c5a46a0 (patch) | |
| tree | f6ad1a44302c92083467dfc139b6362068c6d1ed /src/plugins | |
| parent | 5e38daa8fa1d75f7f9d3fd563f2c25a528813f46 (diff) | |
| download | qmmp-36460a06f31ca92371d84d59bd9dd52f0c5a46a0.tar.gz qmmp-36460a06f31ca92371d84d59bd9dd52f0c5a46a0.tar.bz2 qmmp-36460a06f31ca92371d84d59bd9dd52f0c5a46a0.zip | |
reverted r1563 (Closes issue 254)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1566 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
12 files changed, 34 insertions, 44 deletions
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index fec80a46e..bf315c2eb 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Ilya Kotov * + * Copyright (C) 2008-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -120,21 +120,11 @@ bool MplayerEngine::enqueue(InputSource *source) } if(!supports) return FALSE; - + source->deleteLater(); if(m_process->state() == QProcess::NotRunning) m_url = url; else - { - if(source->isQueued()) - m_files.enqueue(url); - else - { - stop(); - m_url = url; - start(); - } - } - source->deleteLater(); + m_files.enqueue(url); return TRUE; } diff --git a/src/plugins/Engines/mplayer/mplayerengine.h b/src/plugins/Engines/mplayer/mplayerengine.h index bd34b535c..cc6b12d16 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.h +++ b/src/plugins/Engines/mplayer/mplayerengine.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Ilya Kotov * + * Copyright (C) 2008-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Input/cue/translations/cue_plugin_cs.ts b/src/plugins/Input/cue/translations/cue_plugin_cs.ts index 5f1b7fca3..bda307b84 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_cs.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_cs.ts @@ -14,17 +14,17 @@ <translation>Soubory CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>O modulu CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Modul Qmmp CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autor: Ilja Kotov <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_de.ts b/src/plugins/Input/cue/translations/cue_plugin_de.ts index 18ebf19c6..53809fb07 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_de.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_de.ts @@ -14,17 +14,17 @@ <translation>CUE-Dateien</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>Über CUE-Audio-Modul</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Qmmp CUE-Audio-Modul</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autor: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_it.ts b/src/plugins/Input/cue/translations/cue_plugin_it.ts index 0e388e6e2..1f925dc53 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_it.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_it.ts @@ -14,17 +14,17 @@ <translation>Brani CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>Informazioni sul Modulo audio CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Modulo audio CUE per Qmmp</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autore: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_lt.ts b/src/plugins/Input/cue/translations/cue_plugin_lt.ts index 6147f8622..8bebeacf7 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_lt.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_lt.ts @@ -14,17 +14,17 @@ <translation>CUE bylos</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>Apie CUE audio įskiepį</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Qmmp CUE audio įskiepis</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Sukūrė:Ilya Kotov </translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_pl.ts b/src/plugins/Input/cue/translations/cue_plugin_pl.ts index a1e2c4815..56f3c16b7 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_pl.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_pl.ts @@ -14,17 +14,17 @@ <translation>Pliki CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>O wtyczce CUE Audio</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>O wtyczce CUE dla Qmmp</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Autor: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_ru.ts b/src/plugins/Input/cue/translations/cue_plugin_ru.ts index dc5055fde..6f467534b 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_ru.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_ru.ts @@ -14,17 +14,17 @@ <translation>Файлы CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>Об аудио-модуле CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Аудио-модуль CUE для Qmmp</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Разработчик: Илья Котов</translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_tr.ts b/src/plugins/Input/cue/translations/cue_plugin_tr.ts index d14bf66da..38f2425d8 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_tr.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_tr.ts @@ -14,17 +14,17 @@ <translation>CUE Dosyaları</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>CUE Ses Eklentisi Hakkında</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Qmmp CUE Ses Eklentisi</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Yazan: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts b/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts index 42f604117..4b76a2b98 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts @@ -14,17 +14,17 @@ <translation>Файли CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>Про аудіо-модуль CUE</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Аудіо-модуль CUE для Qmmp</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>Розробник: Ілля Котов <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts b/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts index 3a6e9c378..beed1d6dd 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts @@ -14,17 +14,17 @@ <translation>CUE 文件</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>关于 CUE 音频插件</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Qmmp CUE 音频插件</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>作者：Ilya Kotov <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts b/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts index 6aadfcd09..b7e0bb081 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts @@ -14,17 +14,17 @@ <translation>CUE 檔案</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="83"/> + <location filename="../decodercuefactory.cpp" line="85"/> <source>About CUE Audio Plugin</source> <translation>關於 CUE 聲訊插件</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="84"/> + <location filename="../decodercuefactory.cpp" line="86"/> <source>Qmmp CUE Audio Plugin</source> <translation>Qmmp CUE 聲訊插件</translation> </message> <message> - <location filename="../decodercuefactory.cpp" line="85"/> + <location filename="../decodercuefactory.cpp" line="87"/> <source>Writen by: Ilya Kotov <forkotov02@hotmail.ru></source> <translation>作者：Ilya Kotov <forkotov02@hotmail.ru></translation> </message> |