summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-13 23:07:43 (UTC)
committer simon <simon>2002-12-13 23:07:43 (UTC)
commit2e922ec81282a735a04ca1e822329c615b979ebf (patch) (unidiff)
tree742b662eb9d441aec1a12f2d3b531245b934cdb1
parent2e91febca20a3b550d06ba33a4d41b40555a8bbf (diff)
downloadopie-2e922ec81282a735a04ca1e822329c615b979ebf.zip
opie-2e922ec81282a735a04ca1e822329c615b979ebf.tar.gz
opie-2e922ec81282a735a04ca1e822329c615b979ebf.tar.bz2
- fill in some code on the threading side. not activated, yet
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/lib.h2
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp3
3 files changed, 16 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index cef46a1..84194b7 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -101,3 +101,4 @@ void Lib::run()
101{ 101{
102 assert( false ); 102 initialize();
103 m_initialized = true;
103} 104}
@@ -285,2 +286,12 @@ int Lib::error() const {
285 286
287void Lib::ensureInitialized()
288{
289 if ( m_initialized )
290 return;
291
292 qDebug( "waiting for initialization thread to finish" );
293 wait();
294 qDebug( "initialization thread finished!" );
295}
296
286void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ) 297void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 9dd7385..6b67f67 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -179,2 +179,4 @@ namespace XINE {
179 179
180 void ensureInitialized();
181
180 signals: 182 signals:
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 1aa3daa..7c54499 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -47,3 +47,2 @@ XineControl::XineControl( XineVideoWidget *xineWidget,
47{ 47{
48
49 libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget ); 48 libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget );
@@ -58,2 +57,4 @@ XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget,
58{ 57{
58 xine->ensureInitialized();
59
59 init(); 60 init();