author | simon <simon> | 2002-12-13 22:57:50 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-13 22:57:50 (UTC) |
commit | 5325a761bb662c7cf6301ed6a03113869ef4c95f (patch) (side-by-side diff) | |
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 @@ -73,6 +73,7 @@ using namespace XINE; Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) { m_initialized = false; + m_duringInitialization = false; m_video = false; m_wid = widget; printf("Lib"); @@ -103,6 +104,7 @@ void Lib::run() void Lib::initialize() { + m_duringInitialization = true; m_xine = xine_new( ); QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; @@ -134,6 +136,7 @@ void Lib::initialize() m_queue = xine_event_new_queue (m_stream); xine_event_create_listener_thread (m_queue, xine_event_handler, this); + m_duringInitialization = false; } Lib::~Lib() { @@ -155,7 +158,7 @@ Lib::~Lib() { } void Lib::resize ( const QSize &s ) { - assert( m_initialized ); + assert( m_initialized || m_duringInitialization ); if ( s. width ( ) && s. height ( ) ) { ::null_set_gui_width( m_videoOutput, s. width() ); 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 @@ -193,6 +193,7 @@ namespace XINE { int m_bytes_per_pixel; bool m_initialized:1; + bool m_duringInitialization:1; bool m_video:1; XineVideoWidget *m_wid; xine_t *m_xine; |