From 7f4bd526d59aacbf750e9ee58337b6cf640ba28b Mon Sep 17 00:00:00 2001
From: simon <simon>
Date: Tue, 10 Dec 2002 23:24:48 +0000
Subject: - added an m_initialized flag and a guard for it, along with an

  assertion method called from all methods that access variables depending
  on initialization (basically all :)
---
(limited to 'noncore')

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 641cbca..99d5de6 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -71,6 +71,7 @@ extern "C" {
 using namespace XINE;
 
 Lib::Lib( XineVideoWidget* widget ) {
+    m_initialized = false;
     m_video = false;
     m_wid = widget;
     printf("Lib");
@@ -116,16 +117,21 @@ void Lib::initialize()
         resize ( m_wid-> size ( ) );
         ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
 
-        m_wid->repaint();
+//        m_wid->repaint();
     }
 
     m_queue = xine_event_new_queue (m_stream);
 
     xine_event_create_listener_thread (m_queue, xine_event_handler, this);
 
+    m_initialized = true;
 }
 
 Lib::~Lib() {
+    ThreadUtil::AutoLock lock( m_initGuard );
+
+    assert( m_initialized );
+
 //    free( m_config );
 
     xine_close( m_stream );
@@ -140,6 +146,17 @@ Lib::~Lib() {
     //delete m_audioOutput;
 }
 
+void Lib::assertInitialized() const
+{
+    ThreadUtil::AutoLock lock( m_initGuard );
+
+    if ( m_initialized )
+        return;
+
+    qDebug( "LibXine: xine function called while not being initialized, yet! Fix the caller!" );
+    assert( m_initialized );
+}
+
 void Lib::resize ( const QSize &s ) {
     if ( s. width ( ) && s. height ( ) ) {
         ::null_set_gui_width( m_videoOutput,  s. width() );
@@ -166,6 +183,8 @@ int Lib::subVersion() {
 }
 
 int Lib::play( const QString& fileName, int startPos, int start_time ) {
+    assertInitialized();
+
     QString str = fileName.stripWhiteSpace();
     if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) {
         return 0;
@@ -174,49 +193,69 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
 }
 
 void Lib::stop() {
+    assertInitialized();
+
     qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
     xine_stop( m_stream );
 }
 
 void Lib::pause( bool toggle ) {
+    assertInitialized();
+
     xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
 }
 
 int Lib::speed() const {
+    assertInitialized();
+
     return  xine_get_param ( m_stream, XINE_PARAM_SPEED );
 }
 
 void Lib::setSpeed( int speed ) {
+    assertInitialized();
+
     xine_set_param ( m_stream, XINE_PARAM_SPEED, speed );
 }
 
 int Lib::status() const {
+    assertInitialized();
+
     return xine_get_status( m_stream );
 }
 
 int Lib::currentPosition() const {
+    assertInitialized();
+
     int pos, time, length;
     xine_get_pos_length( m_stream, &pos, &time, &length );
     return pos;
 }
 
 int Lib::currentTime() const {
+    assertInitialized();
+
     int pos, time, length;
     xine_get_pos_length( m_stream, &pos, &time, &length );
     return time/1000;
 }
 
 int Lib::length() const {
+    assertInitialized();
+
       int pos, time, length;
       xine_get_pos_length( m_stream, &pos, &time, &length );
       return length/1000;
 }
 
 bool Lib::isSeekable() const {
+    assertInitialized();
+
     return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE );
 }
 
 void Lib::seekTo( int time ) {
+    assertInitialized();
+
     //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 );
@@ -224,15 +263,21 @@ void Lib::seekTo( int time ) {
 
 
 Frame Lib::currentFrame() const {
+    assertInitialized();
+
     Frame frame;
     return frame;
 };
 
 QString Lib::metaInfo( int number) const {
+    assertInitialized();
+
     return xine_get_meta_info( m_stream, number );
 }
 
 int Lib::error() const {
+    assertInitialized();
+
     return xine_get_error( m_stream );
 };
 
@@ -248,6 +293,8 @@ void Lib::handleXineEvent( const xine_event_t* t ) {
 }
 
 void Lib::handleXineEvent( int type ) {
+    assertInitialized();
+
     if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) {
         emit stopped();
     }
@@ -255,37 +302,53 @@ void Lib::handleXineEvent( int type ) {
 
 
 void Lib::setShowVideo( bool video ) {
+    assertInitialized();
+
     m_video = video;
     ::null_set_show_video( m_videoOutput, video );
 }
 
 bool Lib::isShowingVideo() const {
+    assertInitialized();
+
     return ::null_is_showing_video( m_videoOutput );
 }
 
 bool Lib::hasVideo() const {
+    assertInitialized();
+
     return  xine_get_stream_info( m_stream, 18 );
 }
 
 void Lib::showVideoFullScreen( bool fullScreen ) {
+    assertInitialized();
+
     ::null_set_fullscreen( m_videoOutput, fullScreen );
 }
 
 bool Lib::isVideoFullScreen() const {
+    assertInitialized();
+
     return ::null_is_fullscreen( m_videoOutput );
 }
 
 void Lib::setScaling( bool scale ) {
+    assertInitialized();
+
     ::null_set_scaling( m_videoOutput, scale );
 }
 
 void Lib::setGamma( int value ) {
+    assertInitialized();
+
   //qDebug( QString( "%1").arg(value)  );
   /* int gammaValue = ( 100 + value ); */
   ::null_set_videoGamma( m_videoOutput, value );
 }
 
 bool Lib::isScaling() const {
+    assertInitialized();
+
     return ::null_is_scaling( m_videoOutput );
 }
 
@@ -299,6 +362,8 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame,
 }
 
 void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
+    assertInitialized();
+
     if ( !m_video ) {
         qWarning("not showing video now");
         return;
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index d546c99..4b8dc81 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -183,6 +183,11 @@ namespace XINE {
     private:
         void initialize();
 
+        void assertInitialized() const;
+
+        mutable ThreadUtil::Mutex m_initGuard;
+        bool m_initialized : 1;
+
         int m_bytes_per_pixel;
         bool m_video:1;
         XineVideoWidget *m_wid;
--
cgit v0.9.0.2