aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/CommandLineOptions
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/CommandLineOptions')
-rw-r--r--src/plugins/CommandLineOptions/SeekOption/seekoption.cpp4
-rw-r--r--src/plugins/CommandLineOptions/StatusOption/statusoption.cpp12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
index 02e971940..0b0a0b0b2 100644
--- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
+++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp
@@ -43,7 +43,7 @@ const QStringList SeekOption::helpString() const
QString SeekOption::executeCommand(const QString &opt_str, const QStringList &args)
{
SoundCore *core = SoundCore::instance();
- if(core->state() != Qmmp::Playing && core->totalTime())
+ if(core->state() != Qmmp::Playing && core->duration())
return QString();
if(args.isEmpty())
return QString();
@@ -68,7 +68,7 @@ QString SeekOption::executeCommand(const QString &opt_str, const QStringList &ar
seek_pos = elapsed - seek_pos;
qDebug("SeekOption: position = %d", seek_pos);
- if(seek_pos >= 0 && seek_pos < core->totalTime())
+ if(seek_pos >= 0 && seek_pos < core->duration())
core->seek(seek_pos * 1000);
else
return QString();
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index b2884fc76..ecb0f8b37 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -71,7 +71,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
out += "TRACK = %n\n";
out += "FILE = %f";
MetaDataFormatter formatter(out);
- out = formatter.format(core->metaData(), core->totalTime());
+ out = formatter.format(core->metaData(), core->duration());
}
out += "\n";
}
@@ -79,7 +79,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
{
QString t = args.join(" ");
MetaDataFormatter formatter(t);
- out = formatter.format(core->metaData(), core->totalTime());
+ out = formatter.format(core->metaData(), core->duration());
out += "\n";
}
else if(opt_str == "--nowplaying-syntax")
@@ -121,15 +121,15 @@ QTranslator *StatusOption::createTranslator(QObject *parent)
QString StatusOption::genProgressBar()
{
SoundCore *core = SoundCore::instance();
- QString totalTime = QString("%1:%2").arg(core->totalTime()/60000)
- .arg(core->totalTime()%60000/1000, 2, 10, QChar('0'));
+ QString totalTime = QString("%1:%2").arg(core->duration()/60000)
+ .arg(core->duration()%60000/1000, 2, 10, QChar('0'));
QString currentTime = QString("%1:%2").arg(core->elapsed()/60000)
.arg(core->elapsed()%60000/1000, 2, 10, QChar('0'));
QString out = currentTime;
- if(core->totalTime())
+ if(core->duration())
{
out.clear();
- int played_count = 22 * (double)core->elapsed()/core->totalTime();
+ int played_count = 22 * (double)core->elapsed()/core->duration();
for(int i = 0; i < played_count; ++i)
out += "=";
out += "#";