aboutsummaryrefslogtreecommitdiff
path: root/src/ui/mainwindow.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-09-18 16:50:38 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-09-18 16:50:38 +0000
commit5717444b38b4f45ad185bbc6ea81cdb141befb8c (patch)
tree9ab1fdb4070f7dab49ce5da8b8cf07b79c508eb4 /src/ui/mainwindow.cpp
parent42aa3971c31736f04f668f84884c05f4dad793bd (diff)
downloadqmmp-5717444b38b4f45ad185bbc6ea81cdb141befb8c.tar.gz
qmmp-5717444b38b4f45ad185bbc6ea81cdb141befb8c.tar.bz2
qmmp-5717444b38b4f45ad185bbc6ea81cdb141befb8c.zip
added --status and --nowplaying command line option (Closes issue 266)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1893 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui/mainwindow.cpp')
-rw-r--r--src/ui/mainwindow.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 99cbc0ae2..27ac8217e 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -573,10 +573,10 @@ void MainWindow::playPause()
play();
}
-bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd)
+QString MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd)
{
if(slist.isEmpty())
- return true;
+ return QString();
QStringList paths;
foreach(QString arg, slist)
{
@@ -596,11 +596,11 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd
full_path_list << cwd + "/" + s;
}
setFileList(full_path_list);
- return true;
+ return QString();
}
QHash<QString, QStringList> commands = m_option_manager->splitArgs(slist);
if(commands.isEmpty())
- return false;
+ return QString();
foreach(QString key, commands.keys())
{
if(key == "--enqueue" || key == "-e")
@@ -619,13 +619,13 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd
m_pl_manager->currentPlayList()->addFileList(full_path_list);
}
else if (CommandLineManager::hasOption(key))
- m_generalHandler->executeCommand(key, commands.value(key));
+ return CommandLineManager::executeCommand(key, commands.value(key));
else if (m_option_manager->identify(key))
m_option_manager->executeCommand(key, commands.value(key), this);
else
- return false;
+ return QString();
}
- return true;
+ return QString();
}
void MainWindow::jumpToFile()