enabled sndfile plugin

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

1 files changed, 21 insertions, 172 deletions

diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp
index 9152913fe..77e4438c2 100644
--- a/src/plugins/Input/sndfile/decoder_sndfile.cpp
+++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2008 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2009 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,6 @@
 #include <QFile>
 #include <QFileInfo>
 
-#include <qmmp/constants.h>
 #include <qmmp/buffer.h>
 #include <qmmp/output.h>
 #include <qmmp/recycler.h>
@@ -35,92 +34,23 @@ DecoderSndFile::DecoderSndFile(QObject *parent, DecoderFactory *d, Output *o,  c
         : Decoder(parent, d, o)
 {
     m_path = path;
-    m_inited = FALSE;
-    m_user_stop = FALSE;
-    m_output_buf = 0;
-    m_output_bytes = 0;
-    m_output_at = 0;
-    bks = 0;
-    m_done = FALSE;
-    m_finish = FALSE;
-    m_freq = 0;
     m_bitrate = 0;
-    m_seekTime = -1.0;
-    m_totalTime = 0.0;
-    m_chan = 0;
-    m_output_size = 0;
-    m_buf = 0;
+    m_totalTime = 0;
     m_sndfile = 0;
+    m_freq = 0;
 }
 
-
 DecoderSndFile::~DecoderSndFile()
 {
     deinit();
 }
 
-
-void DecoderSndFile::stop()
-{
-    m_user_stop = TRUE;
-}
-
-
-void DecoderSndFile::flush(bool final)
-{
-    ulong min = final ? 0 : bks;
-
-    while ((! m_done && ! m_finish) && m_output_bytes > min)
-    {
-        output()->recycler()->mutex()->lock ();
-
-        while ((! m_done && ! m_finish) && output()->recycler()->full())
-        {
-            mutex()->unlock();
-
-            output()->recycler()->cond()->wait(output()->recycler()->mutex());
-
-            mutex()->lock ();
-            m_done = m_user_stop;
-        }
-
-        if (m_user_stop || m_finish)
-        {
-            m_inited = FALSE;
-            m_done = TRUE;
-        }
-        else
-        {
-            m_output_bytes -= produceSound(m_output_buf, m_output_bytes, m_bitrate, m_chan);
-            m_output_size += bks;
-            m_output_at = m_output_bytes;
-        }
-
-        if (output()->recycler()->full())
-        {
-            output()->recycler()->cond()->wakeOne();
-        }
-
-        output()->recycler()->mutex()->unlock();
-    }
-}
-
-
 bool DecoderSndFile::initialize()
 {
-    bks = Buffer::size();
-    m_inited = m_user_stop = m_done = m_finish = FALSE;
-    m_freq = m_bitrate = 0;
-    m_output_size = 0;
-    m_seekTime = -1.0;
+    m_bitrate = 0;
     m_totalTime = 0.0;
     SF_INFO snd_info;
 
-    if (!m_output_buf)
-        m_output_buf = new char[globalBufferSize];
-    m_output_at = 0;
-    m_output_bytes = 0;
-
     memset (&snd_info, 0, sizeof(snd_info));
     snd_info.format=0;
     m_sndfile = sf_open(m_path.toLocal8Bit(), SFM_READ, &snd_info);
@@ -131,123 +61,42 @@ bool DecoderSndFile::initialize()
     }
 
     m_freq = snd_info.samplerate;
-    m_chan = snd_info.channels;
-
+    int chan = snd_info.channels;
     m_totalTime = snd_info.frames * 1000 / m_freq;
-
     m_bitrate =  QFileInfo(m_path).size () * 8.0 / m_totalTime + 0.5;
 
-    configure(m_freq, m_chan, 16);
-    m_buf = new short[bks / sizeof(short)];
-    m_inited = TRUE;
+    configure(m_freq, chan, 16);
     qDebug("DecoderSndFile: detected format: %08X", snd_info.format);
     qDebug("DecoderSndFile: initialize succes");
     return TRUE;
 }
 
+void DecoderSndFile::deinit()
+{
+    m_totalTime = 0;
+    m_bitrate = 0;
+    m_freq = 0;
+    if (m_sndfile)
+        sf_close(m_sndfile);
+    m_sndfile = 0;
+}
 
 qint64 DecoderSndFile::totalTime()
 {
-    if (! m_inited)
-        return 0;
-
     return m_totalTime;
 }
 
-
-void DecoderSndFile::seek(qint64 pos)
+int DecoderSndFile::bitrate()
 {
-    m_seekTime = pos;
+    return m_bitrate;
 }
 
-
-void DecoderSndFile::deinit()
+qint64 DecoderSndFile::readAudio(char *audio, qint64 maxSize)
 {
-    m_inited = m_user_stop = m_done = m_finish = FALSE;
-    m_freq = m_bitrate = m_chan = 0;
-    m_output_size = 0;
-    if (m_inited)
-    {
-        delete m_buf;
-        m_buf = 0;
-        sf_close(m_sndfile);
-        m_sndfile = 0;
-    }
+    return sizeof(short)* sf_read_short  (m_sndfile, (short *)audio, maxSize / sizeof(short));
 }
 
-void DecoderSndFile::run()
+void DecoderSndFile::seekAudio(qint64 pos)
 {
-
-    long len = 0;
-
-    mutex()->lock ();
-
-    if (!m_inited)
-    {
-        mutex()->unlock();
-        return;
-    }
-    mutex()->unlock();
-
-    while (!m_done && !m_finish)
-    {
-        mutex()->lock ();
-        // decode
-
-        if (m_seekTime >= 0)
-        {
-            m_output_size = sf_seek(m_sndfile, m_freq*m_seekTime/1000, SEEK_SET);
-            m_seekTime = -1.0;
-        }
-
-        len = sizeof(short)* sf_read_short  (m_sndfile, m_buf, bks / sizeof(short));
-
-        if (len > 0)
-        {
-            memmove((char *)(m_output_buf + m_output_at), (char *) m_buf, len);
-            m_output_at += len;
-            m_output_bytes += len;
-
-            if (output())
-                flush();
-        }
-        else if (len == 0)
-        {
-            flush(TRUE);
-
-            if (output())
-            {
-                output()->recycler()->mutex()->lock ();
-                // end of stream
-                while (! output()->recycler()->empty() && ! m_user_stop)
-                {
-                    output()->recycler()->cond()->wakeOne();
-                    mutex()->unlock();
-                    output()->recycler()->cond()->wait(output()->recycler()->mutex());
-                    mutex()->lock ();
-                }
-                output()->recycler()->mutex()->unlock();
-            }
-
-            m_done = TRUE;
-            if (! m_user_stop)
-            {
-                m_finish = TRUE;
-            }
-        }
-        else
-        {
-            // error in read
-            qWarning("DecoderSndFile: Error while decoding stream, File appears to be corrupted");
-            m_finish = TRUE;
-        }
-        mutex()->unlock();
-    }
-
-    mutex()->lock ();
-    if (m_finish)
-        finish();
-    mutex()->unlock();
-
-    deinit();
+    sf_seek(m_sndfile, m_freq * pos/1000, SEEK_SET);
 }