1 files changed, 37 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 0ea85dd..69ff492 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -1,80 +1,90 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 //#include <qpe/qpeapplication.h>
 
 #include <qfile.h>
 
 #include "frame.h"
 #include "lib.h"
 
 
 extern "C" {
-vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video);
+    vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video);
+    int null_is_showing_video( vo_driver_t* self );
+    void null_set_show_video( vo_driver_t* self, int show );
+    int null_is_fullscreen( vo_driver_t* self );
+    void null_set_fullscreen( vo_driver_t* self, int screen );
+    int null_is_scaling( vo_driver_t* self );
+    void null_set_scaling( vo_driver_t* self, int scale );
+
 }
 
 using namespace XINE;
 
 Lib::Lib() {
     printf("Lib");
     QCString str( getenv("HOME") );
     str += "/Settings/opiexine.cf";
     // get the configuration
     m_config = xine_config_file_init( str.data() );
 
     // allocate oss for sound
     // and fb for framebuffer
     m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ;
     if (m_audioOutput == NULL )
         printf("Failure\n");
     else
         printf("Success\n");
 
 
     // test code
     m_videoOutput = xine_load_video_output_plugin(m_config, "fb",
                                                   VISUAL_TYPE_FB,
                                                   0 );
 
     char** files = xine_list_video_output_plugins(3);
     char* out;
     int i = 0;
     while ( ( out = files[i] ) != 0 ) {
         printf("Audio %s\n", out );
         i++;
     }
 //    m_xine = xine_init( m_videoOutput,
 //                      m_audioOutput,
 //                      m_config );
     // test loading
-    m_videoOutput = ::init_video_out_plugin( m_config, NULL );		     
+    m_videoOutput = ::init_video_out_plugin( m_config, NULL );
     m_xine = xine_init( m_videoOutput,
 			m_audioOutput, m_config );
+    // install the event handler
+    xine_register_event_listener( m_xine, xine_event_handler, this );
 }
 
 Lib::~Lib() {
     delete m_config;
+    xine_remove_event_listener( m_xine, xine_event_handler );
     xine_exit( m_xine );
     delete m_videoOutput;
     //delete m_audioOutput;
 
 }
 
 QCString Lib::version() {
     QCString str( xine_get_str_version() );
     return str;
 };
 
 int Lib::majorVersion() {
     return xine_get_major_version();
 }
 int Lib::minorVersion() {
     return xine_get_minor_version();
 };
 
 int Lib::subVersion() {
     return xine_get_sub_version();
 }
 int Lib::play( const QString& fileName,
                int startPos,
                int start_time ) {
@@ -95,25 +105,49 @@ void Lib::setSpeed( int speed ) {
     xine_set_speed( m_xine, speed );
 }
 int Lib::status(){
     return xine_get_status( m_xine );
 }
 int Lib::currentPosition(){
     return xine_get_current_position( m_xine );
 }
 int Lib::currentTime()  {
     return xine_get_current_time( m_xine );
 };
 int Lib::length() {
     return xine_get_stream_length( m_xine );
 }
 bool Lib::isSeekable() {
     return xine_is_stream_seekable(m_xine);
 }
 Frame Lib::currentFrame() {
     Frame frame;
     return frame;
 };
 int Lib::error() {
     return xine_get_error( m_xine );
 };
-
+void Lib::handleXineEvent( xine_event_t* t ) {
+    if ( t->type == XINE_EVENT_PLAYBACK_FINISHED )
+        emit stopped();
+}
+void Lib::setShowVideo( bool video ) {
+    ::null_set_show_video( m_videoOutput,  video );
+}
+bool Lib::isShowingVideo() {
+    return ::null_is_showing_video( m_videoOutput );
+}
+void Lib::showVideoFullScreen( bool fullScreen ) {
+    ::null_set_fullscreen( m_videoOutput, fullScreen );
+}
+bool Lib::isVideoFullScreen() {
+    return ::null_is_fullscreen( m_videoOutput );
+}
+void Lib::setScaling( bool scale ) {
+    ::null_set_scaling( m_videoOutput, scale  );
+}
+bool Lib::isScaling() {
+    return ::null_is_scaling( m_videoOutput );
+}
+void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
+    ((Lib*)user_data)->handleXineEvent( t );
+}