summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/lib.cpp
authorsimon <simon>2002-12-05 23:28:06 (UTC)
committer simon <simon>2002-12-05 23:28:06 (UTC)
commit8a1c4b4b84d8a8de87bb6adb4df3f09961854633 (patch) (side-by-side diff)
tree2399c784b4d5e87c8bb834389837870353b4a43f /noncore/multimedia/opieplayer2/lib.cpp
parent15d4d1f2fc8b37d30694acc5765a822718af6c13 (diff)
downloadopie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.zip
opie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.tar.gz
opie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.tar.bz2
- adapted to xine CVS HEAD
Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 96bdb21..4a96408 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -48,11 +48,12 @@
#include "frame.h"
#include "lib.h"
+
typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
int width, int height,int bytes );
extern "C" {
- xine_vo_driver_t* init_video_out_plugin( xine_cfg_entry_t* conf, void* video);
+ xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * );
int null_is_showing_video( const xine_vo_driver_t* self );
void null_set_show_video( const xine_vo_driver_t* self, int show );
int null_is_fullscreen( const xine_vo_driver_t* self );
@@ -94,13 +95,13 @@ Lib::Lib( XineVideoWidget* widget ) {
// allocate oss for sound
// and fb for framebuffer
m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL );
- m_videoOutput = ::init_video_out_plugin( m_config, NULL );
+ m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this );
//xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL);
- null_display_handler( m_videoOutput, xine_display_frame, this );
+// null_display_handler( m_videoOutput, xine_display_frame, this );
m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput );