aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/modplug
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Input/modplug')
-rw-r--r--src/plugins/Input/modplug/decoder_modplug.cpp10
-rw-r--r--src/plugins/Input/modplug/decoder_modplug.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp
index c0e5bc380..adb11daed 100644
--- a/src/plugins/Input/modplug/decoder_modplug.cpp
+++ b/src/plugins/Input/modplug/decoder_modplug.cpp
@@ -169,13 +169,13 @@ bool DecoderModPlug::initialize()
return FALSE;
}*/
- m_totalTime = (qint64) m_soundFile->GetSongTime();
+ m_totalTime = (qint64) m_soundFile->GetSongTime() * 1000;
configure(m_freq, m_chan, m_bps);
m_inited = TRUE;
return TRUE;
}
-qint64 DecoderModPlug::lengthInSeconds()
+qint64 DecoderModPlug::totalTime()
{
if (! m_inited)
return 0;
@@ -230,11 +230,11 @@ void DecoderModPlug::run()
quint32 lMaxtime;
double lPostime;
- if (m_seekTime > (lMaxtime = m_soundFile->GetSongTime()))
- m_seekTime = lMaxtime;
+ if (m_seekTime > (lMaxtime = m_soundFile->GetSongTime()) * 1000)
+ m_seekTime = lMaxtime * 1000;
lMax = m_soundFile->GetMaxPosition();
lPostime = float(lMax) / lMaxtime;
- m_soundFile->SetCurrentPos(int(m_seekTime * lPostime));
+ m_soundFile->SetCurrentPos(int(m_seekTime * lPostime / 1000));
m_seekTime = -1.0;
}
diff --git a/src/plugins/Input/modplug/decoder_modplug.h b/src/plugins/Input/modplug/decoder_modplug.h
index 71f082c4a..8a14443b3 100644
--- a/src/plugins/Input/modplug/decoder_modplug.h
+++ b/src/plugins/Input/modplug/decoder_modplug.h
@@ -33,7 +33,7 @@ public:
// Standard Decoder API
bool initialize();
- qint64 lengthInSeconds();
+ qint64 totalTime();
void seek(qint64);
void stop();
@@ -67,7 +67,7 @@ private:
bool m_done, m_finish;
long m_freq, m_bitrate;
int m_chan, m_sampleSize;
- unsigned long m_output_size;
+ qint64 m_output_size;
qint64 m_totalTime, m_seekTime;
double m_preampFactor;
bool m_usePreamp;