Diffstat (limited to 'core/multimedia/opieplayer/libmad/libmadplugin.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h index ff84c27..d85e0d4 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.h +++ b/core/multimedia/opieplayer/libmad/libmadplugin.h | |||
@@ -11,28 +11,26 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
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 | #ifndef LIBMAD_PLUGIN_H | 20 | #ifndef LIBMAD_PLUGIN_H |
21 | #define LIBMAD_PLUGIN_H | 21 | #define LIBMAD_PLUGIN_H |
22 | 22 | ||
23 | |||
24 | #include <qstring.h> | 23 | #include <qstring.h> |
25 | //#include <qpe/mediaplayerplugininterface.h> | 24 | #include <qpe/mediaplayerplugininterface.h> |
26 | #include "../mediaplayerplugininterface.h" | ||
27 | 25 | ||
28 | 26 | ||
29 | // #define OLD_MEDIAPLAYER_API | 27 | // #define OLD_MEDIAPLAYER_API |
30 | 28 | ||
31 | 29 | ||
32 | class LibMadPluginData; | 30 | class LibMadPluginData; |
33 | 31 | ||
34 | 32 | ||
35 | class LibMadPlugin : public MediaPlayerDecoder { | 33 | class LibMadPlugin : public MediaPlayerDecoder { |
36 | 34 | ||
37 | public: | 35 | public: |
38 | LibMadPlugin(); | 36 | LibMadPlugin(); |
@@ -45,25 +43,24 @@ public: | |||
45 | bool isFileSupported( const QString& ); | 43 | bool isFileSupported( const QString& ); |
46 | bool open( const QString& ); | 44 | bool open( const QString& ); |
47 | bool close(); | 45 | bool close(); |
48 | bool isOpen(); | 46 | bool isOpen(); |
49 | const QString &fileInfo() { return info; } | 47 | const QString &fileInfo() { return info; } |
50 | 48 | ||
51 | // If decoder doesn't support audio then return 0 here | 49 | // If decoder doesn't support audio then return 0 here |
52 | int audioStreams(); | 50 | int audioStreams(); |
53 | int audioChannels( int stream ); | 51 | int audioChannels( int stream ); |
54 | int audioFrequency( int stream ); | 52 | int audioFrequency( int stream ); |
55 | int audioSamples( int stream ); | 53 | int audioSamples( int stream ); |
56 | bool audioSetSample( long sample, int stream ); | 54 | bool audioSetSample( long sample, int stream ); |
57 | int audioBitsPerSample(int) {return 0;} | ||
58 | long audioGetSample( int stream ); | 55 | long audioGetSample( int stream ); |
59 | #ifdef OLD_MEDIAPLAYER_API | 56 | #ifdef OLD_MEDIAPLAYER_API |
60 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 57 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
61 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 58 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
62 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 59 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
63 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 60 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
64 | #else | 61 | #else |
65 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 62 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
66 | #endif | 63 | #endif |
67 | 64 | ||
68 | 65 | ||
69 | bool read(); | 66 | bool read(); |