Changeset e27abe75a1d2017799af345709d0db0bcb172a36

Show
Ignore:
Timestamp:
12/02/03 15:22:23 (6 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1045059743 +0000
git-parent:

[9246efce16bd340d02471e3508dca6806ee10bdd]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1045059743 +0000
Message:

* modules/gui/macosx/controls.m:

  • fixed the mute and volumeup volumedown when you use them mixed.

* src/audio_output/intf.c:

  • set "saved-volume" on volume up, volume down.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/controls.m

    r2d68f9c re27abe7  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: controls.m,v 1.27 2003/02/10 00:41:45 hartman Exp $ 
     5 * $Id: controls.m,v 1.28 2003/02/12 14:22:23 hartman Exp $ 
    66 * 
    77 * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
    …… 
    313313    intf_thread_t * p_intf = [NSApp getIntf]; 
    314314 
     315    if( p_intf->p_sys->b_mute ) 
     316    { 
     317        [self mute: nil]; 
     318    } 
     319 
    315320    aout_VolumeUp( p_intf, 1, NULL ); 
    316321 
     322    [self updateVolumeSlider]; 
     323} 
     324 
     325- (IBAction)volumeDown:(id)sender 
     326{ 
     327    intf_thread_t * p_intf = [NSApp getIntf]; 
     328 
    317329    if( p_intf->p_sys->b_mute ) 
    318330    { 
    319331        [self mute: nil]; 
    320332    } 
    321  
    322     [self updateVolumeSlider]; 
    323 } 
    324  
    325 - (IBAction)volumeDown:(id)sender 
    326 { 
    327     intf_thread_t * p_intf = [NSApp getIntf]; 
    328  
     333     
    329334    aout_VolumeDown( p_intf, 1, NULL ); 
    330  
    331     if( p_intf->p_sys->b_mute ) 
    332     { 
    333         [self mute: nil]; 
    334     } 
    335335 
    336336    [self updateVolumeSlider]; 

  • src/audio_output/intf.c

    rf055f01 re27abe7  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: intf.c,v 1.16 2003/02/09 01:13:43 massiot Exp $ 
     5 * $Id: intf.c,v 1.17 2003/02/12 14:22:23 hartman Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    141141    } 
    142142    config_PutInt( p_object, "volume", i ); 
     143    config_PutInt( p_object, "saved-volume", i ); 
    143144    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; 
    144145 
    …… 
    176177    } 
    177178    config_PutInt( p_object, "volume", i ); 
     179    config_PutInt( p_object, "saved-volume", i ); 
    178180    if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; 
    179181