summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/lib.h1
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
@@ -74,4 +74,5 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
74{ 74{
75 m_initialized = false; 75 m_initialized = false;
76 m_duringInitialization = false;
76 m_video = false; 77 m_video = false;
77 m_wid = widget; 78 m_wid = widget;
@@ -104,4 +105,5 @@ void Lib::run()
104void Lib::initialize() 105void Lib::initialize()
105{ 106{
107 m_duringInitialization = true;
106 m_xine = xine_new( ); 108 m_xine = xine_new( );
107 109
@@ -135,4 +137,5 @@ void Lib::initialize()
135 137
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}
138 141
@@ -156,5 +159,5 @@ Lib::~Lib() {
156 159
157void Lib::resize ( const QSize &s ) { 160void Lib::resize ( const QSize &s ) {
158 assert( m_initialized ); 161 assert( m_initialized || m_duringInitialization );
159 162
160 if ( s. width ( ) && s. height ( ) ) { 163 if ( s. width ( ) && s. height ( ) ) {
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
@@ -194,4 +194,5 @@ namespace XINE {
194 int m_bytes_per_pixel; 194 int m_bytes_per_pixel;
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;
197 XineVideoWidget *m_wid; 198 XineVideoWidget *m_wid;