Commit cba9544f authored by Christophe Massiot's avatar Christophe Massiot

MacOS X port :

* Fixed the Device submenu,
* There is still a segfault in darwin_specific.m.
parent 72610fff
......@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: intf.h,v 1.7 2003/01/01 11:14:50 jlj Exp $
* $Id: intf.h,v 1.8 2003/01/02 23:09:30 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -178,8 +178,6 @@ struct intf_sys_t
- (IBAction)viewPreferences:(id)sender;
- (id)getMIDevice;
@end
@interface VLCMain (Internal)
......
......@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: intf.m,v 1.14 2003/01/01 11:14:50 jlj Exp $
* $Id: intf.m,v 1.15 2003/01/02 23:09:30 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -225,6 +225,7 @@ static void Run( intf_thread_t *p_intf )
[o_mi_vol_down setTitle: _NS("Softer")];
[o_mi_mute setTitle: _NS("Mute")];
[o_mi_channels setTitle: _NS("Channels")];
[o_mi_device setTitle: _NS("Device")];
[o_mi_fullscreen setTitle: _NS("Fullscreen")];
[o_mi_screen setTitle: _NS("Screen")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
......@@ -519,6 +520,7 @@ static void Run( intf_thread_t *p_intf )
[o_mi_language setEnabled: FALSE];
[o_mi_subtitle setEnabled: FALSE];
[o_mi_channels setEnabled: FALSE];
[o_mi_device setEnabled: FALSE];
[o_mi_screen setEnabled: FALSE];
}
......@@ -736,6 +738,9 @@ static void Run( intf_thread_t *p_intf )
[self setupVarMenu: o_mi_channels target: (vlc_object_t *)p_aout
var: "audio-channels" selector: @selector(toggleVar:)];
[self setupVarMenu: o_mi_device target: (vlc_object_t *)p_aout
var: "audio-device" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_aout );
}
......@@ -913,11 +918,6 @@ static void Run( intf_thread_t *p_intf )
[o_prefs createPrefPanel: @"main"];
}
- (id)getMIDevice
{
return o_mi_device;
}
@end
@implementation VLCMain (NSMenuValidation)
......
......@@ -2,7 +2,7 @@
* darwin_specific.m: Darwin specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: darwin_specific.m,v 1.3 2003/01/01 11:14:50 jlj Exp $
* $Id: darwin_specific.m,v 1.4 2003/01/02 23:09:30 massiot Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -138,10 +138,10 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
}
}
[o_lang release];
// [o_lang release];
}
[o_languages release];
// [o_defs release];
[o_pool release];
}
}
......
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