Changeset 5df4f82a48567b78a3c2a9ac9cb679d50e5351dc

Show
Ignore:
Timestamp:
19/03/08 13:45:18 (7 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1205930718 +0100
git-parent:

[4082c803f778e903ae0b1dc9afaf3ad86fddbd69]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1205930718 +0100
Message:

auhal: Fix kAudioDevicePropertyDeviceIsAlive check (vlc_bool_t size has changed and doesn't match anymore the needed param size for kAudioDevicePropertyDeviceIsAlive).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/audio_output/auhal.c

    r4082c80 r5df4f82  
    153153    UInt32                  i_param_size = 0; 
    154154    struct aout_sys_t       *p_sys = NULL; 
    155     vlc_bool_t              b_alive = VLC_FALSE; 
    156155    vlc_value_t             val; 
    157156    aout_instance_t         *p_aout = (aout_instance_t *)p_this; 
     157 
     158    /* Use int here, to match kAudioDevicePropertyDeviceIsAlive 
     159     * property size */ 
     160    int                     b_alive = VLC_FALSE;  
    158161 
    159162    /* Allocate structure */ 
    …… 
    218221    if( err != noErr ) 
    219222    { 
    220         msg_Err( p_aout, "could not check whether device is alive: %4.4s", (char *)&err ); 
    221         goto error; 
     223        /* 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 ); 
     225        b_alive = VLC_FALSE; 
    222226    } 
    223227