author | simon <simon> | 2002-12-13 23:15:53 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-13 23:15:53 (UTC) |
commit | 1830ae3069a3ca35df678ce6d1700bf31d968a5c (patch) (side-by-side diff) | |
tree | 45b5b64e3370f491c701e0f9e6128edccc6c0496 /noncore/multimedia/opieplayer2/mediaplayer.cpp | |
parent | 5e7ea7ebd8175993f951731e371b4e3609df654b (diff) | |
download | opie-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) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 4 |
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 @@ -12,12 +12,13 @@ #include "mediaplayer.h" #include "playlistwidget.h" #include "audiowidget.h" #include "videowidget.h" #include "volumecontrol.h" +#include "lib.h" #include "mediaplayerstate.h" // for setBacklight() #include <linux/fb.h> #include <sys/file.h> @@ -367,13 +368,14 @@ void MediaPlayer::recreateAudioAndVideoWidgets() const connect( m_videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); connect( m_videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); connect( m_videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); connect( m_videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); - m_xineControl = new XineControl( m_videoUI->vidWidget(), mediaPlayerState ); + XINE::Lib *xine = new XINE::Lib( XINE::Lib::InitializeImmediately ); + m_xineControl = new XineControl( xine, m_videoUI->vidWidget(), mediaPlayerState ); } AudioWidget *MediaPlayer::audioUI() const { if ( !m_audioUI ) recreateAudioAndVideoWidgets(); |