author | zecke <zecke> | 2005-04-17 13:56:34 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-04-17 13:56:34 (UTC) |
commit | 3d5e5c098ccb686588380bc1f220beafbc5a6d76 (patch) (unidiff) | |
tree | 92fad8a98ea341ec290dc7f9fca7759470b795f6 /noncore/multimedia/opieplayer2/lib.h | |
parent | 49335d66d8e96b1fc86ecfe95cd343c8960126bc (diff) | |
download | opie-3d5e5c098ccb686588380bc1f220beafbc5a6d76.zip opie-3d5e5c098ccb686588380bc1f220beafbc5a6d76.tar.gz opie-3d5e5c098ccb686588380bc1f220beafbc5a6d76.tar.bz2 |
Opie Player2 XINE update:
-update xine code alphablend, yuv2rgb to be up to date
-XINELib:
-use the XINE infrastructure to change the gui width/height
-use the XINE infrastructure to change the brightness
-Update the NULL Video Driver:
-make use of frame_dest_cb and and dest_size_cb (callback)
to update the size of the gui
-use alphablend
-merge the video_out_fb xine driver
To Alwin: your testvideo now lockups op2. with valgrind I see
it has to do with the yuv2rgb conversion methods
Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 2607193..a6ac033 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -184,32 +184,36 @@ namespace XINE { | |||
184 | protected: | 184 | protected: |
185 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); | 185 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); |
186 | 186 | ||
187 | virtual void run(); | 187 | virtual void run(); |
188 | 188 | ||
189 | private: | 189 | private: |
190 | void initialize(); | 190 | void initialize(); |
191 | 191 | ||
192 | int m_bytes_per_pixel; | 192 | int m_bytes_per_pixel; |
193 | bool m_initialized:1; | 193 | bool m_initialized:1; |
194 | bool m_duringInitialization:1; | 194 | bool m_duringInitialization:1; |
195 | bool m_video:1; | 195 | bool m_video:1; |
196 | XineVideoWidget *m_wid; | 196 | XineVideoWidget *m_wid; |
197 | xine_t *m_xine; | 197 | QSize m_videoSize; |
198 | xine_stream_t *m_stream; | 198 | xine_t *m_xine; |
199 | xine_cfg_entry_t *m_config; | 199 | xine_stream_t *m_stream; |
200 | xine_vo_driver_t *m_videoOutput; | 200 | xine_cfg_entry_t *m_config; |
201 | xine_ao_driver_t* m_audioOutput; | 201 | xine_vo_driver_t *m_videoOutput; |
202 | xine_event_queue_t *m_queue; | 202 | xine_ao_driver_t* m_audioOutput; |
203 | 203 | xine_event_queue_t *m_queue; | |
204 | void handleXineEvent( const xine_event_t* t ); | 204 | |
205 | void handleXineEvent( int type, int data, const char* name ); | 205 | void handleXineEvent( const xine_event_t* t ); |
206 | void drawFrame( uint8_t* frame, int width, int height, int bytes ); | 206 | void handleXineEvent( int type, int data, const char* name ); |
207 | void drawFrame( uint8_t* frame, int width, int height, int bytes ); | ||
207 | // C -> C++ bridge for the event system | 208 | // C -> C++ bridge for the event system |
208 | static void xine_event_handler( void* user_data, const xine_event_t* t); | 209 | static void xine_event_handler( void* user_data, const xine_event_t* t); |
209 | static void xine_display_frame( void* user_data, uint8_t* frame , | 210 | static void xine_display_frame( void* user_data, uint8_t* frame , |
210 | int width, int height, int bytes ); | 211 | int width, int height, int bytes ); |
212 | static void xine_vo_scale_cb(void *, int, int, double, | ||
213 | int*,int*,int*,int*,double*,int*,int*); | ||
214 | static void xine_dest_cb(void*,int,int,double,int*,int*,double*); | ||
211 | }; | 215 | }; |
212 | }; | 216 | }; |
213 | 217 | ||
214 | 218 | ||
215 | #endif | 219 | #endif |