Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 27 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 10 |
5 files changed, 12 insertions, 35 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 74ab2e3..68bbae9 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -163,7 +163,7 @@ void MediaPlayer::next() { } else { //if playing from file list, let's just stop qDebug("<<<<<<<<<<<<<<<<<stop for filelists"); mediaPlayerState->setPlaying(false); - mediaPlayerState->setView('l'); + mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); if(l) mediaPlayerState->setLooping(l); if(r) mediaPlayerState->setShuffled(r); } diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 901b43f..40fa1a4 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp @@ -85,18 +85,6 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { cfg.writeEntry( "VideoGamma", videoGamma ); } -char MediaPlayerState::view() const -{ - switch ( m_displayType ) { - case Audio: return 'a'; - case Video: return 'v'; - case MediaSelection: return 'l'; - default: assert( false ); - } - // never reached - return 42; -} - MediaPlayerState::DisplayType MediaPlayerState::displayType() const { return m_displayType; @@ -214,15 +202,6 @@ void MediaPlayerState::setLength( long l ) { emit lengthChanged(l); } -void MediaPlayerState::setView( char v ) { - switch ( v ) { - case 'a': setDisplayType( Audio ); return; - case 'v': setDisplayType( Video ); return; - case 'l': setDisplayType( MediaSelection ); return; - default: assert( false ); - } -} - void MediaPlayerState::setDisplayType( DisplayType displayType ) { if ( m_displayType == displayType ) @@ -242,15 +221,15 @@ void MediaPlayerState::setNext() { void MediaPlayerState::setList() { setPlaying( FALSE ); - setView('l'); + setDisplayType( MediaSelection ); } void MediaPlayerState::setVideo() { - setView('v'); + setDisplayType( Video ); } void MediaPlayerState::setAudio() { - setView('a'); + setDisplayType( Audio ); } void MediaPlayerState::toggleFullscreen() { diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index b18780b..c887bb8 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h @@ -63,7 +63,6 @@ public: bool isStopped() const { return stopped; } long position() const { return curPosition; } long length() const { return curLength; } - char view() const; DisplayType displayType() const; public slots: @@ -79,7 +78,6 @@ public slots: void setPosition( long p ); void updatePosition( long p ); void setLength( long l ); - void setView( char v ); void setDisplayType( MediaPlayerState::DisplayType displayType ); void setBlanked( bool b ); void setVideoGamma( int v ); diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index db7c979..8be7a2f 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp @@ -221,8 +221,8 @@ void PlayListWidgetGui::setView( char view ) { void PlayListWidgetGui::setActiveWindow() { // qDebug("SETTING active window"); // When we get raised we need to ensure that it switches views - char origView = mediaPlayerState->view(); - mediaPlayerState->setView( 'l' ); // invalidate - mediaPlayerState->setView( origView ); // now switch back + MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType(); + mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); // invalidate + mediaPlayerState->setDisplayType( origDisplayType ); // now switch back } diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 71e08a6..e7d5a7b 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -85,15 +85,15 @@ void XineControl::play( const QString& fileName ) { } mediaPlayerState->setPlaying( true ); - char whichGui; + MediaPlayerState::DisplayType displayType; // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) ); if ( !libXine->hasVideo() ) { - whichGui = 'a'; + displayType = MediaPlayerState::Audio; qDebug("HAS AUDIO"); libXine->setShowVideo( false ); hasAudioChannel = TRUE; } else { - whichGui = 'v'; + displayType = MediaPlayerState::Video; qDebug("HAS VIDEO"); libXine->setShowVideo( true ); hasVideoChannel = TRUE; @@ -102,14 +102,14 @@ void XineControl::play( const QString& fileName ) { mediaPlayerState->setIsSeekable( libXine->isSeekable() ); // which gui (video / audio) - mediaPlayerState->setView( whichGui ); + mediaPlayerState->setDisplayType( displayType ); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) if ( !disabledSuspendScreenSaver ) { disabledSuspendScreenSaver = TRUE; // Stop the screen from blanking and power saving state QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) - << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend ); + << ( displayType == MediaPlayerState::Video ? QPEApplication::Disable : QPEApplication::DisableSuspend ); } #endif |