From 912dd07175d1736e924b449267e050d388e91b07 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 1 Mar 2016 13:26:28 +0000 Subject: fixed several bugs git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6146 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/filedialog.cpp | 2 +- src/qmmpui/uihelper.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qmmpui') diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp index d1e802d18..e85ca03b6 100644 --- a/src/qmmpui/filedialog.cpp +++ b/src/qmmpui/filedialog.cpp @@ -221,7 +221,7 @@ void FileDialog::init(QObject* receiver, const char* member, QString *dir) disconnect(); if (receiver && member) { - connect(this,SIGNAL(filesSelected(QStringList)), receiver, member); + connect(this,SIGNAL(filesSelected(QStringList, bool)), receiver, member); connect(this,SIGNAL(filesSelected(QStringList)), SLOT(updateLastDir(QStringList))); m_initialized = true; } diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp index 4548bce42..b93638ced 100644 --- a/src/qmmpui/uihelper.cpp +++ b/src/qmmpui/uihelper.cpp @@ -160,7 +160,7 @@ void UiHelper::playFiles(QWidget *parent, PlayListModel *model) void UiHelper::addDirectory(QWidget *parent, PlayListModel *model) { FileDialog::popup(parent, FileDialog::AddDirs, &m_lastDir, - model, SLOT(add(const QStringList&)), + model, SLOT(add(QStringList)), tr("Choose a directory")); } @@ -303,7 +303,7 @@ void UiHelper::playSelectedFiles(const QStringList &files) m_model->clear(); PlayListManager::instance()->activatePlayList(m_model); connect(m_model, SIGNAL(trackAdded(PlayListTrack*)), MediaPlayer::instance(), SLOT(play())); - connect(m_model, SIGNAL(loaderFinished()), SLOT(disconnectPl())); + connect(m_model, SIGNAL(trackAdded(PlayListTrack*)), SLOT(disconnectPl())); m_model->add(files); } @@ -313,6 +313,6 @@ void UiHelper::disconnectPl() if(model) { disconnect(model, SIGNAL(trackAdded(PlayListTrack*)), MediaPlayer::instance(), SLOT(play())); - disconnect(model, SIGNAL(loaderFinished()), this, SLOT(disconnectPl())); + disconnect(model, SIGNAL(trackAdded(PlayListTrack*)), this, SLOT(disconnectPl())); } } -- cgit v1.2.3-13-gbd6f