summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libmad
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/libmad') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.h6
-rw-r--r--core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp8
-rw-r--r--core/multimedia/opieplayer/libmad/libmadpluginimpl.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index d163458..b240b77 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -18,14 +18,14 @@
**
**********************************************************************/
#ifndef LIBMAD_PLUGIN_H
#define LIBMAD_PLUGIN_H
#include <qstring.h>
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
+/* #include "../mediaplayerplugininterface.h" */
// #define OLD_MEDIAPLAYER_API
class LibMadPluginData;
@@ -50,13 +50,13 @@ public:
// If decoder doesn't support audio then return 0 here
int audioStreams();
int audioChannels( int stream );
int audioFrequency( int stream );
int audioSamples( int stream );
bool audioSetSample( long sample, int stream );
- int audioBitsPerSample(int) {return 0;}
+/* int audioBitsPerSample(int) {return 0;} */
long audioGetSample( int stream );
#ifdef OLD_MEDIAPLAYER_API
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 channel, long samples, int stream );
bool audioReReadSamples( short *output, int channel, long samples, int stream );
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
index 028c658..67779e8 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
@@ -27,20 +27,20 @@ LibMadPluginImpl::LibMadPluginImpl()
}
LibMadPluginImpl::~LibMadPluginImpl()
{
if ( libmadplugin )
- delete libmadplugin;
+ delete libmadplugin;
}
MediaPlayerDecoder *LibMadPluginImpl::decoder()
{
if ( !libmadplugin )
- libmadplugin = new LibMadPlugin;
+ libmadplugin = new LibMadPlugin;
return libmadplugin;
}
MediaPlayerEncoder *LibMadPluginImpl::encoder()
{
@@ -51,14 +51,14 @@ MediaPlayerEncoder *LibMadPluginImpl::encoder()
#ifndef QT_NO_COMPONENT
QRESULT LibMadPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
- if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
- *iface = this, (*iface)->addRef();
+ if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
+ *iface = this, (*iface)->addRef();
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
index bc864ee..9b35b90 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
@@ -17,14 +17,14 @@
** not clear to you.
**
**********************************************************************/
#ifndef LIBMAD_PLUGIN_IMPL_H
#define LIBMAD_PLUGIN_IMPL_H
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
+//#include "../mediaplayerplugininterface.h"
class LibMadPlugin;
class LibMadPluginImpl : public MediaPlayerPluginInterface