Changeset 8955d66081a98bc43bf9d0e85f9973174ee7b773

Show
Ignore:
Timestamp:
04/25/08 11:31:40 (4 months ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1209115900 +0200
git-parent:

[50ce52514c1bc2d4a38b3836fa80c47cfb48a2b5]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1209115884 +0200
Message:

Compilation fix related to the recent threading simplifications. Needs additional testing.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/audio_output/auhal.c

    r449fd28 r8955d66  
    222222    { 
    223223        /* Be tolerant, only give a warning here */ 
    224         msg_Warn( p_aout, "could not check whether device [0x%x] is alive: %4.4s", p_sys->i_selected_dev, (char *)&err ); 
     224        msg_Warn( p_aout, "could not check whether device [0x%x] is alive: %4.4s", (unsigned int)p_sys->i_selected_dev, (char *)&err ); 
    225225        b_alive = false; 
    226226    } 
    …… 
    12361236        timeout.tv_nsec = (now.tv_usec + 500000) * 1000; 
    12371237 
    1238         if( pthread_cond_timedwait( &w.cond.cond, &w.lock.mutex, &timeout ) ) 
     1238        if( pthread_cond_timedwait( &w.cond, &w.lock, &timeout ) ) 
    12391239        { 
    12401240            msg_Dbg( p_aout, "reached timeout" );