commited by ljp (llornkcor) reverted to qpe's interface for compatibility. Added playlist features:

save, remove, and have different ones. Uncommented code for background image and added opielogo.

4 files changed, 18 insertions, 14 deletions

diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
index 7ac63c0..4a0da16 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
@@ -69,9 +69,9 @@ public:
   samples_due = 0;
   samples = -1;
     }
 
-    // expands out samples to the frequency of 44kHz
+    // expands out samples to the frequency of 44kHz //not any more
     bool add( short *output, long count, long& done, bool stereo )
     {
   done = 0;
     qApp->processEvents();
@@ -87,8 +87,10 @@ public:
                 qDebug("didn't get sample");
                 return FALSE;
             }
               samples_due += chunkdata.samplesPerSec;
+              printf("samples due %d\r", samples_due);
+              fflush(stdout);
              while ( count && (samples_due > chunkdata.samplesPerSec) ) {
                 *output++ = l;
                 if ( stereo )
                     *output++ = r;
@@ -327,14 +329,14 @@ bool WavPlugin::audioReadSamples( short *output, int channels, long samples, lon
     return d->add( output, samples, samplesMade, channels != 1 );
 }
 
 double WavPlugin::getTime() {
-//    qDebug( "WavPlugin::getTime" );
-    return 0.0;
+//    qDebug( "WavPlugin::getTime" ); //this is a stupid hack here!!
+  return d->chunkdata.wBitsPerSample; /*0.0*/;
 }
 
-int WavPlugin::audioBitsPerSample( int ) {
-//    qDebug( "WavPlugin::audioFormat %d", d->chunkdata.wBitsPerSample );
-    return d->chunkdata.wBitsPerSample; // 
-}
+// int WavPlugin::audioBitsPerSample( int ) {
+// //    qDebug( "WavPlugin::audioFormat %d", d->chunkdata.wBitsPerSample );
+//     return d->chunkdata.wBitsPerSample; // 
+// }
 
 
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.h b/core/multimedia/opieplayer/wavplugin/wavplugin.h
index 6ae6e06..1c8ba14 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.h
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.h
@@ -23,9 +23,10 @@
 #define WAV_PLUGIN_H
 
 #include <qstring.h>
 #include <qapplication.h>
-#include "../mediaplayerplugininterface.h"
+/* #include "../mediaplayerplugininterface.h" */
+#include <qpe/mediaplayerplugininterface.h>
 
 
 // #define OLD_MEDIAPLAYER_API
 
@@ -52,9 +53,9 @@ public:
     // If decoder doesn't support audio then return 0 here
     int audioStreams();
     int audioChannels( int stream ); 
     int audioFrequency( int stream );
-    int audioBitsPerSample( int stream );
+/*     int audioBitsPerSample( int stream ); */
     int audioSamples( int stream );
     bool audioSetSample( long sample, int stream );
     long audioGetSample( int stream );
 #ifdef OLD_MEDIAPLAYER_API
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
index 2923180..c232d7b 100644
--- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
@@ -28,16 +28,16 @@ WavPluginImpl::WavPluginImpl()
 
 WavPluginImpl::~WavPluginImpl()
 {
     if ( libmadplugin )
-	delete libmadplugin;
+  delete libmadplugin;
 }
 
 
 MediaPlayerDecoder *WavPluginImpl::decoder()
 {
     if ( !libmadplugin )
-	libmadplugin = new WavPlugin;
+  libmadplugin = new WavPlugin;
     return libmadplugin;
 }
 
 
@@ -52,10 +52,10 @@ MediaPlayerEncoder *WavPluginImpl::encoder()
 
 QRESULT WavPluginImpl::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;
 }
 
 
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h
index 10f9305..fb1fa73 100644
--- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h
+++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h
@@ -19,9 +19,10 @@
 **********************************************************************/
 #ifndef WAV_PLUGIN_IMPL_H 
 #define WAV_PLUGIN_IMPL_H
 
-#include "../mediaplayerplugininterface.h"
+
+/* #include "../mediaplayerplugininterface.h" */
 
 
 class WavPlugin;