Changeset 1178

Show
Ignore:
Timestamp:
06/08/09 07:57:49 (4 years ago)
Author:
mauser
Message:

reverted last change in hydrogen.cpp

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/libs/hydrogen/src/hydrogen.cpp

    r1176 r1178  
    704704int audioEngine_process( uint32_t nframes, void* /*arg*/ ) 
    705705{ 
    706  
    707         // Bail out quick if we're not able to process Audio. 
    708         if( ( m_audioEngineState != STATE_READY ) && ( m_audioEngineState != STATE_PLAYING ) ) { 
    709                 return 0; 
    710         } 
    711  
    712         // Bail out quick if someone else has the lock.  
    713         static QString reason("audioEngine_process"); 
    714         if ( AudioEngine::get_instance()->try_lock( reason ) == false ) { 
     706        if ( AudioEngine::get_instance()->try_lock( "audioEngine_process" ) == false ) { 
    715707                return 0; 
    716708        } 
    717  
    718         // Now that we have the mutex locked, do the same check 
    719         // as above and bail out if the state changed. 
    720         if( ( m_audioEngineState != STATE_READY ) && ( m_audioEngineState != STATE_PLAYING ) ) { 
    721                 AudioEngine::get_instance()->unlock(); 
    722                 return 0; 
    723         } 
    724  
    725709 
    726710        timeval startTimeval = currentTime2();