improved seeking accuracy

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@827 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 18 insertions, 15 deletions

diff --git a/src/plugins/Input/wavpack/cueparser.cpp b/src/plugins/Input/wavpack/cueparser.cpp
index e68499cf1..081912dba 100644
--- a/src/plugins/Input/wavpack/cueparser.cpp
+++ b/src/plugins/Input/wavpack/cueparser.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -88,7 +88,7 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName)
         m_infoList[i].setLength(m_infoList[i+1].length() - m_infoList[i].length());
     //calculate last item length
     QList <FileInfo *> f_list = Decoder::createPlayList(m_filePath, FALSE);
-    qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length();
+    qint64 l = f_list.isEmpty() ? 0 : f_list.at(0)->length() * 1000;
     if (l > m_infoList.last().length())
         m_infoList.last().setLength(l - m_infoList.last().length());
     else
@@ -100,7 +100,7 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName)
         m_infoList[i].setMetaData(Qmmp::GENRE, genre);
         m_infoList[i].setMetaData(Qmmp::YEAR, date);
         m_infoList[i].setMetaData(Qmmp::COMMENT, comment);
-        if(!m_infoList[i].metaData().count(Qmmp::ARTIST) && !artist.isEmpty())
+        if (!m_infoList[i].metaData().count(Qmmp::ARTIST) && !artist.isEmpty())
             m_infoList[i].setMetaData(Qmmp::ARTIST, artist);
     }
 }
@@ -116,6 +116,7 @@ QList<FileInfo*> CUEParser::createPlayList()
     foreach(FileInfo info, m_infoList)
     {
         list << new FileInfo(info);
+        list.last()->setLength(list.last()->length()/1000);
     }
     return list;
 }
@@ -174,10 +175,12 @@ QStringList CUEParser::splitLine(const QString &line)
     return list;
 }
 
-int CUEParser::getLength(const QString &str)
+qint64 CUEParser::getLength(const QString &str)
 {
     QStringList list = str.split(":");
-    if (list.size() < 2)
-        return 0;
-    return list.at(0).toInt()*60 + list.at(1).toInt();
+    if (list.size() == 2)
+        return (qint64)list.at(0).toInt()*60000 + list.at(1).toInt()*1000;
+    else if (list.size() == 3)
+        return (qint64)list.at(0).toInt()*60000 + list.at(1).toInt()*1000 + list.at(1).toInt()*1000/75;
+    return 0;
 }
diff --git a/src/plugins/Input/wavpack/cueparser.h b/src/plugins/Input/wavpack/cueparser.h
index fccd85912..b30b87bfa 100644
--- a/src/plugins/Input/wavpack/cueparser.h
+++ b/src/plugins/Input/wavpack/cueparser.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -49,9 +49,9 @@ public:
 private:
     QString m_filePath;
     QList <FileInfo> m_infoList;
-    QList <int> m_offsets;
+    QList <qint64> m_offsets;
     QStringList splitLine(const QString &line);
-    int getLength(const QString &str);
+    qint64 getLength(const QString &str);
 
 };
 
diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp
index 87892f9da..082c148b4 100644
--- a/src/plugins/Input/wavpack/decoder_wavpack.cpp
+++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp
@@ -166,12 +166,12 @@ bool DecoderWavPack::initialize()
     if (m_length)
         m_totalTime = m_length;
     else
-        m_totalTime = (qint64) WavpackGetNumSamples(m_context) / m_freq;
+        m_totalTime = (qint64) WavpackGetNumSamples(m_context) * 1000 / m_freq;
     qDebug("DecoderWavPack: initialize succes");
     return TRUE;
 }
 
-qint64 DecoderWavPack::lengthInSeconds()
+qint64 DecoderWavPack::totalTime()
 {
     if (!m_inited)
         return 0;
@@ -223,7 +223,7 @@ void DecoderWavPack::run()
         //seeking
         if (m_seekTime >= 0.0)
         {
-            WavpackSeekSample (m_context, m_seekTime * m_freq);
+            WavpackSeekSample (m_context, m_seekTime * m_freq / 1000);
             m_seekTime = -1.0;
         }
         //stop if track ended
diff --git a/src/plugins/Input/wavpack/decoder_wavpack.h b/src/plugins/Input/wavpack/decoder_wavpack.h
index d7a87cde6..fe2a0a092 100644
--- a/src/plugins/Input/wavpack/decoder_wavpack.h
+++ b/src/plugins/Input/wavpack/decoder_wavpack.h
@@ -36,7 +36,7 @@ public:
 
     // Standard Decoder API
     bool initialize();
-    qint64 lengthInSeconds();
+    qint64 totalTime();
     void seek(qint64);
     void stop();
 
@@ -59,7 +59,7 @@ private:
     bool m_done, m_finish;
     long m_freq, m_bitrate;
     int m_chan;
-    unsigned long m_output_size;
+    qint64 m_output_size;
     qint64 m_totalTime, m_seekTime;
     QString m_path;
     qint64 m_offset;