ported aac plugin

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

1 files changed, 11 insertions, 33 deletions

diff --git a/src/plugins/Input/aac/decoder_aac.h b/src/plugins/Input/aac/decoder_aac.h
index 328cfc3c4..17e152efa 100644
--- a/src/plugins/Input/aac/decoder_aac.h
+++ b/src/plugins/Input/aac/decoder_aac.h
@@ -38,48 +38,26 @@ public:
     DecoderAAC(QObject *, DecoderFactory *, QIODevice *, Output *);
     virtual ~DecoderAAC();
 
-    // Standard Decoder API
-    bool initialize();
-    qint64 totalTime();
-    void seek(qint64);
-    void stop();
 
     struct aac_data *data()
     {
         return m_data;
     }
-
+      // Standard Decoder API
+    bool initialize();
+    qint64 totalTime();
+    int bitrate();
 
 private:
-    // thread run function
-    void run();
+    qint64 readAudio(char *audio, qint64 maxSize);
+    void seekAudio(qint64 time);
     struct aac_data *m_data;
-    // helper functions
-    void flush(bool = FALSE);
-    void deinit();
-    qint64 aac_decode(void *out);
-
-    bool m_inited, m_user_stop;
-
-    // output buffer
-    char *m_output_buf, *m_input_buf;
-    void *m_prebuf2;
-    unsigned long m_output_bytes;
-
-#ifdef FAAD_MODIFIED
-    uint32_t m_freq;
-    uint8_t m_chan;
-#else
-    unsigned long m_freq;
-    unsigned char m_chan;
-#endif
 
-    unsigned int m_bks;
-    bool m_done, m_finish;
-    unsigned long m_len, m_bitrate, m_input_at, m_output_at;
-    unsigned long m_output_size;
-    double m_frameSize; //frame size in bytes
-    qint64 m_totalTime, m_seekTime;
+    char *m_input_buf;
+    int m_bitrate;
+    ulong  m_input_at, m_output_at;
+    double m_frameSize;
+    qint64 m_totalTime;
 };