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

1 files changed, 26 insertions, 2 deletions

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 <QMap>
+#include <qmmp/metadatamanager.h>
 #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<TagModel* > 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;