mpc: cleanup

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

2 files changed, 4 insertions, 11 deletions

diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp
index 85d7f4a92..3df2165b3 100644
--- a/src/plugins/Input/mpc/decoder_mpc.cpp
+++ b/src/plugins/Input/mpc/decoder_mpc.cpp
@@ -72,14 +72,11 @@ DecoderMPC::DecoderMPC(QIODevice *i)
 DecoderMPC::~DecoderMPC()
 {
     m_len = 0;
-    if (data())
+    if(m_data)
     {
-#ifndef MPC_OLD_API
-        if (data()->demuxer)
-            mpc_demux_exit (data()->demuxer);
-        data()->demuxer = 0;
-#endif
-        delete data();
+        if(m_data->demuxer)
+            mpc_demux_exit(m_data->demuxer);
+        delete m_data;
         m_data = 0;
     }
 }
diff --git a/src/plugins/Input/mpc/decoder_mpc.h b/src/plugins/Input/mpc/decoder_mpc.h
index a3c3da372..4398b6dd0 100644
--- a/src/plugins/Input/mpc/decoder_mpc.h
+++ b/src/plugins/Input/mpc/decoder_mpc.h
@@ -26,11 +26,7 @@
 
 struct mpc_data
 {
-#ifdef MPC_OLD_API
-    mpc_decoder decoder;
-#else
     mpc_demux *demuxer;
-#endif
     mpc_reader reader;
     mpc_streaminfo info;
 };