summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libflash
Unidiff
Diffstat (limited to 'core/multimedia/opieplayer/libflash') (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libflash/libflashplugin.h4
-rw-r--r--core/multimedia/opieplayer/libflash/libflashpluginimpl.h3
-rw-r--r--core/multimedia/opieplayer/libflash/swf.h2
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
@@ -24,8 +24,7 @@
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
31class LibFlashPlugin : public MediaPlayerDecoder { 30class LibFlashPlugin : public MediaPlayerDecoder {
@@ -49,7 +48,6 @@ public:
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; }
52int 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 );
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
@@ -21,8 +21,7 @@
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
28class LibFlashPlugin; 27class LibFlashPlugin;
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
@@ -208,7 +208,7 @@ extern "C" {
208}; 208};
209extern "C" { 209extern "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"