general api cleanup

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

2 files changed, 11 insertions, 10 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 80bcea56d..998129114 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -167,6 +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)
 install(TARGETS qmmp DESTINATION bin)
 install(FILES qmmp.desktop DESTINATION share/applications)
 install(FILES images/16x16/qmmp.png DESTINATION share/icons/hicolor/16x16/apps)
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index a0d7ac854..a13005ae2 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -142,15 +142,15 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option
 
     m_generalHandler = new GeneralHandler(this);
     connect(m_generalHandler, SIGNAL(playCalled()), SLOT(play()));
-    connect(m_generalHandler, SIGNAL(nextCalled()), SLOT(next()));
+    /*connect(m_generalHandler, SIGNAL(nextCalled()), SLOT(next()));
     connect(m_generalHandler, SIGNAL(previousCalled()), SLOT(previous()));
     connect(m_generalHandler, SIGNAL(stopCalled()), SLOT(stop()));
     connect(m_generalHandler, SIGNAL(pauseCalled()), SLOT(pause()));
-    connect(m_generalHandler, SIGNAL(seekCalled(int)), SLOT(seek(int)));
+    connect(m_generalHandler, SIGNAL(seekCalled(int)), SLOT(seek(int)));*/
     connect(m_generalHandler, SIGNAL(toggleVisibilityCalled()), SLOT(toggleVisibility()));
     connect(m_generalHandler, SIGNAL(exitCalled()), SLOT(close()));
-    connect(m_generalHandler, SIGNAL(volumeChanged(int, int)),
-            m_core, SLOT(setVolume(int, int)));
+    /*connect(m_generalHandler, SIGNAL(volumeChanged(int, int)),
+            m_core, SLOT(setVolume(int, int)));*/
 
     m_playListModel->readSettings();
     char buf[PATH_MAX + 1];
@@ -187,7 +187,7 @@ void MainWindow::play()
     if (s.isEmpty())
         return;
     if (m_core->play(s))
-        m_generalHandler->setTime(0);
+        /*m_generalHandler->setTime(0)*/;
     else
     {
         //find out the reason why playback failed
@@ -316,7 +316,7 @@ void MainWindow::showState(Qmmp::State state)
     {
     case Qmmp::Playing:
     {
-        m_generalHandler->setState(General::Playing);
+        //m_generalHandler->setState(General::Playing);
         /*if (m_playListModel->currentItem())
         {
             SongInfo info = *m_playListModel->currentItem();
@@ -330,12 +330,12 @@ void MainWindow::showState(Qmmp::State state)
     }
     case Qmmp::Paused:
     {
-        m_generalHandler->setState(General::Paused);
+        //m_generalHandler->setState(General::Paused);
         break;
     }
     case Qmmp::Stopped:
     {
-        m_generalHandler->setState(General::Stopped);
+        //m_generalHandler->setState(General::Stopped);
         m_playlist->setTime(-1);
         m_titlebar->setTime(-1);
         break;
@@ -367,7 +367,7 @@ void MainWindow::showMetaData()
         info.setValue(SongInfo::STREAM, !QFile::exists(m_playlist->currentItem()->path()));
         info.setValue(SongInfo::PATH, m_playlist->currentItem()->path());
         info.setValue(SongInfo::LENGTH, m_playlist->currentItem()->length());
-        m_generalHandler->setSongInfo(info);
+        //m_generalHandler->setSongInfo(info);
         m_playlist->currentItem()->updateMetaData(m_core->metaData());
         m_playlist->listWidget()->updateList();
     }
@@ -381,7 +381,7 @@ void MainWindow::changeTitle(const QString &title)
     SongInfo info;
     info.setValue(SongInfo::TITLE, title);
     info.setValue(SongInfo::STREAM, TRUE);
-    m_generalHandler->setSongInfo(info);
+    //m_generalHandler->setSongInfo(info);
 }
 
 void MainWindow::closeEvent ( QCloseEvent *)