summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libmad/libmadplugin.h
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/libmad/libmadplugin.h') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index 88647ae..ff84c27 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -24,3 +24,7 @@
#include <qstring.h>
-#include "mediaplayerplugininterface.h"
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
+
+
+// #define OLD_MEDIAPLAYER_API
@@ -52,8 +56,12 @@ public:
bool audioSetSample( long sample, int stream );
+ int audioBitsPerSample(int) {return 0;}
long audioGetSample( int stream );
-// bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream );
-// bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream );
+#ifdef OLD_MEDIAPLAYER_API
+ bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream );
+ bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream );
+ bool audioReadSamples( short *output, int channel, long samples, int stream );
+ bool audioReReadSamples( short *output, int channel, long samples, int stream );
+#else
bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream );
-// bool audioReadSamples( short *output, int channel, long samples, int stream );
-// bool audioReReadSamples( short *output, int channel, long samples, int stream );
+#endif
@@ -93,2 +101,4 @@ public:
+ long getPlayTime() { return -1; }
+
private: