fucked up- no workie.. back out

1 files changed, 1 insertions, 3 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
@@ -15,50 +15,48 @@
 **
 ** 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 );