Changeset a4bc58cd42ab60b2cafe2fb4e8f35f0c901d5c32

Show
Ignore:
Timestamp:
11/03/05 23:08:23 (3 years ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1131055703 +0000
git-parent:

[bf5d185e39cfe9075716038d4775612fe51f88f7]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1131055703 +0000
Message:

Forward port from revision 13127

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/control/rc.c

    r14bde4f ra4bc58c  
    136136    { 
    137137        vprintf( psz_fmt, args ); 
    138         printf( "\n" ); 
     138        printf( "\r\n" ); 
    139139    } 
    140140    else 
    …… 
    532532    /* status callbacks */ 
    533533    /* Listen to audio volume updates */ 
    534     var_AddCallback( p_intf->p_vlc, "volume", VolumeChanged, p_intf ); 
     534    var_AddCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf ); 
    535535 
    536536#ifdef WIN32 
    …… 
    866866    } 
    867867 
    868     var_DelCallback( p_intf->p_vlc, "volume", VolumeChanged, p_intf ); 
     868    var_DelCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf ); 
    869869} 
    870870 
    …… 
    980980 
    981981    vlc_mutex_lock( &p_intf->p_sys->status_lock ); 
    982     msg_rc( STATUS_CHANGE "( audio volume: %d )", newval.i_int ); 
     982    msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_this, "volume") ); 
    983983    vlc_mutex_unlock( &p_intf->p_sys->status_lock ); 
    984984    return VLC_SUCCESS; 
    …… 
    17001700    intf_thread_t *p_intf = (intf_thread_t*)p_this; 
    17011701    input_thread_t *p_input = NULL; 
    1702     int i_error; 
     1702    int i_error = VLC_EGENERIC; 
    17031703 
    17041704    p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); 

  • src/audio_output/intf.c

    r09161bc ra4bc58c  
    8888{ 
    8989    vlc_value_t val; 
    90     aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, 
    91                                                 FIND_ANYWHERE ); 
     90    aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE ); 
    9291    int i_result = 0; 
    9392 
    …… 
    107106    val.b_bool = VLC_TRUE; 
    108107    var_Set( p_aout, "intf-change", val ); 
     108    var_Set( p_aout->p_vlc, "volume-change", val ); 
     109    vlc_object_release( p_aout ); 
    109110    return i_result; 
    110111} 

  • src/libvlc.c

    r711eb06 ra4bc58c  
    779779    var_Create( p_vlc, "drawableportx", VLC_VAR_INTEGER ); 
    780780    var_Create( p_vlc, "drawableporty", VLC_VAR_INTEGER ); 
     781 
     782    /* Create volume callback system. */ 
     783    var_Create( p_vlc, "volume-change", VLC_VAR_BOOL ); 
    781784 
    782785    /*