From 5717444b38b4f45ad185bbc6ea81cdb141befb8c Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 18 Sep 2010 16:50:38 +0000
Subject: 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
---
 src/plugins/CommandLineOptions/SeekOption/seekoption.cpp | 9 ++++++---
 src/plugins/CommandLineOptions/SeekOption/seekoption.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/plugins/CommandLineOptions/SeekOption')

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);
 };
 
-- 
cgit v1.2.3-13-gbd6f