Diffstat (limited to 'core/multimedia/opieplayer/libmpeg3') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/Makefile.in | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | 5 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index d255e4f..154f85d 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in | |||
@@ -175,10 +175,9 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ | |||
175 | mpeg3private.inc \ | 175 | mpeg3private.inc \ |
176 | audio/mpeg3audio.h \ | 176 | audio/mpeg3audio.h \ |
177 | mpeg3vtrack.h \ | 177 | mpeg3vtrack.h \ |
178 | video/mpeg3video.h \ | 178 | video/mpeg3video.h \ |
179 | mpeg3protos.h \ | 179 | mpeg3protos.h |
180 | ../mediaplayerplugininterface.h | ||
181 | 180 | ||
182 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | 181 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ |
183 | libmpeg3plugin.h \ | 182 | libmpeg3plugin.h \ |
184 | libmpeg3.h \ | 183 | libmpeg3.h \ |
@@ -192,9 +191,8 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | |||
192 | audio/mpeg3audio.h \ | 191 | audio/mpeg3audio.h \ |
193 | mpeg3vtrack.h \ | 192 | mpeg3vtrack.h \ |
194 | video/mpeg3video.h \ | 193 | video/mpeg3video.h \ |
195 | mpeg3protos.h \ | 194 | mpeg3protos.h \ |
196 | ../mediaplayerplugininterface.h \ | ||
197 | libmpeg3pluginimpl.h | 195 | libmpeg3pluginimpl.h |
198 | 196 | ||
199 | bitstream.o: bitstream.c \ | 197 | bitstream.o: bitstream.c \ |
200 | mpeg3private.h \ | 198 | mpeg3private.h \ |
@@ -415,9 +413,9 @@ audio/layer2.o: audio/layer2.c \ | |||
415 | audio/../mpeg3protos.h \ | 413 | audio/../mpeg3protos.h \ |
416 | audio/tables.h | 414 | audio/tables.h |
417 | 415 | ||
418 | audio/layer3.o: audio/layer3.c \ | 416 | audio/layer3.o: audio/layer3.c \ |
419 | huffman.h \ | 417 | audio/huffman.h \ |
420 | audio/mpeg3audio.h \ | 418 | audio/mpeg3audio.h \ |
421 | audio/ac3.h \ | 419 | audio/ac3.h \ |
422 | audio/mpeg3real.h \ | 420 | audio/mpeg3real.h \ |
423 | audio/../bitstream.h \ | 421 | audio/../bitstream.h \ |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h index 54f259b..e0eb930 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | |||
@@ -19,15 +19,13 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMPEG3_PLUGIN_H | 20 | #ifndef LIBMPEG3_PLUGIN_H |
21 | #define LIBMPEG3_PLUGIN_H | 21 | #define LIBMPEG3_PLUGIN_H |
22 | 22 | ||
23 | |||
24 | #include <qstring.h> | 23 | #include <qstring.h> |
25 | #include <qapplication.h> | 24 | #include <qapplication.h> |
26 | #include "libmpeg3.h" | 25 | #include "libmpeg3.h" |
27 | #include "mpeg3protos.h" | 26 | #include "mpeg3protos.h" |
28 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
29 | #include "../mediaplayerplugininterface.h" | ||
30 | 28 | ||
31 | 29 | ||
32 | // #define OLD_MEDIAPLAYER_API | 30 | // #define OLD_MEDIAPLAYER_API |
33 | 31 | ||
@@ -51,9 +49,8 @@ public: | |||
51 | // If decoder doesn't support audio then return 0 here | 49 | // If decoder doesn't support audio then return 0 here |
52 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } | 50 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } |
53 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } | 51 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } |
54 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } | 52 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } |
55 | int audioBitsPerSample(int) { return 0;} | ||
56 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } | 53 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } |
57 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } | 54 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } |
58 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } | 55 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } |
59 | #ifdef OLD_MEDIAPLAYER_API | 56 | #ifdef OLD_MEDIAPLAYER_API |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h index 89abf97..e9926f4 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h | |||
@@ -19,11 +19,9 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMPEG3_PLUGIN_IMPL_H | 20 | #ifndef LIBMPEG3_PLUGIN_IMPL_H |
21 | #define LIBMPEG3_PLUGIN_IMPL_H | 21 | #define LIBMPEG3_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | //#include <qpe/mediaplayerplugininterface.h> | ||
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 24 | ||
27 | 25 | ||
28 | class LibMpeg3Plugin; | 26 | class LibMpeg3Plugin; |
29 | 27 | ||