summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/wavplugin/wavplugin.h
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/wavplugin/wavplugin.h') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.h24
1 files changed, 17 insertions, 7 deletions
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.h b/core/multimedia/opieplayer/wavplugin/wavplugin.h
index 64635ca..6afd67e 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.h
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.h
@@ -19,2 +19,4 @@
**********************************************************************/
+// L.J.Potter added changes Fri 02-15-2002
+
#ifndef WAV_PLUGIN_H
@@ -25,3 +27,6 @@
#include <qapplication.h>
-#include "mediaplayerplugininterface.h"
+#include "../mediaplayerplugininterface.h"
+
+
+// #define OLD_MEDIAPLAYER_API
@@ -45,4 +50,3 @@ public:
bool isOpen();
- //const QString &fileInfo() { return strInfo = qApp->translate( "MediaPlayer", "No Information Available", "media plugin text" ); }
- const QString &fileInfo() { return strInfo = QString(""); }
+ const QString &fileInfo() { return strInfo = ""; }
@@ -52,2 +56,3 @@ public:
int audioFrequency( int stream );
+ int audioBitsPerSample( int stream );
int audioSamples( int stream );
@@ -55,7 +60,10 @@ public:
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
@@ -89,2 +97,4 @@ public:
+ long getPlayTime() { return -1; }
+
private: