author | bipolar <bipolar> | 2002-03-03 17:13:17 (UTC) |
---|---|---|
committer | bipolar <bipolar> | 2002-03-03 17:13:17 (UTC) |
commit | a99347380a9006ec81a9dba2340d6aaab690a86e (patch) (unidiff) | |
tree | 73fdc2eff476fba2113172ed881dd64a4031def6 /core/multimedia/opieplayer/wavplugin | |
parent | 0e245156b28b70be5cd98a58a9256fe5e2739562 (diff) | |
download | opie-a99347380a9006ec81a9dba2340d6aaab690a86e.zip opie-a99347380a9006ec81a9dba2340d6aaab690a86e.tar.gz opie-a99347380a9006ec81a9dba2340d6aaab690a86e.tar.bz2 |
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.
Diffstat (limited to 'core/multimedia/opieplayer/wavplugin') (more/less context) (ignore whitespace changes)
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 | |||
@@ -67,13 +67,13 @@ public: | |||
67 | max = out = sound_buffer_size; | 67 | max = out = sound_buffer_size; |
68 | wavedata_remaining = 0; | 68 | wavedata_remaining = 0; |
69 | samples_due = 0; | 69 | samples_due = 0; |
70 | samples = -1; | 70 | samples = -1; |
71 | } | 71 | } |
72 | 72 | ||
73 | // expands out samples to the frequency of 44kHz | 73 | // expands out samples to the frequency of 44kHz //not any more |
74 | bool add( short *output, long count, long& done, bool stereo ) | 74 | bool add( short *output, long count, long& done, bool stereo ) |
75 | { | 75 | { |
76 | done = 0; | 76 | done = 0; |
77 | qApp->processEvents(); | 77 | qApp->processEvents(); |
78 | 78 | ||
79 | if ( input == 0 ) { | 79 | if ( input == 0 ) { |
@@ -85,12 +85,14 @@ public: | |||
85 | int l,r; | 85 | int l,r; |
86 | if ( getSample(l, r) == FALSE ) { | 86 | if ( getSample(l, r) == FALSE ) { |
87 | qDebug("didn't get sample"); | 87 | qDebug("didn't get sample"); |
88 | return FALSE; | 88 | return FALSE; |
89 | } | 89 | } |
90 | samples_due += chunkdata.samplesPerSec; | 90 | samples_due += chunkdata.samplesPerSec; |
91 | printf("samples due %d\r", samples_due); | ||
92 | fflush(stdout); | ||
91 | while ( count && (samples_due > chunkdata.samplesPerSec) ) { | 93 | while ( count && (samples_due > chunkdata.samplesPerSec) ) { |
92 | *output++ = l; | 94 | *output++ = l; |
93 | if ( stereo ) | 95 | if ( stereo ) |
94 | *output++ = r; | 96 | *output++ = r; |
95 | samples_due -= chunkdata.samplesPerSec; | 97 | samples_due -= chunkdata.samplesPerSec; |
96 | count--; | 98 | count--; |
@@ -325,16 +327,16 @@ bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& sampl | |||
325 | bool WavPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesMade, int ) { | 327 | bool WavPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesMade, int ) { |
326 | // qDebug( "WavPlugin::audioReadSamples" ); | 328 | // qDebug( "WavPlugin::audioReadSamples" ); |
327 | return d->add( output, samples, samplesMade, channels != 1 ); | 329 | return d->add( output, samples, samplesMade, channels != 1 ); |
328 | } | 330 | } |
329 | 331 | ||
330 | double WavPlugin::getTime() { | 332 | double WavPlugin::getTime() { |
331 | // qDebug( "WavPlugin::getTime" ); | 333 | // qDebug( "WavPlugin::getTime" ); //this is a stupid hack here!! |
332 | return 0.0; | 334 | return d->chunkdata.wBitsPerSample; /*0.0*/; |
333 | } | 335 | } |
334 | 336 | ||
335 | int WavPlugin::audioBitsPerSample( int ) { | 337 | // int WavPlugin::audioBitsPerSample( int ) { |
336 | // qDebug( "WavPlugin::audioFormat %d", d->chunkdata.wBitsPerSample ); | 338 | // // qDebug( "WavPlugin::audioFormat %d", d->chunkdata.wBitsPerSample ); |
337 | return d->chunkdata.wBitsPerSample; // | 339 | // return d->chunkdata.wBitsPerSample; // |
338 | } | 340 | // } |
339 | 341 | ||
340 | 342 | ||
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 | |||
@@ -21,13 +21,14 @@ | |||
21 | 21 | ||
22 | #ifndef WAV_PLUGIN_H | 22 | #ifndef WAV_PLUGIN_H |
23 | #define WAV_PLUGIN_H | 23 | #define WAV_PLUGIN_H |
24 | 24 | ||
25 | #include <qstring.h> | 25 | #include <qstring.h> |
26 | #include <qapplication.h> | 26 | #include <qapplication.h> |
27 | #include "../mediaplayerplugininterface.h" | 27 | /* #include "../mediaplayerplugininterface.h" */ |
28 | #include <qpe/mediaplayerplugininterface.h> | ||
28 | 29 | ||
29 | 30 | ||
30 | // #define OLD_MEDIAPLAYER_API | 31 | // #define OLD_MEDIAPLAYER_API |
31 | 32 | ||
32 | 33 | ||
33 | class WavPluginData; | 34 | class WavPluginData; |
@@ -50,13 +51,13 @@ public: | |||
50 | const QString &fileInfo() { return strInfo = ""; } | 51 | const QString &fileInfo() { return strInfo = ""; } |
51 | 52 | ||
52 | // If decoder doesn't support audio then return 0 here | 53 | // If decoder doesn't support audio then return 0 here |
53 | int audioStreams(); | 54 | int audioStreams(); |
54 | int audioChannels( int stream ); | 55 | int audioChannels( int stream ); |
55 | int audioFrequency( int stream ); | 56 | int audioFrequency( int stream ); |
56 | int audioBitsPerSample( int stream ); | 57 | /* int audioBitsPerSample( int stream ); */ |
57 | int audioSamples( int stream ); | 58 | int audioSamples( int stream ); |
58 | bool audioSetSample( long sample, int stream ); | 59 | bool audioSetSample( long sample, int stream ); |
59 | long audioGetSample( int stream ); | 60 | long audioGetSample( int stream ); |
60 | #ifdef OLD_MEDIAPLAYER_API | 61 | #ifdef OLD_MEDIAPLAYER_API |
61 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 62 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
62 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 63 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
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 | |||
@@ -26,20 +26,20 @@ WavPluginImpl::WavPluginImpl() | |||
26 | } | 26 | } |
27 | 27 | ||
28 | 28 | ||
29 | WavPluginImpl::~WavPluginImpl() | 29 | WavPluginImpl::~WavPluginImpl() |
30 | { | 30 | { |
31 | if ( libmadplugin ) | 31 | if ( libmadplugin ) |
32 | delete libmadplugin; | 32 | delete libmadplugin; |
33 | } | 33 | } |
34 | 34 | ||
35 | 35 | ||
36 | MediaPlayerDecoder *WavPluginImpl::decoder() | 36 | MediaPlayerDecoder *WavPluginImpl::decoder() |
37 | { | 37 | { |
38 | if ( !libmadplugin ) | 38 | if ( !libmadplugin ) |
39 | libmadplugin = new WavPlugin; | 39 | libmadplugin = new WavPlugin; |
40 | return libmadplugin; | 40 | return libmadplugin; |
41 | } | 41 | } |
42 | 42 | ||
43 | 43 | ||
44 | MediaPlayerEncoder *WavPluginImpl::encoder() | 44 | MediaPlayerEncoder *WavPluginImpl::encoder() |
45 | { | 45 | { |
@@ -50,14 +50,14 @@ MediaPlayerEncoder *WavPluginImpl::encoder() | |||
50 | #ifndef QT_NO_COMPONENT | 50 | #ifndef QT_NO_COMPONENT |
51 | 51 | ||
52 | 52 | ||
53 | QRESULT WavPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 53 | QRESULT WavPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
54 | { | 54 | { |
55 | *iface = 0; | 55 | *iface = 0; |
56 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) | 56 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) |
57 | *iface = this, (*iface)->addRef(); | 57 | *iface = this, (*iface)->addRef(); |
58 | return QS_OK; | 58 | return QS_OK; |
59 | } | 59 | } |
60 | 60 | ||
61 | 61 | ||
62 | Q_EXPORT_INTERFACE() | 62 | Q_EXPORT_INTERFACE() |
63 | { | 63 | { |
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 | |||
@@ -17,13 +17,14 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef WAV_PLUGIN_IMPL_H | 20 | #ifndef WAV_PLUGIN_IMPL_H |
21 | #define WAV_PLUGIN_IMPL_H | 21 | #define WAV_PLUGIN_IMPL_H |
22 | 22 | ||
23 | #include "../mediaplayerplugininterface.h" | 23 | |
24 | /* #include "../mediaplayerplugininterface.h" */ | ||
24 | 25 | ||
25 | 26 | ||
26 | class WavPlugin; | 27 | class WavPlugin; |
27 | 28 | ||
28 | 29 | ||
29 | class WavPluginImpl : public MediaPlayerPluginInterface | 30 | class WavPluginImpl : public MediaPlayerPluginInterface |