summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libflash
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/libflash') (more/less context) (ignore 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
@@ -3,74 +3,72 @@
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** 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 LIBFLASH_PLUGIN_H
#define LIBFLASH_PLUGIN_H
#include <qstring.h>
#include <qapplication.h>
#include "flash.h"
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
class LibFlashPlugin : public MediaPlayerDecoder {
public:
LibFlashPlugin();
~LibFlashPlugin() { close(); }
const char *pluginName() { return "LibFlashPlugin: " PLUGIN_NAME " " FLASH_VERSION_STRING; }
const char *pluginComment() { return "This is the libflash library: " PLUGIN_NAME " " FLASH_VERSION_STRING; }
double pluginVersion() { return 1.0; }
bool isFileSupported( const QString& fileName ) { return fileName.right(4) == ".swf"; }
bool open( const QString& fileName );
bool close() { FlashClose( file ); file = NULL; return TRUE; }
bool isOpen() { return file != NULL; }
const QString &fileInfo() { return strInfo = qApp->translate( "MediaPlayer", "No Information Available", "media plugin text" ); }
// If decoder doesn't support audio then return 0 here
int audioStreams() { return 1; }
int audioChannels( int /*stream*/ ) { return 2; }
int audioFrequency( int /*stream*/ ) { return 44100; }
int audioSamples( int /*stream*/ ) { return 1000000; }
-int audioBitsPerSample(int) { return 0;}
bool audioSetSample( long sample, int stream );
long audioGetSample( int stream );
//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 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 );
// If decoder doesn't support video then return 0 here
int videoStreams();
int videoWidth( int stream );
int videoHeight( int stream );
double videoFrameRate( int stream );
int videoFrames( int stream );
bool videoSetFrame( long frame, int stream );
long videoGetFrame( int stream );
bool videoReadFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, ColorFormat color_model, int stream );
bool videoReadScaledFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h, ColorFormat color_model, int stream );
bool videoReadYUVFrame( char *y_output, char *u_output, char *v_output, int in_x, int in_y, int in_w, int in_h, int stream );
// Profiling
double getTime();
// Ignore if these aren't supported
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
@@ -1,49 +1,48 @@
/**********************************************************************
** Copyright (C) 2001 Trolltech AS. All rights reserved.
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** 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 LIBFLASH_PLUGIN_IMPL_H
#define LIBFLASH_PLUGIN_IMPL_H
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
class LibFlashPlugin;
class LibFlashPluginImpl : public MediaPlayerPluginInterface
{
public:
LibFlashPluginImpl();
virtual ~LibFlashPluginImpl();
#ifndef QT_NO_COMPONENT
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
#endif
virtual MediaPlayerDecoder *decoder();
virtual MediaPlayerEncoder *encoder();
private:
LibFlashPlugin *libflashplugin;
ulong ref;
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
@@ -187,43 +187,43 @@ enum
stagDefineFont2 = 48,
notEnoughData = 0xffff, // Special code
};
#ifndef false
#define false 0
#endif
#ifndef true
#define true 1
#endif
extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb;
typedef void (*ScanLineFunc)(void *id, long y, long start, long end);
class Bitmap;
struct FlashMovie;
extern "C" {
#include "jpeglib.h"
};
extern "C" {
//#include "zlib.h"
-#include "/opt/qt-2.3.2-embedded/src/3rdparty/zlib/zlib.h"
+#include "../src/3rdparty/zlib/zlib.h"
};
#include "graphic.h"
#include "character.h"
#include "bitmap.h"
#include "shape.h"
#include "displaylist.h"
#include "sound.h"
#include "button.h"
#include "font.h"
#include "text.h"
#include "adpcm.h"
#include "program.h"
#include "sprite.h"
#include "script.h"
#include "movie.h"
#endif /* _SWF_H_ */