author | llornkcor <llornkcor> | 2002-02-25 01:35:47 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-02-25 01:35:47 (UTC) |
commit | f180c1a5e8fc889ff1fb390d5cc94cdbc5085046 (patch) (unidiff) | |
tree | 5e9ea6f1313f4c33d57fb266523c1cfbe0826756 /core/multimedia/opieplayer/libmpeg3 | |
parent | c0446b55fc32b7fdea9f58db06e40da703f5e8ff (diff) | |
download | opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.zip opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.gz opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.bz2 |
fucked up- no workie.. back out
Diffstat (limited to 'core/multimedia/opieplayer/libmpeg3') (more/less context) (ignore 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 | |||
@@ -167,42 +167,40 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ | |||
167 | libmpeg3plugin.h \ | 167 | libmpeg3plugin.h \ |
168 | libmpeg3.h \ | 168 | libmpeg3.h \ |
169 | mpeg3private.h \ | 169 | mpeg3private.h \ |
170 | mpeg3atrack.h \ | 170 | mpeg3atrack.h \ |
171 | mpeg3demux.h \ | 171 | mpeg3demux.h \ |
172 | mpeg3title.h \ | 172 | mpeg3title.h \ |
173 | mpeg3io.h \ | 173 | mpeg3io.h \ |
174 | mpeg3css.h \ | 174 | mpeg3css.h \ |
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 \ |
185 | mpeg3private.h \ | 184 | mpeg3private.h \ |
186 | mpeg3atrack.h \ | 185 | mpeg3atrack.h \ |
187 | mpeg3demux.h \ | 186 | mpeg3demux.h \ |
188 | mpeg3title.h \ | 187 | mpeg3title.h \ |
189 | mpeg3io.h \ | 188 | mpeg3io.h \ |
190 | mpeg3css.h \ | 189 | mpeg3css.h \ |
191 | mpeg3private.inc \ | 190 | mpeg3private.inc \ |
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 \ |
201 | mpeg3atrack.h \ | 199 | mpeg3atrack.h \ |
202 | mpeg3demux.h \ | 200 | mpeg3demux.h \ |
203 | mpeg3title.h \ | 201 | mpeg3title.h \ |
204 | mpeg3io.h \ | 202 | mpeg3io.h \ |
205 | mpeg3css.h \ | 203 | mpeg3css.h \ |
206 | mpeg3private.inc \ | 204 | mpeg3private.inc \ |
207 | audio/mpeg3audio.h \ | 205 | audio/mpeg3audio.h \ |
208 | mpeg3vtrack.h \ | 206 | mpeg3vtrack.h \ |
@@ -407,25 +405,25 @@ audio/layer2.o: audio/layer2.c \ | |||
407 | mpeg3css.h \ | 405 | mpeg3css.h \ |
408 | mpeg3private.inc \ | 406 | mpeg3private.inc \ |
409 | audio/../libmpeg3.h \ | 407 | audio/../libmpeg3.h \ |
410 | mpeg3private.h \ | 408 | mpeg3private.h \ |
411 | mpeg3atrack.h \ | 409 | mpeg3atrack.h \ |
412 | audio/mpeg3audio.h \ | 410 | audio/mpeg3audio.h \ |
413 | mpeg3vtrack.h \ | 411 | mpeg3vtrack.h \ |
414 | video/mpeg3video.h \ | 412 | video/mpeg3video.h \ |
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 \ |
424 | mpeg3demux.h \ | 422 | mpeg3demux.h \ |
425 | mpeg3title.h \ | 423 | mpeg3title.h \ |
426 | mpeg3io.h \ | 424 | mpeg3io.h \ |
427 | mpeg3css.h \ | 425 | mpeg3css.h \ |
428 | mpeg3private.inc \ | 426 | mpeg3private.inc \ |
429 | audio/../libmpeg3.h \ | 427 | audio/../libmpeg3.h \ |
430 | mpeg3private.h \ | 428 | mpeg3private.h \ |
431 | mpeg3atrack.h \ | 429 | mpeg3atrack.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 | |||
@@ -11,31 +11,29 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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 | ||
34 | 32 | ||
35 | class LibMpeg3Plugin : public MediaPlayerDecoder { | 33 | class LibMpeg3Plugin : public MediaPlayerDecoder { |
36 | 34 | ||
37 | public: | 35 | public: |
38 | LibMpeg3Plugin() { file = NULL; } | 36 | LibMpeg3Plugin() { file = NULL; } |
39 | ~LibMpeg3Plugin() { close(); } | 37 | ~LibMpeg3Plugin() { close(); } |
40 | 38 | ||
41 | const char *pluginName() { return "LibMpeg3Plugin"; } | 39 | const char *pluginName() { return "LibMpeg3Plugin"; } |
@@ -43,25 +41,24 @@ public: | |||
43 | double pluginVersion() { return 1.0; } | 41 | double pluginVersion() { return 1.0; } |
44 | 42 | ||
45 | bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; } | 43 | bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; } |
46 | bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; } | 44 | bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; } |
47 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } | 45 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } |
48 | bool isOpen() { return file != NULL; } | 46 | bool isOpen() { return file != NULL; } |
49 | const QString &fileInfo() { return strInfo = ""; } | 47 | const QString &fileInfo() { return strInfo = ""; } |
50 | 48 | ||
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 |
60 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 57 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
61 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 58 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
62 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 59 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
63 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 60 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
64 | #else | 61 | #else |
65 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 62 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
66 | #endif | 63 | #endif |
67 | 64 | ||
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 | |||
@@ -11,27 +11,25 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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 | ||
30 | 28 | ||
31 | class LibMpeg3PluginImpl : public MediaPlayerPluginInterface | 29 | class LibMpeg3PluginImpl : public MediaPlayerPluginInterface |
32 | { | 30 | { |
33 | public: | 31 | public: |
34 | LibMpeg3PluginImpl(); | 32 | LibMpeg3PluginImpl(); |
35 | virtual ~LibMpeg3PluginImpl(); | 33 | virtual ~LibMpeg3PluginImpl(); |
36 | 34 | ||
37 | #ifndef QT_NO_COMPONENT | 35 | #ifndef QT_NO_COMPONENT |