From 1763b5effcfba6dd51f805c5948c9108f7c97348 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 2 Jul 2011 11:58:53 +0000 Subject: fixed command line option, removed unused code git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2259 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/mainwindow.cpp | 32 -------------------------------- src/plugins/Ui/skinned/mainwindow.h | 3 --- 2 files changed, 35 deletions(-) (limited to 'src/plugins/Ui/skinned') diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index cfb6bf927..972cf967e 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.cpp @@ -49,7 +49,6 @@ #include "visualmenu.h" #include "windowsystem.h" #include "actionmanager.h" -//#include "builtincommandlineoption.h" #define KEY_OFFSET 10000 @@ -183,7 +182,6 @@ void MainWindow::previous() void MainWindow::showState(Qmmp::State state) { - disconnectPl(); switch ((int) state) { case Qmmp::Playing: @@ -525,26 +523,6 @@ void MainWindow::savePlaylist() qWarning("Error: There is no registered playlist parsers"); } -void MainWindow::setFileList(const QStringList &l, bool clear) -{ - m_pl_manager->activatePlayList(m_pl_manager->selectedPlayList()); - if(!clear) - { - m_pl_manager->selectedPlayList()->add(l); - return; - } - if (m_core->state() != Qmmp::Stopped) - { - stop(); - qApp->processEvents(); //receive stop signal - } - m_model = m_pl_manager->selectedPlayList(); - m_model->clear(); - connect(m_model, SIGNAL(itemAdded(PlayListItem*)), SLOT(play())); - connect(m_model, SIGNAL(loaderFinished()), SLOT(disconnectPl())); - m_model->add(l); -} - void MainWindow::playPause() { if (m_core->state() == Qmmp::Playing) @@ -570,16 +548,6 @@ void MainWindow::handleCloseRequest() QApplication::closeAllWindows(); } -void MainWindow::disconnectPl() -{ - if(m_model) - { - disconnect(m_model, SIGNAL(itemAdded(PlayListItem*)), this, SLOT(play())); - disconnect(m_model, SIGNAL(loaderFinished()), this, SLOT(disconnectPl())); - m_model = 0; - } -} - void MainWindow::addUrl() { AddUrlDialog::popup(this, m_pl_manager->selectedPlayList()); diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h index 0069ecafb..542b154a9 100644 --- a/src/plugins/Ui/skinned/mainwindow.h +++ b/src/plugins/Ui/skinned/mainwindow.h @@ -77,9 +77,7 @@ public slots: void loadPlaylist(); void savePlaylist(); - void setFileList(const QStringList&, bool clear = true); void about(); - void updateSettings(); protected: @@ -94,7 +92,6 @@ private slots: void forward(); void backward(); void handleCloseRequest(); - void disconnectPl(); private: void readSettings(); -- cgit v1.2.3-13-gbd6f