From d460e76525fed2b11df1ae348b55eba87ec53d3f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 20 Oct 2009 18:39:35 +0000 Subject: fixed problems with embedded cue, updated translation files git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1334 90c681e8-e032-0410-971d-27865f9a5e38 --- .../Input/wavpack/decoderwavpackfactory.cpp | 5 +++- .../wavpack/translations/wavpack_plugin_cs.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_de.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_it.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_lt.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_pl.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_ru.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_tr.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_uk_UA.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_zh_CN.ts | 28 +++++++++++----------- .../wavpack/translations/wavpack_plugin_zh_TW.ts | 28 +++++++++++----------- src/plugins/Input/wavpack/wavpackmetadatamodel.cpp | 28 ++++++++++++++++++++-- src/plugins/Input/wavpack/wavpackmetadatamodel.h | 4 ++++ 13 files changed, 174 insertions(+), 143 deletions(-) (limited to 'src/plugins/Input/wavpack') diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index 8558aa661..34d88eaed 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -118,7 +118,10 @@ QList DecoderWavPackFactory::createPlayList(const QString &fileName, MetaDataModel* DecoderWavPackFactory::createMetaDataModel(const QString &path, QObject *parent) { - return new WavPackMetaDataModel(path, parent); + if (!path.contains("://") || path.startsWith("wvpack://")) + return new WavPackMetaDataModel(path, parent); + else + return 0; } void DecoderWavPackFactory::showSettings(QWidget *) diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts index 7f497987b..e751cab94 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts @@ -9,22 +9,22 @@ Modul WavPack - + About WavPack Audio Plugin O modulu WavPack - + Qmmp WavPack Audio Plugin Vstupní modul Qmmp WavPack - + WavPack library version: Verze knihovny WavPack: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length Délka - + Sample rate Vzorkovací frekvence - + Hz Hz - + Channels Počet kanálů - + Bitrate Datový tok - + kbps kbps - + File size Velikost souboru - + KB KB - + Ratio Poměr - + Version Verze diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts index 621e73780..593022ef3 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts @@ -9,22 +9,22 @@ WavPack-Modul - + About WavPack Audio Plugin Über WavPack-Audio-Modul - + Qmmp WavPack Audio Plugin Qmmp WavPack-Audio-Modul - + WavPack library version: WavPack-Bibliotheksversion: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length Länge - + Sample rate Abtastrate - + Hz Hz - + Channels Kanäle - + Bitrate Bitrate - + kbps kbps - + File size Dategröße - + KB KB - + Ratio Ratio - + Version Version diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts index 54099c17b..3b17a41a9 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts @@ -9,22 +9,22 @@ Modulo WavPack - + About WavPack Audio Plugin Info sul modulo audio WavPack - + Qmmp WavPack Audio Plugin Modulo audio WavPack per Qmmp - + WavPack library version: Versione libreria per WavPack: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilya Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length Lunghezza - + Sample rate Campionatura - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size Dimensione filoe - + KB KB - + Ratio Ratio - + Version diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts index 5d122a4c9..a71897d56 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts @@ -14,22 +14,22 @@ WavPack bylos - + About WavPack Audio Plugin Apie WavPack audio įskiepį - + Qmmp WavPack Audio Plugin Qmmp WavPack audio įskiepis - + WavPack library version: WavPack bibliotekos versija: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Sukurta: Ilya Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB - + Ratio - + Version diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_pl.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_pl.ts index 5102304cb..1160d7d10 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_pl.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_pl.ts @@ -14,22 +14,22 @@ Pliki WavPack - + About WavPack Audio Plugin O wtyczce WavPack Audio - + Qmmp WavPack Audio Plugin Wtyczka WavPack dla Qmmp - + WavPack library version: Wersja biblioteki WavPack: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length Długość - + Sample rate Próbkowanie - + Hz - + Channels Kanały - + Bitrate Szybkość transmisji - + kbps - + File size Wielkość pliku - + KB - + Ratio Współczynnik - + Version Wersja diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts index aced68846..ec2343396 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts @@ -14,22 +14,22 @@ Файлы WavPack - + About WavPack Audio Plugin Об аудио-модуле WavPack - + Qmmp WavPack Audio Plugin Аудио-модуль WavPack для Qmmp - + WavPack library version: Версия библиотеки WavPack: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length Длительность - + Sample rate Дискретизация - + Hz Гц - + Channels Каналов - + Bitrate Битовая частота - + kbps Кб/с - + File size Размер файла - + KB КБ - + Ratio Сжатие - + Version Версия diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts index f15243880..f90c83566 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts @@ -14,22 +14,22 @@ WavPack Dosyaları - + About WavPack Audio Plugin WavPack Ses Eklentisi Hakkında - + Qmmp WavPack Audio Plugin Qmmp WavPack Ses Eklentisi - + WavPack library version: WavPack kitaplık sürümü: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB - + Ratio - + Version diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts index 55348d1b9..963d8533c 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts @@ -14,22 +14,22 @@ Файли WavPack - + About WavPack Audio Plugin Про аудіо-модуль WavPack - + Qmmp WavPack Audio Plugin Аудіо-модуль WavPack для Qmmp - + WavPack library version: Версія бібліотеки WavPack: - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length Тривалість - + Sample rate Частота - + Hz Гц - + Channels Канали - + Bitrate Бітрейт - + kbps кБ/с - + File size Розмір файлу - + KB кБ - + Ratio Стиснення - + Version Версія diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts index ba9e0a57c..c35912128 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts @@ -9,22 +9,22 @@ WavPack 插件 - + About WavPack Audio Plugin 关于 WavPack 音频插件 - + Qmmp WavPack Audio Plugin Qmmp WavPack 音频插件 - + WavPack library version: WavPack 库版本： - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB - + Ratio - + Version diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts index 70aafe6ef..a9ed34d45 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts @@ -9,22 +9,22 @@ WavPack 插件 - + About WavPack Audio Plugin 關於 WavPack 聲訊插件 - + Qmmp WavPack Audio Plugin Qmmp WavPack 聲訊插件 - + WavPack library version: WavPack 程式庫版本： - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> @@ -37,52 +37,52 @@ WavPackMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB - + Ratio - + Version diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp index 4eebbb9b4..ce8a02d84 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp @@ -19,19 +19,32 @@ ***************************************************************************/ #include +#include #include "wavpackmetadatamodel.h" WavPackMetaDataModel::WavPackMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { + if(path.contains("://")) + { + QString p = QUrl(path).path(); + p.replace(QString(QUrl::toPercentEncoding("#")), "#"); + p.replace(QString(QUrl::toPercentEncoding("?")), "?"); + p.replace(QString(QUrl::toPercentEncoding("%")), "%"); + m_path = p; + } + else + m_path = path; + char err[80]; - m_ctx = WavpackOpenFileInput (path.toLocal8Bit(), err, + m_ctx = WavpackOpenFileInput (m_path.toLocal8Bit(), err, OPEN_WVC | OPEN_EDIT_TAGS, 0); if (!m_ctx) { qWarning("WavPackMetaDataModel: error: %s", err); return; } - m_tags << new WavPackFileTagModel(m_ctx); + if(!path.contains("://")) + m_tags << new WavPackFileTagModel(m_ctx); } WavPackMetaDataModel::~WavPackMetaDataModel() @@ -66,6 +79,17 @@ QList WavPackMetaDataModel::tags() return m_tags; } +QPixmap WavPackMetaDataModel::cover() +{ + QString cPath = coverPath(); + return cPath.isEmpty() ? QPixmap() : QPixmap(cPath); +} + +QString WavPackMetaDataModel::coverPath() +{ + return MetaDataManager::instance()->getCoverPath(m_path); +} + WavPackFileTagModel::WavPackFileTagModel(WavpackContext *ctx) : TagModel(TagModel::Save) { m_ctx = ctx; diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.h b/src/plugins/Input/wavpack/wavpackmetadatamodel.h index 8d322fcd8..ced26a7d3 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.h +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.h @@ -34,10 +34,13 @@ public: ~WavPackMetaDataModel(); QHash audioProperties(); QList tags(); + QPixmap cover(); + QString coverPath(); private: WavpackContext *m_ctx; QList m_tags; + QString m_path; }; class WavPackFileTagModel : public TagModel @@ -52,6 +55,7 @@ public: private: WavpackContext *m_ctx; + QString m_path; }; #endif // WAVPACKMETADATAMODEL_H -- cgit v1.2.3-13-gbd6f