aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/CommandLineOptions/SeekOption
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/plugins/CommandLineOptions/SeekOption
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/plugins/CommandLineOptions/SeekOption')
-rw-r--r--src/plugins/CommandLineOptions/SeekOption/seekoption.cpp9
-rw-r--r--src/plugins/CommandLineOptions/SeekOption/seekoption.h2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
index 444bc73be..e8dbacd30 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
@@ -41,13 +41,13 @@ const QString SeekOption::helpString() const
return help;
}
-void SeekOption::executeCommand(const QString &opt_str, const QStringList &args)
+QString SeekOption::executeCommand(const QString &opt_str, const QStringList &args)
{
SoundCore *core = SoundCore::instance();
if(core->state() != Qmmp::Playing && core->totalTime())
- return;
+ return QString();
if(args.isEmpty())
- return;
+ return QString();
int seek_pos = -1;
int elapsed = core->elapsed()/1000;
@@ -71,6 +71,9 @@ void SeekOption::executeCommand(const QString &opt_str, const QStringList &args)
if(seek_pos >= 0 && seek_pos < core->totalTime())
core->seek(seek_pos * 1000);
+ else
+ return QString();
+ return QString();
}
const QString SeekOption::name() const
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
index 544819d63..e60e9d048 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h
@@ -36,7 +36,7 @@ public:
virtual bool identify(const QString& opt_str)const;
virtual const QString name()const;
virtual const QString helpString()const;
- virtual void executeCommand(const QString& opt_str, const QStringList &args);
+ virtual QString executeCommand(const QString& opt_str, const QStringList &args);
virtual QTranslator *createTranslator(QObject *parent);
};