- completed MediaPlayer::DisplayType transition

1 files changed, 3 insertions, 24 deletions

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
@@ -87,14 +87,2 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
 
-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
@@ -216,11 +204,2 @@ void MediaPlayerState::setLength( long 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 )
@@ -244,3 +223,3 @@ void MediaPlayerState::setList() {
     setPlaying( FALSE );
-    setView('l');
+    setDisplayType( MediaSelection );
 }
@@ -248,3 +227,3 @@ void MediaPlayerState::setList() {
 void MediaPlayerState::setVideo() {
-    setView('v');
+    setDisplayType( Video );
 }
@@ -252,3 +231,3 @@ void MediaPlayerState::setVideo() {
 void MediaPlayerState::setAudio() {
-    setView('a');
+    setDisplayType( Audio );
 }