aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-03-18 13:48:24 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-03-18 13:48:24 +0000
commitadc59ac93bf343c88eb664fdb4004fbd7823805c (patch)
tree07585a5a394e2406c49e3e2eec4b447c39ba7b47
parent6925380098f9de4841534db7e8285ba0c18c2ca2 (diff)
downloadqmmp-adc59ac93bf343c88eb664fdb4004fbd7823805c.tar.gz
qmmp-adc59ac93bf343c88eb664fdb4004fbd7823805c.tar.bz2
qmmp-adc59ac93bf343c88eb664fdb4004fbd7823805c.zip
fixed seeking and time tracking
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@279 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/ui/mainwindow.cpp3
-rw-r--r--src/ui/mainwindow.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 64996785e..083a468c2 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -188,6 +188,7 @@ void MainWindow::play()
if (m_core->play(s))
{
display->setTime(0);
+ m_generalHandler->setTime(0);
display->setMaxTime(m_core->length());
}
else
@@ -325,7 +326,6 @@ void MainWindow::showOutputState(const OutputState &st)
case OutputState::Playing:
{
m_generalHandler->setState(General::Playing);
- m_generalHandler->setTime(st.elapsedSeconds());
if (m_playListModel->currentItem())
{
SongInfo info;
@@ -361,6 +361,7 @@ void MainWindow::showOutputState(const OutputState &st)
}
case OutputState::Info:
{
+ m_generalHandler->setTime(st.elapsedSeconds());
m_elapsed = st.elapsedSeconds();
break;
}
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 21b1c8fab..bdf437862 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -59,7 +59,6 @@ public:
PlayList *getPLPointer(){return m_playlist;}
- void seek(int);
QMenu* menu();
void setVolume(int volume, int balance);
SoundCore* soundCore()const;
@@ -67,6 +66,7 @@ public:
bool processCommandArgs(const QStringList &list,const QString& cwd);
public slots:
+ void seek(int);
void previous();
void play();
void pause();