summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-13 22:57:50 (UTC)
committer simon <simon>2002-12-13 22:57:50 (UTC)
commit5325a761bb662c7cf6301ed6a03113869ef4c95f (patch) (unidiff)
treebdb521d3e89062f658db729004cedfe9adbf1c49
parent739ab075c31b96edf42d2987492cfe950ea1f5e8 (diff)
downloadopie-5325a761bb662c7cf6301ed6a03113869ef4c95f.zip
opie-5325a761bb662c7cf6301ed6a03113869ef4c95f.tar.gz
opie-5325a761bb662c7cf6301ed6a03113869ef4c95f.tar.bz2
- oops #2
Diffstat (more/less context) (ignore 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
@@ -72,8 +72,9 @@ using namespace XINE;
72 72
73Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) 73Lib::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;
78 printf("Lib"); 79 printf("Lib");
79 QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; 80 QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
@@ -102,8 +103,9 @@ void Lib::run()
102} 103}
103 104
104void Lib::initialize() 105void Lib::initialize()
105{ 106{
107 m_duringInitialization = true;
106 m_xine = xine_new( ); 108 m_xine = xine_new( );
107 109
108 QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; 110 QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
109 xine_config_load( m_xine, QFile::encodeName( configPath ) ); 111 xine_config_load( m_xine, QFile::encodeName( configPath ) );
@@ -133,8 +135,9 @@ void Lib::initialize()
133 135
134 m_queue = xine_event_new_queue (m_stream); 136 m_queue = xine_event_new_queue (m_stream);
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
139Lib::~Lib() { 142Lib::~Lib() {
140 assert( isRunning() == false ); 143 assert( isRunning() == false );
@@ -154,9 +157,9 @@ Lib::~Lib() {
154 //delete m_audioOutput; 157 //delete m_audioOutput;
155} 158}
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 ( ) ) {
161 ::null_set_gui_width( m_videoOutput, s. width() ); 164 ::null_set_gui_width( m_videoOutput, s. width() );
162 ::null_set_gui_height( m_videoOutput, s. height() ); 165 ::null_set_gui_height( m_videoOutput, 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
@@ -192,8 +192,9 @@ namespace XINE {
192 void initialize(); 192 void initialize();
193 193
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;
198 xine_t *m_xine; 199 xine_t *m_xine;
199 xine_stream_t *m_stream; 200 xine_stream_t *m_stream;