From 0ffa05b536ad907e63d34a1ab7244ce159354269 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 17 Feb 2009 11:17:47 +0000
Subject: fixed proxy support, fixed xspf version

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@790 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/PlaylistFormats/xspf/CMakeLists.txt         | 3 ++-
 src/plugins/PlaylistFormats/xspf/xspf.pro               | 2 +-
 src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/plugins/PlaylistFormats')

diff --git a/src/plugins/PlaylistFormats/xspf/CMakeLists.txt b/src/plugins/PlaylistFormats/xspf/CMakeLists.txt
index f71e09782..a084ba897 100644
--- a/src/plugins/PlaylistFormats/xspf/CMakeLists.txt
+++ b/src/plugins/PlaylistFormats/xspf/CMakeLists.txt
@@ -29,6 +29,7 @@ SET(QT_INCLUDES
 # libqmmpui
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 SET(libxspfplaylistformat_SRCS
     xspfplaylistformat.cpp
@@ -49,5 +50,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(xspfplaylistformat SHARED ${libxspfplaylistformat_SRCS} ${libxspfplaylistformat_MOC_SRCS})
 add_dependencies(xspfplaylistformat qmmpui)
-target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} -lqmmpui)
+target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats)
diff --git a/src/plugins/PlaylistFormats/xspf/xspf.pro b/src/plugins/PlaylistFormats/xspf/xspf.pro
index 1e5716f58..784f15c79 100644
--- a/src/plugins/PlaylistFormats/xspf/xspf.pro
+++ b/src/plugins/PlaylistFormats/xspf/xspf.pro
@@ -19,7 +19,7 @@ INSTALLS += target
 
 INCLUDEPATH += ../../../../src
 
-LIBS += -lqmmpui
+LIBS += -lqmmpui -lqmmp
 
 QT += xml
 SOURCES += xspfplaylistformat.cpp
diff --git a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
index 997867caa..602864043 100644
--- a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
@@ -24,9 +24,7 @@
 #include <QUrl>
 #include <QtPlugin>
 
-#ifndef QMMP_STR_VERSION
-#define QMMP_STR_VERSION "0.2.0"
-#endif
+#include <qmmp/qmmp.h>
 
 #include "xspfplaylistformat.h"
 
@@ -78,7 +76,7 @@ QString XSPFPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & files)
     root.setAttribute("xmlns",QString("http://xspf.org/ns/0/"));
 
     QDomElement creator = doc.createElement("creator");
-    QDomText text = doc.createTextNode("qmmp-" + QString(QMMP_STR_VERSION));
+    QDomText text = doc.createTextNode("qmmp-" + Qmmp::strVersion());
     creator.appendChild(text);
     root.appendChild(creator);
 
-- 
cgit v1.2.3-13-gbd6f