Diffstat (limited to 'core/multimedia/opieplayer/mediaplayerstate.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp index 7e82166..13741f6 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.cpp +++ b/core/multimedia/opieplayer/mediaplayerstate.cpp | |||
@@ -1,10 +1,10 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
@@ -16,29 +16,30 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | #include <qpe/qlibrary.h> | 21 | #include <qpe/qlibrary.h> |
22 | #include <qpe/mediaplayerplugininterface.h> | ||
23 | #include <qpe/config.h> | 22 | #include <qpe/config.h> |
24 | #include <qvaluelist.h> | 23 | #include <qvaluelist.h> |
25 | #include <qobject.h> | 24 | #include <qobject.h> |
26 | #include <qdir.h> | 25 | #include <qdir.h> |
26 | #include "mediaplayerplugininterface.h" | ||
27 | #include "mediaplayerstate.h" | 27 | #include "mediaplayerstate.h" |
28 | 28 | ||
29 | |||
29 | #ifdef QT_NO_COMPONENT | 30 | #ifdef QT_NO_COMPONENT |
30 | // Plugins which are compiled in when no plugin architecture available | 31 | // Plugins which are compiled in when no plugin architecture available |
31 | #include "libmad/libmadpluginimpl.h" | 32 | #include "libmad/libmadpluginimpl.h" |
32 | #include "libmpeg3/libmpeg3pluginimpl.h" | 33 | #include "libmpeg3/libmpeg3pluginimpl.h" |
33 | #include "wavplugin/wavpluginimpl.h" | 34 | #include "wavplugin/wavpluginimpl.h" |
34 | #endif | 35 | #endif |
35 | 36 | ||
36 | 37 | ||
37 | #define MediaPlayerDebug(x)qDebug x | 38 | //#define MediaPlayerDebug(x) qDebug x |
38 | //#define MediaPlayerDebug(x) | 39 | #define MediaPlayerDebug(x) |
39 | 40 | ||
40 | 41 | ||
41 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | 42 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) |
42 | : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) { | 43 | : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) { |
43 | Config cfg( "MediaPlayer" ); | 44 | Config cfg( "MediaPlayer" ); |
44 | readConfig( cfg ); | 45 | readConfig( cfg ); |
@@ -111,12 +112,16 @@ MediaPlayerDecoder *MediaPlayerState::curDecoder() { | |||
111 | 112 | ||
112 | // ### hack to get true sample count | 113 | // ### hack to get true sample count |
113 | MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() { | 114 | MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() { |
114 | return libmpeg3decoder; | 115 | return libmpeg3decoder; |
115 | } | 116 | } |
116 | 117 | ||
118 | // ### hack to get true sample count | ||
119 | // MediaPlayerDecoder *MediaPlayerState::libWavDecoder() { | ||
120 | // return libwavdecoder; | ||
121 | // } | ||
117 | 122 | ||
118 | void MediaPlayerState::loadPlugins() { | 123 | void MediaPlayerState::loadPlugins() { |
119 | 124 | ||
120 | #ifndef QT_NO_COMPONENT | 125 | #ifndef QT_NO_COMPONENT |
121 | QValueList<MediaPlayerPlugin>::Iterator mit; | 126 | QValueList<MediaPlayerPlugin>::Iterator mit; |
122 | for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) { | 127 | for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) { |