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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/xine
From:       Andrew Turner <andrewturner512+kdebugs () googlemail ! com>
Date:       2006-10-16 13:17:55
Message-ID: 1161004675.613715.24458.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 596004 by aturner:

Some more checks to make sure xine_set_param isn't called with a null pointer (i.e. m_stream != 0)


 M  +5 -2      xine-engine.cpp  


--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.cpp #596003:596004
@@ -374,6 +374,9 @@
 void
 XineEngine::pause()
 {
+    if ( !m_stream )
+        return;
+
     if( xine_get_param( m_stream, XINE_PARAM_SPEED ) != XINE_SPEED_PAUSE )
     {
         if( s_fader && s_fader->running() )
@@ -522,7 +525,7 @@
             }
         }
     }
-    if( m_fadeOutRunning )
+    if( m_fadeOutRunning && m_stream )
         xine_set_param( m_stream, XINE_PARAM_AUDIO_AMP_LEVEL, (uint) originalVol );
     m_fadeOutRunning = !m_fadeOutRunning;
 }
@@ -804,7 +807,7 @@
         init();
         setEqualizerEnabled( m_equalizerEnabled );
         if( m_equalizerEnabled )
-                           setEqualizerParameters( m_intPreamp, m_equalizerGains );
+            setEqualizerParameters( m_intPreamp, m_equalizerGains );
         emit resetConfig(m_xine);
     }
 }
[prev in list] [next in list] [prev in thread] [next in thread]