aboutsummaryrefslogtreecommitdiff
path: root/src/app/qmmpstarter.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2017-03-13 09:06:17 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2017-03-13 09:06:17 +0000
commit52ed6b5d2d37176762118ff9f7a6db56e09c14d4 (patch)
tree839f8db47c3ed28b1bccc6dca503539a4c9cfbdc /src/app/qmmpstarter.cpp
parent102db51599ff70006ccb36d78b73388e9ca44f1a (diff)
downloadqmmp-52ed6b5d2d37176762118ff9f7a6db56e09c14d4.tar.gz
qmmp-52ed6b5d2d37176762118ff9f7a6db56e09c14d4.tar.bz2
qmmp-52ed6b5d2d37176762118ff9f7a6db56e09c14d4.zip
added command-line options --volume-status and --mute-status
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7090 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/app/qmmpstarter.cpp')
-rw-r--r--src/app/qmmpstarter.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index 3275ccff0..52eb6f9f1 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -323,12 +323,13 @@ QString QMMPStarter::processCommandArgs(const QStringList &slist, const QString&
}
if(!paths.isEmpty())
{
- m_option_manager->executeCommand(QString(), paths, cwd); //add paths only
- return QString();
+ return m_option_manager->executeCommand(QString(), paths, cwd); //add paths only
}
QHash<QString, QStringList> commands = m_option_manager->splitArgs(slist);
if(commands.isEmpty())
return QString();
+
+ QString out;
foreach(QString key, commands.keys())
{
if(key == "--no-start" || key == "--ui")
@@ -336,11 +337,11 @@ QString QMMPStarter::processCommandArgs(const QStringList &slist, const QString&
if (CommandLineManager::hasOption(key))
return CommandLineManager::executeCommand(key, commands.value(key));
else if (m_option_manager->identify(key))
- m_option_manager->executeCommand(key, commands.value(key), cwd);
+ out += m_option_manager->executeCommand(key, commands.value(key), cwd);
else
return QString();
}
- return QString();
+ return out;
}
void QMMPStarter::printUsage()