Diffstat (limited to 'core/multimedia/opieplayer/libflash') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libflash/libflashplugin.h | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libflash/libflashpluginimpl.h | 3 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libflash/swf.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/core/multimedia/opieplayer/libflash/libflashplugin.h b/core/multimedia/opieplayer/libflash/libflashplugin.h index a2f1c42..48b512f 100644 --- a/core/multimedia/opieplayer/libflash/libflashplugin.h +++ b/core/multimedia/opieplayer/libflash/libflashplugin.h | |||
@@ -21,14 +21,13 @@ | |||
21 | #define LIBFLASH_PLUGIN_H | 21 | #define LIBFLASH_PLUGIN_H |
22 | 22 | ||
23 | 23 | ||
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | #include <qapplication.h> | 25 | #include <qapplication.h> |
26 | #include "flash.h" | 26 | #include "flash.h" |
27 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
28 | #include "../mediaplayerplugininterface.h" | ||
29 | 28 | ||
30 | 29 | ||
31 | class LibFlashPlugin : public MediaPlayerDecoder { | 30 | class LibFlashPlugin : public MediaPlayerDecoder { |
32 | 31 | ||
33 | public: | 32 | public: |
34 | LibFlashPlugin(); | 33 | LibFlashPlugin(); |
@@ -46,13 +45,12 @@ public: | |||
46 | 45 | ||
47 | // If decoder doesn't support audio then return 0 here | 46 | // If decoder doesn't support audio then return 0 here |
48 | int audioStreams() { return 1; } | 47 | int audioStreams() { return 1; } |
49 | int audioChannels( int /*stream*/ ) { return 2; } | 48 | int audioChannels( int /*stream*/ ) { return 2; } |
50 | int audioFrequency( int /*stream*/ ) { return 44100; } | 49 | int audioFrequency( int /*stream*/ ) { return 44100; } |
51 | int audioSamples( int /*stream*/ ) { return 1000000; } | 50 | int audioSamples( int /*stream*/ ) { return 1000000; } |
52 | int audioBitsPerSample(int) { return 0;} | ||
53 | bool audioSetSample( long sample, int stream ); | 51 | bool audioSetSample( long sample, int stream ); |
54 | long audioGetSample( int stream ); | 52 | long audioGetSample( int stream ); |
55 | //bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 53 | //bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
56 | //bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 54 | //bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
57 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 55 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
58 | //bool audioReadSamples( short *output, int channel, long samples, int stream ); | 56 | //bool audioReadSamples( short *output, int channel, long samples, int stream ); |
diff --git a/core/multimedia/opieplayer/libflash/libflashpluginimpl.h b/core/multimedia/opieplayer/libflash/libflashpluginimpl.h index cb8d959..33d8ad2 100644 --- a/core/multimedia/opieplayer/libflash/libflashpluginimpl.h +++ b/core/multimedia/opieplayer/libflash/libflashpluginimpl.h | |||
@@ -18,14 +18,13 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBFLASH_PLUGIN_IMPL_H | 20 | #ifndef LIBFLASH_PLUGIN_IMPL_H |
21 | #define LIBFLASH_PLUGIN_IMPL_H | 21 | #define LIBFLASH_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | ||
24 | //#include <qpe/mediaplayerplugininterface.h> | 24 | #include <qpe/mediaplayerplugininterface.h> |
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 25 | ||
27 | 26 | ||
28 | class LibFlashPlugin; | 27 | class LibFlashPlugin; |
29 | 28 | ||
30 | 29 | ||
31 | class LibFlashPluginImpl : public MediaPlayerPluginInterface | 30 | class LibFlashPluginImpl : public MediaPlayerPluginInterface |
diff --git a/core/multimedia/opieplayer/libflash/swf.h b/core/multimedia/opieplayer/libflash/swf.h index 48986cc..5f5e4f7 100644 --- a/core/multimedia/opieplayer/libflash/swf.h +++ b/core/multimedia/opieplayer/libflash/swf.h | |||
@@ -205,13 +205,13 @@ struct FlashMovie; | |||
205 | 205 | ||
206 | extern "C" { | 206 | extern "C" { |
207 | #include "jpeglib.h" | 207 | #include "jpeglib.h" |
208 | }; | 208 | }; |
209 | extern "C" { | 209 | extern "C" { |
210 | //#include "zlib.h" | 210 | //#include "zlib.h" |
211 | #include "/opt/qt-2.3.2-embedded/src/3rdparty/zlib/zlib.h" | 211 | #include "../src/3rdparty/zlib/zlib.h" |
212 | }; | 212 | }; |
213 | 213 | ||
214 | #include "graphic.h" | 214 | #include "graphic.h" |
215 | #include "character.h" | 215 | #include "character.h" |
216 | #include "bitmap.h" | 216 | #include "bitmap.h" |
217 | #include "shape.h" | 217 | #include "shape.h" |