Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index bbc60dd..963e783 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -53,12 +53,17 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla | |||
53 | 53 | ||
54 | volControl = new VolumeControl; | 54 | volControl = new VolumeControl; |
55 | Config cfg( "OpiePlayer" ); | 55 | Config cfg( "OpiePlayer" ); |
56 | cfg.setGroup("PlayList"); | 56 | cfg.setGroup("PlayList"); |
57 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); | 57 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); |
58 | playList.setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() ); | 58 | playList.setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() ); |
59 | |||
60 | m_skinLoader = new SkinLoader; | ||
61 | m_skinLoader->schedule( AudioWidget::guiInfo() ); | ||
62 | m_skinLoader->schedule( VideoWidget::guiInfo() ); | ||
63 | m_skinLoader->start(); | ||
59 | } | 64 | } |
60 | 65 | ||
61 | MediaPlayer::~MediaPlayer() { | 66 | MediaPlayer::~MediaPlayer() { |
62 | delete m_xineControl; | 67 | delete m_xineControl; |
63 | delete m_audioUI; | 68 | delete m_audioUI; |
64 | delete m_videoUI; | 69 | delete m_videoUI; |
@@ -344,12 +349,14 @@ void MediaPlayer::cleanUp() {// this happens on closing | |||
344 | // QPEApplication::grabKeyboard(); | 349 | // QPEApplication::grabKeyboard(); |
345 | // QPEApplication::ungrabKeyboard(); | 350 | // QPEApplication::ungrabKeyboard(); |
346 | } | 351 | } |
347 | 352 | ||
348 | void MediaPlayer::recreateAudioAndVideoWidgets() const | 353 | void MediaPlayer::recreateAudioAndVideoWidgets() const |
349 | { | 354 | { |
355 | delete m_skinLoader; | ||
356 | |||
350 | delete m_xineControl; | 357 | delete m_xineControl; |
351 | delete m_audioUI; | 358 | delete m_audioUI; |
352 | delete m_videoUI; | 359 | delete m_videoUI; |
353 | m_audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" ); | 360 | m_audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" ); |
354 | m_videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); | 361 | m_videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); |
355 | 362 | ||