* 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

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 8ba9a791479d44d490d3a77237a9b591ca7a4048..9a2a5c4aa166df73878f09abcc20515e14d14cd0 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -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>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index eed8ce16c915bbdad4305d6a3b5ba7dc24f3d3f6..2a7cfe8d9c12bc546c0ac822bbf1729189b7e638 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/extras/MacOSX/Resources/playlistdrawer_active.png b/extras/MacOSX/Resources/playlistdrawer_active.png
index bca5b303f3607158f3a3d892766d176a89d3050f..f5c0629054e643baa3d7a66fee60ca7064467cc2 100644 (file)
Binary files a/extras/MacOSX/Resources/playlistdrawer_active.png and b/extras/MacOSX/Resources/playlistdrawer_active.png differ

diff --git a/extras/MacOSX/Resources/playlistdrawer_blue.png b/extras/MacOSX/Resources/playlistdrawer_blue.png
index 9e8bb175832aa199d00f3fe21bf515394d8621bd..5d90ca187f85e79953da99b86bf3902aebb44492 100644 (file)
Binary files a/extras/MacOSX/Resources/playlistdrawer_blue.png and b/extras/MacOSX/Resources/playlistdrawer_blue.png differ

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 56d8d87c946bdc6898b48547f9463a00675160f8..5e56821560fa23f14620c44e81cae278519a74cd 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -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   */

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 2504c076e4b2b0047fb7103e098907eb4724c714..ebd7e9911c623fe30b1cf189e6c475b3cc51ba22 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -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)];

diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index 7b92270e23c112b7360d4379ced74501b10d28c6..c0469c2c2fb2fa721f102378a1e08ede9b36ede0 100644 (file)
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -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];