Changeset 50ca2acdde0d5dc0af99e8b13256563a1ba86416

Show
Ignore:
Timestamp:
05/19/07 22:31:02 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1179606662 +0000
git-parent:

[9270ed7991e903dd83b5b5645e5a40fcd2a1b9e6]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1179606662 +0000
Message:

Make saved-volume variable a per-libvlc instance rather than per-system process variable.
I find the original semantic a bit suspicious, but someone should really double check this commit and revert if needed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/audio_output/intf.c

    r0e39834 r50ca2ac  
    166166    } 
    167167    config_PutInt( p_object, "volume", i_volume ); 
    168     var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER ); 
    169     var_SetInteger( p_object->p_libvlc_global, "saved-volume" , 
     168    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); 
     169    var_SetInteger( p_object->p_libvlc, "saved-volume" , 
    170170                    (audio_volume_t) i_volume ); 
    171171    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume; 
    …… 
    206206    } 
    207207    config_PutInt( p_object, "volume", i_volume ); 
    208     var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER ); 
    209     var_SetInteger( p_object->p_libvlc_global, "saved-volume", (audio_volume_t) i_volume ); 
     208    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); 
     209    var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume ); 
    210210    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume; 
    211211 
    …… 
    239239        /* Mute */ 
    240240        i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN ); 
    241         var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER ); 
    242         var_SetInteger( p_object->p_libvlc_global, "saved-volume", (int)i_volume ); 
     241        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); 
     242        var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume ); 
    243243        if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN; 
    244244    } 
    …… 
    246246    { 
    247247        /* Un-mute */ 
    248         var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER ); 
    249         i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc_global, 
     248        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); 
     249        i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc, 
    250250                                                   "saved-volume" ); 
    251251        i_result = aout_VolumeSet( p_object, i_volume );