fixed command line plugin

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@640 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 16 insertions, 12 deletions

diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt
index 1fa84810a..881387776 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt
@@ -25,6 +25,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(libincdecvolumeoption_SRCS
     incdecvolumeoption.cpp
@@ -48,5 +49,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ADD_LIBRARY(incdecvolumeoption SHARED ${libincdecvolumeoption_SRCS} ${libincdecvolumeoption_MOC_SRCS} 
            ${libincdecvolumeoption_RCC_SRCS})
 add_dependencies(incdecvolumeoption qmmpui)
-target_link_libraries(incdecvolumeoption ${QT_LIBRARIES} -lqmmpui)
+target_link_libraries(incdecvolumeoption ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS incdecvolumeoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions)
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
index c385841f3..39f710127 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
@@ -28,7 +28,7 @@ INSTALLS += target
 
 INCLUDEPATH += ../../../../src
 
-LIBS += -lqmmpui
+LIBS += -lqmmpui -lqmmp
 
 HEADERS += incdecvolumeoption.h
 
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index 2b095c386..a33fb24f7 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -21,6 +21,7 @@
 #include <QtPlugin>
 #include <QTranslator>
 #include <QLocale>
+#include <qmmp/soundcore.h>
 
 #include "incdecvolumeoption.h"
 
@@ -48,10 +49,12 @@ const QString IncDecVolumeCommandLineOption::helpString() const
 
 void IncDecVolumeCommandLineOption::executeCommand(const QString& opt_str, CommandLineManager* clm)
 {
-    /*int volume = qMax(clm->leftVolume(), clm->rightVolume());
+    Q_UNUSED(clm);
+    SoundCore *core = SoundCore::instance();
+    int volume = qMax(core->leftVolume(), core->rightVolume());
     int balance = 0;
-    int left = clm->leftVolume();
-    int right = clm->rightVolume();
+    int left = core->leftVolume();
+    int right = core->rightVolume();
     if (left || right)
         balance = (right - left)*100/volume;
 
@@ -62,9 +65,9 @@ void IncDecVolumeCommandLineOption::executeCommand(const QString& opt_str, Comma
     else if (opt_str == "--volume-dec")
     {
         volume = qMax (0, volume - 5);
-    }*/
-    /*ctrl->setVolume(volume-qMax(balance,0)*volume/100,
-                    volume+qMin(balance,0)*volume/100);*/
+    }
+    core->setVolume(volume-qMax(balance,0)*volume/100,
+                    volume+qMin(balance,0)*volume/100);
 }
 
 const QString IncDecVolumeCommandLineOption::name() const
diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt
index d82bd30f3..46bc621ed 100644
--- a/src/plugins/General/mpris/CMakeLists.txt
+++ b/src/plugins/General/mpris/CMakeLists.txt
@@ -58,6 +58,6 @@ QT4_WRAP_CPP(libmpris_MOC_SRCS ${libmpris_MOC_HDRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(mpris SHARED ${libmpris_SRCS} ${libmpris_MOC_SRCS} ${libmpris_RCC_SRCS})
-add_dependencies(mpris qmmpui libqmmp)
+add_dependencies(mpris qmmpui)
 target_link_libraries(mpris ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS mpris DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt
index 0f2dde741..670428023 100644
--- a/src/plugins/General/notifier/CMakeLists.txt
+++ b/src/plugins/General/notifier/CMakeLists.txt
@@ -62,6 +62,6 @@ QT4_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(notifier SHARED ${libnotifier_SRCS} ${libnotifier_MOC_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS})
-add_dependencies(notifier qmmpui  libqmmp)
+add_dependencies(notifier qmmpui)
 target_link_libraries(notifier ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS notifier DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt
index cbaa6b3f2..8aa408780 100644
--- a/src/plugins/General/statusicon/CMakeLists.txt
+++ b/src/plugins/General/statusicon/CMakeLists.txt
@@ -60,6 +60,6 @@ QT4_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(statusicon SHARED ${libstatusicon_SRCS} ${libstatusicon_MOC_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS})
-add_dependencies(statusicon qmmpui libqmmp)
+add_dependencies(statusicon qmmpui)
 target_link_libraries(statusicon ${QT_LIBRARIES} -lqmmpui -lqmmp)
 install(TARGETS statusicon DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 998129114..292237903 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -167,7 +167,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_UIS_H}
   ${ui_RCC_SRCS})
 target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui)
-add_dependencies(qmmp qmmpui  libqmmp)
+add_dependencies(qmmp qmmpui libqmmp)
 install(TARGETS qmmp DESTINATION bin)
 install(FILES qmmp.desktop DESTINATION share/applications)
 install(FILES images/16x16/qmmp.png DESTINATION share/icons/hicolor/16x16/apps)