Diffstat (limited to 'core/multimedia/opieplayer/libmpeg3') (more/less context) (ignore whitespace changes)
4 files changed, 49 insertions, 43 deletions
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index 154f85d..d255e4f 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in | |||
@@ -178,3 +178,4 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ | |||
178 | video/mpeg3video.h \ | 178 | video/mpeg3video.h \ |
179 | mpeg3protos.h | 179 | mpeg3protos.h \ |
180 | ../mediaplayerplugininterface.h | ||
180 | 181 | ||
@@ -194,2 +195,3 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | |||
194 | mpeg3protos.h \ | 195 | mpeg3protos.h \ |
196 | ../mediaplayerplugininterface.h \ | ||
195 | libmpeg3pluginimpl.h | 197 | libmpeg3pluginimpl.h |
@@ -416,3 +418,3 @@ audio/layer2.o: audio/layer2.c \ | |||
416 | audio/layer3.o: audio/layer3.c \ | 418 | audio/layer3.o: audio/layer3.c \ |
417 | audio/huffman.h \ | 419 | huffman.h \ |
418 | audio/mpeg3audio.h \ | 420 | audio/mpeg3audio.h \ |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro index b1426d1..e50aa4e 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro | |||
@@ -1,39 +1,40 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h | 3 | HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h |
4 | SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ | 4 | SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ |
5 | bitstream.c \ | 5 | bitstream.c \ |
6 | libmpeg3.c \ | 6 | libmpeg3.c \ |
7 | mpeg3atrack.c \ | 7 | mpeg3atrack.c \ |
8 | mpeg3css.c \ | 8 | mpeg3css.c \ |
9 | mpeg3demux.c \ | 9 | mpeg3demux.c \ |
10 | mpeg3io.c \ | 10 | mpeg3io.c \ |
11 | mpeg3title.c \ | 11 | mpeg3title.c \ |
12 | mpeg3vtrack.c \ | 12 | mpeg3vtrack.c \ |
13 | audio/ac3.c \ | 13 | audio/ac3.c \ |
14 | audio/bit_allocation.c \ | 14 | audio/bit_allocation.c \ |
15 | audio/dct.c \ | 15 | audio/dct.c \ |
16 | audio/exponents.c \ | 16 | audio/exponents.c \ |
17 | audio/header.c \ | 17 | audio/header.c \ |
18 | audio/layer2.c \ | 18 | audio/layer2.c \ |
19 | audio/layer3.c \ | 19 | audio/layer3.c \ |
20 | audio/mantissa.c \ | 20 | audio/mantissa.c \ |
21 | audio/mpeg3audio.c \ | 21 | audio/mpeg3audio.c \ |
22 | audio/pcm.c \ | 22 | audio/pcm.c \ |
23 | audio/synthesizers.c \ | 23 | audio/synthesizers.c \ |
24 | audio/tables.c \ | 24 | audio/tables.c \ |
25 | video/getpicture.c \ | 25 | video/getpicture.c \ |
26 | video/headers.c \ | 26 | video/headers.c \ |
27 | video/idct.c \ | 27 | video/idct.c \ |
28 | video/macroblocks.c \ | 28 | video/macroblocks.c \ |
29 | video/mmxtest.c \ | 29 | video/mmxtest.c \ |
30 | video/motion.c \ | 30 | video/motion.c \ |
31 | video/mpeg3video.c \ | 31 | video/mpeg3video.c \ |
32 | video/output.c \ | 32 | video/output.c \ |
33 | video/reconstruct.c \ | 33 | video/reconstruct.c \ |
34 | video/seek.c \ | 34 | video/seek.c \ |
35 | video/slice.c \ | 35 | video/slice.c \ |
36 | video/vlc.c | 36 | video/vlc.c |
37 | TARGET = mpeg3plugin | 37 | TARGET = mpeg3plugin |
38 | DESTDIR = ../../plugins/codecs | 38 | TMAKE_CC=g++ |
39 | DESTDIR = ../../plugins/codecs | ||
39 | INCLUDEPATH += $(OPIEDIR)/include .. | 40 | INCLUDEPATH += $(OPIEDIR)/include .. |
@@ -41,2 +42,2 @@ DEPENDPATH += ../$(OPIEDIR)/include .. | |||
41 | LIBS += -lqpe -lpthread -lm | 42 | LIBS += -lqpe -lpthread -lm |
42 | VERSION = 1.0.0 | 43 | VERSION = 1.0.0 |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h index e0eb930..bd31706 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | |||
@@ -26,3 +26,4 @@ | |||
26 | #include "mpeg3protos.h" | 26 | #include "mpeg3protos.h" |
27 | #include <qpe/mediaplayerplugininterface.h> | 27 | //#include <qpe/mediaplayerplugininterface.h> |
28 | #include "../mediaplayerplugininterface.h" | ||
28 | 29 | ||
@@ -52,2 +53,3 @@ public: | |||
52 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } | 53 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } |
54 | int audioBitsPerSample(int) { return 0;} | ||
53 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } | 55 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h index e9926f4..a2f5211 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h | |||
@@ -22,3 +22,4 @@ | |||
22 | 22 | ||
23 | #include <qpe/mediaplayerplugininterface.h> | 23 | //#include <qpe/mediaplayerplugininterface.h> |
24 | #include "../mediaplayerplugininterface.h" | ||
24 | 25 | ||