author | llornkcor <llornkcor> | 2002-02-25 01:35:47 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-02-25 01:35:47 (UTC) |
commit | f180c1a5e8fc889ff1fb390d5cc94cdbc5085046 (patch) (unidiff) | |
tree | 5e9ea6f1313f4c33d57fb266523c1cfbe0826756 /core/multimedia/opieplayer/libmad | |
parent | c0446b55fc32b7fdea9f58db06e40da703f5e8ff (diff) | |
download | opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.zip opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.gz opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.bz2 |
fucked up- no workie.. back out
Diffstat (limited to 'core/multimedia/opieplayer/libmad') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmad/Makefile.in | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmad.pro | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.h | 5 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadpluginimpl.h | 5 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/version.c | 0 |
5 files changed, 3 insertions, 11 deletions
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index 552043c..e9f74e7 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in | |||
@@ -211,15 +211,13 @@ layer3.o: layer3.c \ | |||
211 | huffman.o: huffman.c \ | 211 | huffman.o: huffman.c \ |
212 | libmad_global.h \ | 212 | libmad_global.h \ |
213 | huffman.h | 213 | huffman.h |
214 | 214 | ||
215 | libmadplugin.o: libmadplugin.cpp \ | 215 | libmadplugin.o: libmadplugin.cpp \ |
216 | libmadplugin.h \ | 216 | libmadplugin.h \ |
217 | ../mediaplayerplugininterface.h \ | ||
218 | mad.h | 217 | mad.h |
219 | 218 | ||
220 | libmadpluginimpl.o: libmadpluginimpl.cpp \ | 219 | libmadpluginimpl.o: libmadpluginimpl.cpp \ |
221 | libmadplugin.h \ | 220 | libmadplugin.h \ |
222 | ../mediaplayerplugininterface.h \ | ||
223 | libmadpluginimpl.h | 221 | libmadpluginimpl.h |
224 | 222 | ||
225 | 223 | ||
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index b54ca6b..6c40a15 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro | |||
@@ -5,10 +5,8 @@ HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h de | |||
5 | SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ | 5 | SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ |
6 | layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp | 6 | layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp |
7 | TARGET = madplugin | 7 | TARGET = madplugin |
8 | DESTDIR = ../../plugins/codecs | 8 | DESTDIR = ../../plugins/codecs |
9 | INCLUDEPATH += $(OPIEDIR)/include .. | 9 | INCLUDEPATH += $(OPIEDIR)/include .. |
10 | DEPENDPATH += ../$(OPIEDIR)/include .. | 10 | DEPENDPATH += ../$(OPIEDIR)/include .. |
11 | TMAKE_CFLAGS += -DFPM_64BIT | ||
12 | TMAKE_CXXFLAGS += -DFPM_64BIT | ||
13 | LIBS += -lqpe -lm | 11 | LIBS += -lqpe -lm |
14 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
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 | |||
@@ -17,16 +17,14 @@ | |||
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; |
@@ -51,13 +49,12 @@ public: | |||
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 ); |
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h index 8ad4956..2c5ed3b 100644 --- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h +++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h | |||
@@ -17,15 +17,13 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMAD_PLUGIN_IMPL_H | 20 | #ifndef LIBMAD_PLUGIN_IMPL_H |
21 | #define LIBMAD_PLUGIN_IMPL_H | 21 | #define LIBMAD_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | //#include <qpe/mediaplayerplugininterface.h> | ||
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 24 | ||
27 | 25 | ||
28 | class LibMadPlugin; | 26 | class LibMadPlugin; |
29 | 27 | ||
30 | 28 | ||
31 | class LibMadPluginImpl : public MediaPlayerPluginInterface | 29 | class LibMadPluginImpl : public MediaPlayerPluginInterface |
@@ -40,12 +38,13 @@ public: | |||
40 | Q_REFCOUNT | 38 | Q_REFCOUNT |
41 | 39 | ||
42 | #endif | 40 | #endif |
43 | 41 | ||
44 | virtual MediaPlayerDecoder *decoder(); | 42 | virtual MediaPlayerDecoder *decoder(); |
45 | virtual MediaPlayerEncoder *encoder(); | 43 | virtual MediaPlayerEncoder *encoder(); |
44 | |||
46 | private: | 45 | private: |
47 | LibMadPlugin *libmadplugin; | 46 | LibMadPlugin *libmadplugin; |
48 | ulong ref; | 47 | ulong ref; |
49 | }; | 48 | }; |
50 | 49 | ||
51 | 50 | ||
diff --git a/core/multimedia/opieplayer/libmad/version.c b/core/multimedia/opieplayer/libmad/version.c index 1baba26..413d54b 100644 --- a/core/multimedia/opieplayer/libmad/version.c +++ b/core/multimedia/opieplayer/libmad/version.c | |||