From ba892226f0e7dab33f435faca14f48725fddc9d1 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 30 Dec 2018 09:56:24 +0000 Subject: fixed --nowplaying-syntax output git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8537 90c681e8-e032-0410-971d-27865f9a5e38 --- src/app/qmmpstarter.cpp | 2 +- src/plugins/CommandLineOptions/SeekOption/seekoption.h | 5 ----- src/plugins/CommandLineOptions/StatusOption/statusoption.cpp | 2 ++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp index 323edc049..bb47791af 100644 --- a/src/app/qmmpstarter.cpp +++ b/src/app/qmmpstarter.cpp @@ -125,7 +125,7 @@ QMMPStarter::QMMPStarter() : QObject() tmp_stream.copyfmt(cout); streambuf* old_stream = cout.rdbuf(tmp_stream.rdbuf()); #endif - cout << qPrintable(CommandLineManager::executeCommand(key, commands.value(key))); + cout << qPrintable(CommandLineManager::executeCommand(key, commands.value(key)).trimmed()) << endl; #ifdef Q_OS_WIN string text = tmp_stream.str(); QMessageBox::information(0, tr("Command Line Help"), QString::fromLocal8Bit(text.c_str())); diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h index 276f2a1ab..f3fddb9ee 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h @@ -39,11 +39,6 @@ public: QString translation() const; QString executeCommand(int id, const QStringList &args); - //virtual CommandLineProperties properties() const; - //virtual bool identify(const QString &opt_str) const; - //virtual QString executeCommand(const QString& opt_str, const QStringList &args); - //virtual QString translation() const; - private: enum Command { diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp index 575168048..78aaea45a 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp @@ -31,6 +31,8 @@ void StatusOption::registerOprions() registerOption(NOW_PLAYING, "--nowplaying", tr("Print formatted track name (example: qmmp --nowplaying \"%t - %a\")"), QStringList() << "fmt"); registerOption(NOW_PLAYING_SYNTAX, "--nowplaying-syntax", tr("Print --nowplaying syntax")); + + setOptionFlags(NOW_PLAYING_SYNTAX, NO_START); } QString StatusOption::shortName() const -- cgit v1.2.3-13-gbd6f