AAC plugin: fixed seeking; id3v2 tags support

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

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp
index 65d91e4ed..6953a686c 100644
--- a/src/plugins/Input/aac/decoder_aac.cpp
+++ b/src/plugins/Input/aac/decoder_aac.cpp
@@ -240,6 +240,11 @@ qint64 DecoderAAC::aac_decode(void *out)
 
         if ((size = frame_info.samples * 2) > 0)
             memcpy((void *) (m_output_buf + m_output_at), out, size);
+        if (frame_info.error > 0)
+        {
+            m_input_at = 0;
+            qDebug("DecoderAAC: %s", NeAACDecGetErrorMessage(frame_info.error));
+        }
     }
     return size;
 }
@@ -285,7 +290,7 @@ void DecoderAAC::run()
         if (m_seekTime >= 0 && m_totalTime)
         {
             input()->seek(m_seekTime * input()->size() / m_totalTime);
-            NeAACDecPostSeekReset (data()->handle, -1);
+            NeAACDecPostSeekReset (data()->handle, 0);
             m_input_at = 0;
             m_seekTime = -1.0;
         }