Commit f0e843fd authored by hartman's avatar hartman

* New icon for the playlist

* Fixed the mute hotkey
* Fixed the positioning of some elements and removed the stupid black box
* Added speex and flac encoders to sout dialog
parent d4717442
......@@ -19,9 +19,9 @@
<array/>
<key>IBOpenObjects</key>
<array>
<integer>21</integer>
<integer>1617</integer>
<integer>1647</integer>
<integer>21</integer>
</array>
<key>IBSystem Version</key>
<string>7C107</string>
......
......@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.h,v 1.49 2003/11/15 22:42:16 hartman Exp $
* $Id: intf.h,v 1.50 2003/12/11 16:00:09 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -93,7 +93,7 @@ struct intf_sys_t
id o_prefs; /* VLCPrefs */
IBOutlet id o_window; /* main window */
IBOutlet id o_infofield; /* info field */
IBOutlet id o_scrollfield; /* info field */
IBOutlet id o_timefield; /* time field */
IBOutlet id o_timeslider; /* time slider */
float f_slider; /* slider value */
......
......@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.103 2003/11/22 06:26:16 titer Exp $
* $Id: intf.m,v 1.104 2003/12/11 16:00:09 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -374,7 +374,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
- (void)awakeFromNib
{
unsigned int i_key;
unsigned int i_key = 0;
intf_thread_t * p_intf = [NSApp getIntf];
[self initStrings];
......@@ -415,6 +415,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
i_key = config_GetInt( p_intf, "key-vol-down" );
[o_mi_vol_down setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_vol_down setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-vol-mute" );
[o_mi_mute setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_mute setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-fullscreen" );
[o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
......
......@@ -2,7 +2,7 @@
* output.m: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: output.m,v 1.16 2003/11/06 18:35:19 hartman Exp $
* $Id: output.m,v 1.17 2003/12/11 16:00:09 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -119,7 +119,7 @@
@"128", @"192", @"256", @"512", nil];
NSArray *o_v_bitrates = [NSArray arrayWithObjects: @"16", @"32", @"64", @"96",
@"128", @"192", @"256", @"384", @"512", @"768", @"1024", @"2048", @"3072", nil];
NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"a52 ", @"vorb", nil];
NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"a52 ", @"vorb", @"flac", @"spx ", nil];
NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1",
@"DIV2", @"DIV3", @"H263", @"I263", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment