summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/mediaplayer.cpp
authorsimon <simon>2002-12-13 23:15:53 (UTC)
committer simon <simon>2002-12-13 23:15:53 (UTC)
commit1830ae3069a3ca35df678ce6d1700bf31d968a5c (patch) (unidiff)
tree45b5b64e3370f491c701e0f9e6128edccc6c0496 /noncore/multimedia/opieplayer2/mediaplayer.cpp
parent5e7ea7ebd8175993f951731e371b4e3609df654b (diff)
downloadopie-1830ae3069a3ca35df678ce6d1700bf31d968a5c.zip
opie-1830ae3069a3ca35df678ce6d1700bf31d968a5c.tar.gz
opie-1830ae3069a3ca35df678ce6d1700bf31d968a5c.tar.bz2
- allow delayed assignment of the widget on the XINE::Lib object
- make use of that API in XineControl and MediaPlayer
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 963e783..d6fbb53 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -15,6 +15,7 @@
15#include "audiowidget.h" 15#include "audiowidget.h"
16#include "videowidget.h" 16#include "videowidget.h"
17#include "volumecontrol.h" 17#include "volumecontrol.h"
18#include "lib.h"
18 19
19#include "mediaplayerstate.h" 20#include "mediaplayerstate.h"
20 21
@@ -370,7 +371,8 @@ void MediaPlayer::recreateAudioAndVideoWidgets() const
370 connect( m_videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 371 connect( m_videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
371 connect( m_videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 372 connect( m_videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
372 373
373 m_xineControl = new XineControl( m_videoUI->vidWidget(), mediaPlayerState ); 374 XINE::Lib *xine = new XINE::Lib( XINE::Lib::InitializeImmediately );
375 m_xineControl = new XineControl( xine, m_videoUI->vidWidget(), mediaPlayerState );
374} 376}
375 377
376AudioWidget *MediaPlayer::audioUI() const 378AudioWidget *MediaPlayer::audioUI() const