-Remove bogus whitespaces

-Remove stl dependency
-Make switching from fullscreen video to audio work
-Remove debug output

1 files changed, 9 insertions, 30 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 248221b..8afb318 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -132,17 +132,9 @@ void Lib::initialize()
 
-
-//xine_open_video_driver( m_xine,  NULL,  XINE_VISUAL_TYPE_FB,  NULL);
-
-
-//    null_display_handler( m_videoOutput, xine_display_frame, this );
-
     m_stream = xine_stream_new (m_xine,  m_audioOutput,  m_videoOutput );
 
-    if (m_wid != 0 ) {
-        printf( "!0\n" );
+    if (m_wid != 0 )
         setWidget( m_wid );
-    }
 
-    m_queue = xine_event_new_queue (m_stream);
 
+    m_queue = xine_event_new_queue (m_stream);
     xine_event_create_listener_thread (m_queue, xine_event_handler, this);
@@ -161,8 +153,6 @@ Lib::~Lib() {
     xine_close( m_stream );
-
     xine_event_dispose_queue( m_queue );
-
     xine_dispose( m_stream );
-
     xine_exit( m_xine );
+
     /* FIXME either free or delete but valgrind bitches against both */
@@ -201,5 +191,2 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
     assert( m_initialized );
-    // FIXME actually a hack imho. Should not be needed to dispose the whole stream
-    // but without we get wrong media length reads from libxine for the second media
-    //xine_dispose ( m_stream );
 
@@ -207,8 +194,5 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
 
-    //m_stream = xine_stream_new (m_xine,  m_audioOutput,  m_videoOutput );
-    //m_queue = xine_event_new_queue (m_stream);
-    //xine_event_create_listener_thread (m_queue, xine_event_handler, this);
 
-     if ( !xine_open( m_stream, str.utf8().data() ) ) {
-        return 0;
+    if ( !xine_open( m_stream, str.utf8().data() ) ) {
+         return 0;
     }
@@ -219,4 +203,2 @@ void Lib::stop() {
     assert( m_initialized );
-
-    odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl;
     xine_stop( m_stream );
@@ -260,8 +242,8 @@ int Lib::currentTime() const {
     int pos, time, length;
-    xine_get_pos_length( m_stream, &pos, &time, &length );
-    if ( time > 0 )  {
+    pos = time = length = 0;
+
+    if ( xine_get_pos_length( m_stream, &pos, &time, &length ) )
         return time/1000;
-    } else {
+    else
         return 0;
-    }
 }
@@ -302,4 +284,2 @@ void Lib::seekTo( int time ) {
 
-    //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_(
-    // since its now milliseconds we need *1000
     xine_play( m_stream, 0, time*1000 );
@@ -427,3 +407,2 @@ void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
     if ( !m_video ) {
-        owarn << "not showing video now" << oendl;
         return;