Diffstat (limited to 'core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h index 0a06264..54f259b 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h @@ -26,5 +26,9 @@ #include "libmpeg3.h" #include "mpeg3protos.h" -#include "mediaplayerplugininterface.h" +//#include <qpe/mediaplayerplugininterface.h> +#include "../mediaplayerplugininterface.h" + + +// #define OLD_MEDIAPLAYER_API @@ -43,5 +47,5 @@ public: bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } bool isOpen() { return file != NULL; } - const QString &fileInfo() { return strInfo = QString( "" ); } + const QString &fileInfo() { return strInfo = ""; } // If decoder doesn't support audio then return 0 here @@ -49,12 +53,16 @@ public: int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } + int audioBitsPerSample(int) { return 0;} int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } -// 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 // If decoder doesn't support video then return 0 here @@ -103,4 +111,6 @@ public: bool supportsScaling() { return TRUE; } + long getPlayTime() { return -1; } + private: mpeg3_t *file; |