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 --- src/plugins/Input/flac/decoderflacfactory.cpp | 5 +++- src/plugins/Input/flac/flacmetadatamodel.cpp | 30 ++++++++++++++++++++-- src/plugins/Input/flac/flacmetadatamodel.h | 2 ++ .../Input/flac/translations/flac_plugin_cs.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_de.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_it.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_lt.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_pl.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_ru.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_tr.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_uk_UA.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_zh_CN.ts | 22 ++++++++-------- .../Input/flac/translations/flac_plugin_zh_TW.ts | 22 ++++++++-------- 13 files changed, 144 insertions(+), 113 deletions(-) (limited to 'src/plugins/Input/flac') diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index af1f1ad86..e87e96b71 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -120,7 +120,10 @@ QList DecoderFLACFactory::createPlayList(const QString &fileName, bo MetaDataModel*DecoderFLACFactory::createMetaDataModel(const QString &path, QObject *parent) { - return new FLACMetaDataModel(path, parent); + if (!path.contains("://") || path.startsWith("flac://")) + return new FLACMetaDataModel(path, parent); + else + return 0; } void DecoderFLACFactory::showSettings(QWidget *) diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index d18048f29..6ff5b0c8c 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -18,9 +18,11 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include #include #include #include +#include #include "flacmetadatamodel.h" #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) @@ -28,8 +30,19 @@ FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { - m_path = path; - m_tags << new VorbisCommentModel(path); + if(path.startsWith("flac://")) + { + 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; + m_tags << new VorbisCommentModel(path); + } } FLACMetaDataModel::~FLACMetaDataModel() @@ -42,6 +55,8 @@ QHash FLACMetaDataModel::audioProperties() { QHash ap; TagLib::FLAC::File f (m_path.toLocal8Bit()); + if(!f.audioProperties()) + return ap; QString text = QString("%1").arg(f.audioProperties()->length()/60); text +=":"+QString("%1").arg(f.audioProperties()->length()%60,2,10,QChar('0')); ap.insert(tr("Length"), text); @@ -57,6 +72,17 @@ QList FLACMetaDataModel::tags() return m_tags; } +QPixmap FLACMetaDataModel::cover() +{ + QString cPath = coverPath(); + return cPath.isEmpty() ? QPixmap() : QPixmap(cPath); +} + +QString FLACMetaDataModel::coverPath() +{ + return MetaDataManager::instance()->getCoverPath(m_path); +} + VorbisCommentModel::VorbisCommentModel(const QString &path) : TagModel(TagModel::Save) { m_file = new TagLib::FLAC::File (path.toLocal8Bit().constData()); diff --git a/src/plugins/Input/flac/flacmetadatamodel.h b/src/plugins/Input/flac/flacmetadatamodel.h index 4a5310c90..c8f77bd81 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.h +++ b/src/plugins/Input/flac/flacmetadatamodel.h @@ -33,6 +33,8 @@ public: ~FLACMetaDataModel(); QHash audioProperties(); QList tags(); + QPixmap cover(); + QString coverPath(); private: QString m_path; diff --git a/src/plugins/Input/flac/translations/flac_plugin_cs.ts b/src/plugins/Input/flac/translations/flac_plugin_cs.ts index d1b2068d0..29788da76 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_cs.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_cs.ts @@ -14,17 +14,17 @@ Soubory FLAC - + About FLAC Audio Plugin O modulu FLAC - + Qmmp FLAC Audio Plugin Vstupní modul Qmmp FLAC - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + 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 diff --git a/src/plugins/Input/flac/translations/flac_plugin_de.ts b/src/plugins/Input/flac/translations/flac_plugin_de.ts index f0eae60d9..f63321c51 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_de.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_de.ts @@ -14,17 +14,17 @@ FLAC-Dateien - + About FLAC Audio Plugin Über FLAC-Audio-Modul - + Qmmp FLAC Audio Plugin Qmmp FLAC-Audio-Modul - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Länge - + Sample rate Abtastrate - + Hz Hz - + Channels Kanäle - + Bitrate Bitrate - + kbps kbps - + File size Dateigröße - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_it.ts b/src/plugins/Input/flac/translations/flac_plugin_it.ts index 511145393..04036878a 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_it.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_it.ts @@ -14,17 +14,17 @@ Brani FLAC - + About FLAC Audio Plugin Info sul modulo audio FLAC - + Qmmp FLAC Audio Plugin Modulo Audio FLAC per Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilja Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_lt.ts b/src/plugins/Input/flac/translations/flac_plugin_lt.ts index 633d57ad8..e6ed23774 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_lt.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_lt.ts @@ -14,17 +14,17 @@ FLAC bylos - + About FLAC Audio Plugin Apie FLAC audio įskiepį - + Qmmp FLAC Audio Plugin Qmmp FLAC audio įskiepis - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Sukūrė: Ilya Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_pl.ts b/src/plugins/Input/flac/translations/flac_plugin_pl.ts index 6f2a5942b..2d7c4e031 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_pl.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_pl.ts @@ -14,17 +14,17 @@ Pliki FLAC - + About FLAC Audio Plugin O wtyczce FLAC Audio - + Qmmp FLAC Audio Plugin Wtyczka FLAC Audio dla Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Długość - + Sample rate Próbkowanie - + Hz - + Channels Kanały - + Bitrate Szybkość transmisji - + kbps - + File size Wielkość pliku - + KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_ru.ts b/src/plugins/Input/flac/translations/flac_plugin_ru.ts index 1064e6b40..ee0e247a6 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_ru.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_ru.ts @@ -14,17 +14,17 @@ Файлы FLAC - + About FLAC Audio Plugin Об аудио-модуле FLAC - + Qmmp FLAC Audio Plugin Аудио-модуль FLAC для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Длительность - + Sample rate Дискретизация - + Hz Гц - + Channels Каналов - + Bitrate Битовая частота - + kbps Кб/с - + File size Размер файла - + KB КБ diff --git a/src/plugins/Input/flac/translations/flac_plugin_tr.ts b/src/plugins/Input/flac/translations/flac_plugin_tr.ts index 70c9bda89..5445f9ee1 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_tr.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_tr.ts @@ -14,17 +14,17 @@ FLAC Dosyaları - + About FLAC Audio Plugin FLAC Ses Eklentisi Hakkında - + Qmmp FLAC Audio Plugin Qmmp FLAC Ses Eklentisi - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts b/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts index a286490ab..e61de121c 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts @@ -14,17 +14,17 @@ Файли FLAC - + About FLAC Audio Plugin Про аудіо-модуль FLAC - + Qmmp FLAC Audio Plugin Аудіо-модуль FLAC для Qmmp - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Тривалість - + Sample rate Частота - + Hz Гц - + Channels Канали - + Bitrate Бітрейт - + kbps Кб/с - + File size Розмір файлу - + KB Кб diff --git a/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts b/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts index fc059781a..86465eb56 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts @@ -14,17 +14,17 @@ FLAC 文件 - + About FLAC Audio Plugin 关于 FLAC 音频插件 - + Qmmp FLAC Audio Plugin Qmmp FLAC 音频插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts b/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts index 5b7e41732..b8abead10 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts @@ -14,17 +14,17 @@ FLAC 檔案 - + About FLAC Audio Plugin 關於 FLAC 聲訊插件 - + Qmmp FLAC Audio Plugin Qmmp FLAC 聲訊插件 - + Writen by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB -- cgit v1.2.3-13-gbd6f