summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libmpeg3
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/libmpeg3') (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h22
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h1
3 files changed, 21 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 154f85d..d255e4f 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -167,40 +167,42 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
libmpeg3plugin.h \
libmpeg3.h \
mpeg3private.h \
mpeg3atrack.h \
mpeg3demux.h \
mpeg3title.h \
mpeg3io.h \
mpeg3css.h \
mpeg3private.inc \
audio/mpeg3audio.h \
mpeg3vtrack.h \
video/mpeg3video.h \
- mpeg3protos.h
+ mpeg3protos.h \
+ ../mediaplayerplugininterface.h
libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
libmpeg3plugin.h \
libmpeg3.h \
mpeg3private.h \
mpeg3atrack.h \
mpeg3demux.h \
mpeg3title.h \
mpeg3io.h \
mpeg3css.h \
mpeg3private.inc \
audio/mpeg3audio.h \
mpeg3vtrack.h \
video/mpeg3video.h \
mpeg3protos.h \
+ ../mediaplayerplugininterface.h \
libmpeg3pluginimpl.h
bitstream.o: bitstream.c \
mpeg3private.h \
mpeg3atrack.h \
mpeg3demux.h \
mpeg3title.h \
mpeg3io.h \
mpeg3css.h \
mpeg3private.inc \
audio/mpeg3audio.h \
mpeg3vtrack.h \
@@ -405,25 +407,25 @@ audio/layer2.o: audio/layer2.c \
mpeg3css.h \
mpeg3private.inc \
audio/../libmpeg3.h \
mpeg3private.h \
mpeg3atrack.h \
audio/mpeg3audio.h \
mpeg3vtrack.h \
video/mpeg3video.h \
audio/../mpeg3protos.h \
audio/tables.h
audio/layer3.o: audio/layer3.c \
- audio/huffman.h \
+ huffman.h \
audio/mpeg3audio.h \
audio/ac3.h \
audio/mpeg3real.h \
audio/../bitstream.h \
mpeg3demux.h \
mpeg3title.h \
mpeg3io.h \
mpeg3css.h \
mpeg3private.inc \
audio/../libmpeg3.h \
mpeg3private.h \
mpeg3atrack.h \
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
@@ -16,55 +16,63 @@
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef LIBMPEG3_PLUGIN_H
#define LIBMPEG3_PLUGIN_H
#include <qstring.h>
#include <qapplication.h>
#include "libmpeg3.h"
#include "mpeg3protos.h"
-#include "mediaplayerplugininterface.h"
+//#include <qpe/mediaplayerplugininterface.h>
+#include "../mediaplayerplugininterface.h"
+
+
+// #define OLD_MEDIAPLAYER_API
class LibMpeg3Plugin : public MediaPlayerDecoder {
public:
LibMpeg3Plugin() { file = NULL; }
~LibMpeg3Plugin() { close(); }
const char *pluginName() { return "LibMpeg3Plugin"; }
const char *pluginComment() { return "This is the libmpeg3 library writen by ... which has been modified by trolltech to use fixed point maths"; }
double pluginVersion() { return 1.0; }
bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; }
bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; }
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
int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; }
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
int videoStreams() { return file ? mpeg3_total_vstreams( file ) : 0; }
int videoWidth( int stream ) { return file ? mpeg3_video_width( file, stream ) : 0; }
int videoHeight( int stream ) { return file ? mpeg3_video_height( file, stream ) : 0; }
double videoFrameRate( int stream ) { return file ? mpeg3_frame_rate( file, stream ) : 0.0; }
int videoFrames( int stream )
{ return file ? mpeg3_video_frames( file, stream ) : 0; }
/*
{
if ( file ) {
int frames = mpeg3_video_frames( file, stream );
@@ -93,21 +101,23 @@ public:
bool setSMP( int cpus ) { return file ? mpeg3_set_cpus( file, cpus ) == 1 : FALSE; }
bool setMMX( bool useMMX ) { return file ? mpeg3_set_mmx( file, useMMX ) == 1 : FALSE; }
// Capabilities
bool supportsAudio() { return TRUE; }
bool supportsVideo() { return TRUE; }
bool supportsYUV() { return TRUE; }
bool supportsMMX() { return TRUE; }
bool supportsSMP() { return TRUE; }
bool supportsStereo() { return TRUE; }
bool supportsScaling() { return TRUE; }
+ long getPlayTime() { return -1; }
+
private:
mpeg3_t *file;
QString strInfo;
};
#endif
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
index 29ec6ba..89abf97 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
@@ -12,24 +12,25 @@
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef LIBMPEG3_PLUGIN_IMPL_H
#define LIBMPEG3_PLUGIN_IMPL_H
+//#include <qpe/mediaplayerplugininterface.h>
#include "../mediaplayerplugininterface.h"
class LibMpeg3Plugin;
class LibMpeg3PluginImpl : public MediaPlayerPluginInterface
{
public:
LibMpeg3PluginImpl();
virtual ~LibMpeg3PluginImpl();