Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show 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 | |||
@@ -6,24 +6,25 @@ | |||
6 | #include <qfileinfo.h> | 6 | #include <qfileinfo.h> |
7 | 7 | ||
8 | #include <qmainwindow.h> | 8 | #include <qmainwindow.h> |
9 | #include <qmessagebox.h> | 9 | #include <qmessagebox.h> |
10 | #include <qwidgetstack.h> | 10 | #include <qwidgetstack.h> |
11 | #include <qfile.h> | 11 | #include <qfile.h> |
12 | 12 | ||
13 | #include "mediaplayer.h" | 13 | #include "mediaplayer.h" |
14 | #include "playlistwidget.h" | 14 | #include "playlistwidget.h" |
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 | ||
21 | // for setBacklight() | 22 | // for setBacklight() |
22 | #include <linux/fb.h> | 23 | #include <linux/fb.h> |
23 | #include <sys/file.h> | 24 | #include <sys/file.h> |
24 | #include <sys/ioctl.h> | 25 | #include <sys/ioctl.h> |
25 | 26 | ||
26 | 27 | ||
27 | 28 | ||
28 | 29 | ||
29 | #define FBIOBLANK 0x4611 | 30 | #define FBIOBLANK 0x4611 |
@@ -361,25 +362,26 @@ void MediaPlayer::recreateAudioAndVideoWidgets() const | |||
361 | m_videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); | 362 | m_videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); |
362 | 363 | ||
363 | connect( m_audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 364 | connect( m_audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
364 | connect( m_audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | 365 | connect( m_audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); |
365 | connect( m_audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | 366 | connect( m_audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); |
366 | connect( m_audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 367 | connect( m_audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
367 | 368 | ||
368 | connect( m_videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 369 | connect( m_videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
369 | connect( m_videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | 370 | connect( m_videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); |
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 | ||
376 | AudioWidget *MediaPlayer::audioUI() const | 378 | AudioWidget *MediaPlayer::audioUI() const |
377 | { | 379 | { |
378 | if ( !m_audioUI ) | 380 | if ( !m_audioUI ) |
379 | recreateAudioAndVideoWidgets(); | 381 | recreateAudioAndVideoWidgets(); |
380 | return m_audioUI; | 382 | return m_audioUI; |
381 | } | 383 | } |
382 | 384 | ||
383 | VideoWidget *MediaPlayer::videoUI() const | 385 | VideoWidget *MediaPlayer::videoUI() const |
384 | { | 386 | { |
385 | if ( !m_videoUI ) | 387 | if ( !m_videoUI ) |