[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/phonon
From:       Mark Kretschmann <markey () web ! de>
Date:       2007-05-06 7:21:10
Message-ID: 1178436070.840142.24735.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 661633 by markey:

Remove unnecessary checks for m_mediaObject pointer nullness. The pointer can never become 0 at runtime.


 M  +17 -46    phonon-engine.cpp  


--- trunk/extragear/multimedia/amarok/src/engine/phonon/phonon-engine.cpp #661632:661633
@@ -66,7 +66,7 @@
     m_mediaObject->addAudioPath( m_audioPath );
     m_audioPath->addOutput( m_audioOutput );
 
-    //connect( m_mediaObject, SIGNAL( finished() ), SLOT( trackEnded() ) );
+    connect( m_mediaObject, SIGNAL( finished() ), SIGNAL( trackEnded() ) );
     //connect( m_mediaObject, SIGNAL( length(qint64)), SLOT( length() ) );
 
     return true;
@@ -77,67 +77,42 @@
 {
     DEBUG_BLOCK
 
-    if( Engine::Base::load( url, isStream ) )
-    {
-        m_mediaObject->setCurrentSource( url );
-        return true;
-    }
+    Engine::Base::load( url, isStream );
+    m_mediaObject->setCurrentSource( url );
 
-    debug() << "Could not load file " << url.prettyUrl() << endl;
-//     m_mediaObject->setUrl( KUrl() );
-    return false;
+    return true;
 }
 
-
 bool
 PhononEngine::play( uint offset )
 {
     DEBUG_BLOCK
 
-    if( m_mediaObject )
-    {
-        m_mediaObject->play();
+    m_mediaObject->play();
+    emit stateChanged( Engine::Playing );
 
-        connect( m_mediaObject, SIGNAL( finished() ), SIGNAL( trackEnded() ) );
-
-        emit stateChanged( Engine::Playing );
-        return true;
-    }
-
-    debug() << "Could not play file " << m_mediaObject->currentSource().url() << endl;
-    emit stateChanged( Engine::Empty );
-
-    return false;
+    return true;
 }
 
 void
 PhononEngine::stop()
 {
-    if( m_mediaObject )
-    {
-        m_mediaObject->stop();
-        emit stateChanged( Engine::Empty );
-    }
+    m_mediaObject->stop();
+    emit stateChanged( Engine::Empty );
 }
 
 void
 PhononEngine::pause()
 {
-    if( m_mediaObject )
-    {
-        m_mediaObject->pause();
-        emit stateChanged( Engine::Paused );
-    }
+    m_mediaObject->pause();
+    emit stateChanged( Engine::Paused );
 }
 
 void
 PhononEngine::unpause()
 {
-    if( m_mediaObject )
-    {
-        m_mediaObject->play();
-        emit stateChanged( Engine::Playing );
-    }
+    m_mediaObject->play();
+    emit stateChanged( Engine::Playing );
 }
 
 Engine::State
@@ -183,7 +158,7 @@
 uint
 PhononEngine::position() const
 {
-    if( state() != Engine::Empty && m_mediaObject )
+    if( state() != Engine::Empty )
         return m_mediaObject->currentTime();
 
     return 0;
@@ -203,18 +178,14 @@
 void
 PhononEngine::seek( uint ms )
 {
-    if( m_mediaObject )
-        m_mediaObject->seek( ms );
+    m_mediaObject->seek( ms );
 }
 
 void
 PhononEngine::setVolumeSW( uint volume )
 {
-    if( m_audioOutput )
-    {
-        const float v = volume * 0.01;
-        m_audioOutput->setVolume( v );
-    }
+    const float v = volume * 0.01;
+    m_audioOutput->setVolume( v );
 }
 
 bool
[prev in list] [next in list] [prev in thread] [next in thread]