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/libmpeg3/libmpeg3plugin.h | |
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/libmpeg3/libmpeg3plugin.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h index bd31706..b573e84 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | |||
@@ -19,18 +19,17 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMPEG3_PLUGIN_H | 20 | #ifndef LIBMPEG3_PLUGIN_H |
21 | #define LIBMPEG3_PLUGIN_H | 21 | #define LIBMPEG3_PLUGIN_H |
22 | 22 | ||
23 | #include <qstring.h> | 23 | #include <qstring.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include "libmpeg3.h" | 25 | #include "libmpeg3.h" |
26 | #include "mpeg3protos.h" | 26 | #include "mpeg3protos.h" |
27 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
28 | #include "../mediaplayerplugininterface.h" | ||
29 | 28 | ||
30 | 29 | ||
31 | // #define OLD_MEDIAPLAYER_API | 30 | // #define OLD_MEDIAPLAYER_API |
32 | 31 | ||
33 | 32 | ||
34 | class LibMpeg3Plugin : public MediaPlayerDecoder { | 33 | class LibMpeg3Plugin : public MediaPlayerDecoder { |
35 | 34 | ||
36 | public: | 35 | public: |
@@ -46,17 +45,17 @@ public: | |||
46 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } | 45 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } |
47 | bool isOpen() { return file != NULL; } | 46 | bool isOpen() { return file != NULL; } |
48 | const QString &fileInfo() { return strInfo = ""; } | 47 | const QString &fileInfo() { return strInfo = ""; } |
49 | 48 | ||
50 | // If decoder doesn't support audio then return 0 here | 49 | // If decoder doesn't support audio then return 0 here |
51 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } | 50 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } |
52 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } | 51 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } |
53 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } | 52 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } |
54 | int audioBitsPerSample(int) { return 0;} | 53 | /* int audioBitsPerSample(int) { return 0;} */ |
55 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } | 54 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } |
56 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } | 55 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } |
57 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } | 56 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } |
58 | #ifdef OLD_MEDIAPLAYER_API | 57 | #ifdef OLD_MEDIAPLAYER_API |
59 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 58 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
60 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 59 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
61 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 60 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
62 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 61 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
@@ -69,25 +68,25 @@ public: | |||
69 | int videoWidth( int stream ) { return file ? mpeg3_video_width( file, stream ) : 0; } | 68 | int videoWidth( int stream ) { return file ? mpeg3_video_width( file, stream ) : 0; } |
70 | int videoHeight( int stream ) { return file ? mpeg3_video_height( file, stream ) : 0; } | 69 | int videoHeight( int stream ) { return file ? mpeg3_video_height( file, stream ) : 0; } |
71 | double videoFrameRate( int stream ) { return file ? mpeg3_frame_rate( file, stream ) : 0.0; } | 70 | double videoFrameRate( int stream ) { return file ? mpeg3_frame_rate( file, stream ) : 0.0; } |
72 | int videoFrames( int stream ) | 71 | int videoFrames( int stream ) |
73 | { return file ? mpeg3_video_frames( file, stream ) : 0; } | 72 | { return file ? mpeg3_video_frames( file, stream ) : 0; } |
74 | /* | 73 | /* |
75 | { | 74 | { |
76 | if ( file ) { | 75 | if ( file ) { |
77 | int frames = mpeg3_video_frames( file, stream ); | 76 | int frames = mpeg3_video_frames( file, stream ); |
78 | if ( frames == 1 ) { | 77 | if ( frames == 1 ) { |
79 | int res = mpeg3_seek_percentage( file, 0.99 ); | 78 | int res = mpeg3_seek_percentage( file, 0.99 ); |
80 | printf("res: %i\n", res ); | 79 | printf("res: %i\n", res ); |
81 | mpeg3video_seek( file->vtrack[stream]->video ); | 80 | mpeg3video_seek( file->vtrack[stream]->video ); |
82 | frames = mpeg3_get_frame( file, stream ); | 81 | frames = mpeg3_get_frame( file, stream ); |
83 | mpeg3_seek_percentage( file, 0.0 ); | 82 | mpeg3_seek_percentage( file, 0.0 ); |
84 | } | 83 | } |
85 | return frames; | 84 | return frames; |
86 | } | 85 | } |
87 | return 0; | 86 | return 0; |
88 | } | 87 | } |
89 | */ | 88 | */ |
90 | bool videoSetFrame( long frame, int stream ) { return file ? mpeg3_set_frame( file, frame, stream) == 1 : FALSE; } | 89 | bool videoSetFrame( long frame, int stream ) { return file ? mpeg3_set_frame( file, frame, stream) == 1 : FALSE; } |
91 | long videoGetFrame( int stream ) { return file ? mpeg3_get_frame( file, stream ) : 0; } | 90 | long videoGetFrame( int stream ) { return file ? mpeg3_get_frame( file, stream ) : 0; } |
92 | bool videoReadFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, ColorFormat color_model, int stream ); | 91 | bool videoReadFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, ColorFormat color_model, int stream ); |
93 | bool videoReadScaledFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h, ColorFormat color_model, int stream ); | 92 | bool videoReadScaledFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h, ColorFormat color_model, int stream ); |