summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/wavplugin
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/wavplugin') (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in4
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.cpp45
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.h24
3 files changed, 46 insertions, 27 deletions
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index bcbe7f2..a46b925 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -101,8 +101,10 @@ REQUIRES=
wavplugin.o: wavplugin.cpp \
- wavplugin.h
+ wavplugin.h \
+ ../mediaplayerplugininterface.h
wavpluginimpl.o: wavpluginimpl.cpp \
wavplugin.h \
+ ../mediaplayerplugininterface.h \
wavpluginimpl.h
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
index a6bd974..7f63b3b 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
@@ -18,4 +18,6 @@
**
**********************************************************************/
+// L.J.Potter added changes Fri 02-15-2002
+
#include <stdio.h>
#include <stdarg.h>
@@ -48,5 +50,5 @@ struct ChunkData {
-const int sound_buffer_size = 4096;
+const int sound_buffer_size = 512; // 4096; // you got to be kidding right?
@@ -74,4 +76,5 @@ public:
{
done = 0;
+ qApp->processEvents();
if ( input == 0 ) {
@@ -86,5 +89,5 @@ public:
return FALSE;
}
- samples_due += 44100;
+ samples_due += chunkdata.samplesPerSec;
while ( count && (samples_due > chunkdata.samplesPerSec) ) {
*output++ = l;
@@ -96,5 +99,4 @@ public:
}
}
-
return TRUE;
}
@@ -144,5 +146,5 @@ public:
}
} // while
-
+ qDebug("bits %d", chunkdata.wBitsPerSample);
return TRUE;
}
@@ -206,5 +208,5 @@ WavPlugin::~WavPlugin() {
bool WavPlugin::isFileSupported( const QString& path ) {
- debugMsg( "WavPlugin::isFileSupported" );
+// qDebug( "WavPlugin::isFileSupported" );
char *ext = strrchr( path.latin1(), '.' );
@@ -225,5 +227,5 @@ bool WavPlugin::isFileSupported( const QString& path ) {
bool WavPlugin::open( const QString& path ) {
- debugMsg( "WavPlugin::open" );
+// qDebug( "WavPlugin::open" );
d->max = d->out = sound_buffer_size;
@@ -246,5 +248,5 @@ bool WavPlugin::open( const QString& path ) {
bool WavPlugin::close() {
- debugMsg( "WavPlugin::close" );
+// qDebug( "WavPlugin::close" );
d->input->close();
@@ -256,5 +258,5 @@ bool WavPlugin::close() {
bool WavPlugin::isOpen() {
- debugMsg( "WavPlugin::isOpen" );
+// qDebug( "WavPlugin::isOpen" );
return ( d->input != 0 );
}
@@ -262,5 +264,5 @@ bool WavPlugin::isOpen() {
int WavPlugin::audioStreams() {
- debugMsg( "WavPlugin::audioStreams" );
+// qDebug( "WavPlugin::audioStreams" );
return 1;
}
@@ -268,18 +270,18 @@ int WavPlugin::audioStreams() {
int WavPlugin::audioChannels( int ) {
- debugMsg( "WavPlugin::audioChannels" );
- return 2; // ### Always scale audio to stereo samples
+// qDebug( "WavPlugin::audioChannels" );
+ return d->chunkdata.channels;// 2; // ### Always scale audio to stereo samples
}
int WavPlugin::audioFrequency( int ) {
- debugMsg( "WavPlugin::audioFrequency" );
- return 44100; // ### Always scale to frequency of 44100
+// qDebug( "WavPlugin::audioFrequency %d", d->chunkdata.samplesPerSec );
+ return d->chunkdata.samplesPerSec; //44100; // ### Always scale to frequency of 44100
}
int WavPlugin::audioSamples( int ) {
- debugMsg( "WavPlugin::audioSamples" );
- return d->samples * 2 / d->chunkdata.channels; // ### Scaled samples will be made stereo,
+// qDebug( "WavPlugin::audioSamples" );
+ return d->samples / d->chunkdata.channels/2; // ### Scaled samples will be made stereo,
// Therefore if source is mono we will double the number of samples
}
@@ -287,5 +289,5 @@ int WavPlugin::audioSamples( int ) {
bool WavPlugin::audioSetSample( long, int ) {
- debugMsg( "WavPlugin::audioSetSample" );
+// qDebug( "WavPlugin::audioSetSample" );
return FALSE;
}
@@ -293,5 +295,5 @@ bool WavPlugin::audioSetSample( long, int ) {
long WavPlugin::audioGetSample( int ) {
- debugMsg( "WavPlugin::audioGetSample" );
+// qDebug( "WavPlugin::audioGetSample" );
return 0;
}
@@ -323,12 +325,17 @@ bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& sampl
bool WavPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesMade, int ) {
- debugMsg( "WavPlugin::audioReadSamples" );
+// qDebug( "WavPlugin::audioReadSamples" );
return d->add( output, samples, samplesMade, channels != 1 );
}
double WavPlugin::getTime() {
- debugMsg( "WavPlugin::getTime" );
+// qDebug( "WavPlugin::getTime" );
return 0.0;
}
+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 64635ca..6afd67e 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.h
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.h
@@ -18,4 +18,6 @@
**
**********************************************************************/
+// L.J.Potter added changes Fri 02-15-2002
+
#ifndef WAV_PLUGIN_H
#define WAV_PLUGIN_H
@@ -24,5 +26,8 @@
#include <qstring.h>
#include <qapplication.h>
-#include "mediaplayerplugininterface.h"
+#include "../mediaplayerplugininterface.h"
+
+
+// #define OLD_MEDIAPLAYER_API
@@ -44,6 +49,5 @@ public:
bool close();
bool isOpen();
- //const QString &fileInfo() { return strInfo = qApp->translate( "MediaPlayer", "No Information Available", "media plugin text" ); }
- const QString &fileInfo() { return strInfo = QString(""); }
+ const QString &fileInfo() { return strInfo = ""; }
// If decoder doesn't support audio then return 0 here
@@ -51,12 +55,16 @@ public:
int audioChannels( int stream );
int audioFrequency( int stream );
+ int audioBitsPerSample( int stream );
int audioSamples( int stream );
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 );
+#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 );
+#else
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 );
+#endif
// If decoder doesn't support video then return 0 here
@@ -88,4 +96,6 @@ public:
bool supportsScaling() { return FALSE; }
+ long getPlayTime() { return -1; }
+
private:
WavPluginData *d;