author | simon <simon> | 2002-12-13 22:57:50 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-13 22:57:50 (UTC) |
commit | 5325a761bb662c7cf6301ed6a03113869ef4c95f (patch) (unidiff) | |
tree | bdb521d3e89062f658db729004cedfe9adbf1c49 | |
parent | 739ab075c31b96edf42d2987492cfe950ea1f5e8 (diff) | |
download | opie-5325a761bb662c7cf6301ed6a03113869ef4c95f.zip opie-5325a761bb662c7cf6301ed6a03113869ef4c95f.tar.gz opie-5325a761bb662c7cf6301ed6a03113869ef4c95f.tar.bz2 |
- oops #2
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 040eab3..cef46a1 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -75,2 +75,3 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) | |||
75 | m_initialized = false; | 75 | m_initialized = false; |
76 | m_duringInitialization = false; | ||
76 | m_video = false; | 77 | m_video = false; |
@@ -105,2 +106,3 @@ void Lib::initialize() | |||
105 | { | 106 | { |
107 | m_duringInitialization = true; | ||
106 | m_xine = xine_new( ); | 108 | m_xine = xine_new( ); |
@@ -136,2 +138,3 @@ void Lib::initialize() | |||
136 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); | 138 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); |
139 | m_duringInitialization = false; | ||
137 | } | 140 | } |
@@ -157,3 +160,3 @@ Lib::~Lib() { | |||
157 | void Lib::resize ( const QSize &s ) { | 160 | void Lib::resize ( const QSize &s ) { |
158 | assert( m_initialized ); | 161 | assert( m_initialized || m_duringInitialization ); |
159 | 162 | ||
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 7e3a912..9dd7385 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -195,2 +195,3 @@ namespace XINE { | |||
195 | bool m_initialized:1; | 195 | bool m_initialized:1; |
196 | bool m_duringInitialization:1; | ||
196 | bool m_video:1; | 197 | bool m_video:1; |