fixed command line regression (Closes issue 194)

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

2 files changed, 20 insertions, 18 deletions

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 7bfeea4c1..1080bec23 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -57,7 +57,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option
 {
     m_vis = 0;
     m_update = FALSE;
-    m_paused = FALSE;
     m_option_manager = option_manager;
     setWindowIcon(QIcon(":/32x32/qmmp.png"));
 #if QT_VERSION >= 0x040500
@@ -204,7 +203,11 @@ void MainWindow::updateEQ()
 
 void MainWindow::showState(Qmmp::State state)
 {
-    //disconnect(m_playListModel, SIGNAL(firstAdded()), this, SLOT(play()));
+    if(m_model)
+    {
+        disconnect(m_model, SIGNAL(firstAdded()), this, 0);
+        m_model = 0;
+    }
     switch ((int) state)
     {
     case Qmmp::Playing:
@@ -498,12 +501,17 @@ void MainWindow::setFileList(const QStringList & l)
     if (m_core->state() == Qmmp::Playing || m_core->state() == Qmmp::Paused)
         stop();
     qApp->processEvents(); //receive stop signal
-    //connect(m_playListModel, SIGNAL(firstAdded()), this, SLOT(play()));
-    /*if (!m_playListModel->setFileList(l))
+    connect(m_pl_manager->selectedPlayList(), SIGNAL(firstAdded()), this, SLOT(play()));
+    if (m_pl_manager->selectedPlayList()->setFileList(l))
+    {
+        m_pl_manager->activatePlayList(m_pl_manager->selectedPlayList());
+        m_model = m_pl_manager->selectedPlayList();
+    }
+    else
     {
-        disconnect(m_playListModel, SIGNAL(firstAdded()), this, SLOT(play()));
+        disconnect(m_pl_manager->selectedPlayList(), SIGNAL(firstAdded()), this, SLOT(play()));
         addFile();
-    }*/
+    }
 }
 
 void MainWindow::playPause()
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 42d3d7d77..2d8b102fc 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,18 +21,14 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-
+#include <QPointer>
 #include <qmmp/output.h>
 #include <qmmp/decoder.h>
 #include <qmmp/decoderfactory.h>
 #include <qmmpui/playlistitem.h>
-
 #include "display.h"
 #include "titlebar.h"
 
-/**
-   @author Ilya Kotov <forkotov02@hotmail.ru>
-*/
 class PlayList;
 class PlayListManager;
 class ConfigDialog;
@@ -44,12 +40,13 @@ class JumpToTrackDialog;
 class VisualMenu;
 class GeneralHandler;
 class MediaPlayer;
-
 class QMenu;
 class QKeyEvent;
 class BuiltinCommandLineOption;
 
-
+/**
+   @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -111,16 +108,13 @@ private:
     MainDisplay *m_display;
     PlayList *m_playlist;
     PlayListManager *m_pl_manager;
+    QPointer <PlayListModel> m_model;
     ConfigDialog *m_confDialog;
     int m_preamp;
     EqWidget *m_equalizer;
     MainVisual *m_vis;
     QString m_lastDir;
     bool m_update;
-    bool m_showMessage;
-    int m_messageDelay;
-    bool m_paused;
-    bool m_showToolTip;
     Skin *m_skin;
     JumpToTrackDialog* m_jumpDialog;
     bool m_hideOnClose, m_startHidden;