Commit 2c15069f authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

macosx: fixed compilation if VLM is not enabled

parent c81134f4
......@@ -106,7 +106,9 @@ struct intf_sys_t
id o_wizard; /* VLCWizard */
id o_extended; /* VLCExtended */
id o_bookmarks; /* VLCBookmarks */
#ifdef ENABLE_VLM
id o_vlm; /* VLCVLMController */
#endif
id o_embedded_list; /* VLCEmbeddedList*/
id o_coredialogs; /* VLCCoreDialogProvider */
VLCInformation * o_info; /* VLCInformation */
......@@ -119,7 +121,9 @@ struct intf_sys_t
BOOL nib_bookmarks_loaded; /* bookmarks nibfile */
BOOL nib_prefs_loaded; /* preferences nibfile */
BOOL nib_info_loaded; /* information panel nibfile */
#ifdef ENABLE_VLM
BOOL nib_vlm_loaded; /* VLM Panel nibfile */
#endif
BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
IBOutlet VLCControllerWindow * o_window; /* main window */
......
......@@ -52,7 +52,9 @@
#import "AppleRemote.h"
#import "eyetv.h"
#import "simple_prefs.h"
#ifdef ENABLE_VLM
#import "vlm.h"
#endif
#import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
#import <IOKit/hidsystem/ev_keymap.h> /* for the media key support */
......@@ -352,7 +354,9 @@ static VLCMain *_o_sharedMainInstance = nil;
o_prefs = nil;
o_open = [[VLCOpen alloc] init];
o_wizard = [[VLCWizard alloc] init];
#ifdef ENABLE_VLM
o_vlm = [[VLCVLMController alloc] init];
#endif
o_extended = nil;
o_bookmarks = [[VLCBookmarks alloc] init];
o_embedded_list = [[VLCEmbeddedList alloc] init];
......@@ -1445,10 +1449,12 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key )
return nil;
}
#ifdef ENABLE_VLM
- (id)vlm
{
return o_vlm;
}
#endif
- (id)bookmarks
{
......@@ -2191,10 +2197,16 @@ end:
- (IBAction)showVLM:(id)sender
{
#ifdef ENABLE_VLM
if( !nib_vlm_loaded )
nib_vlm_loaded = [NSBundle loadNibNamed:@"VLM" owner: NSApp];
[o_vlm showVLMWindow];
#else
NSAlert *theAlert;
theAlert = [NSAlert alertWithMessageText:_NS("VLM not available") defaultButton:_NS("OK") alternateButton:nil otherButton:nil informativeTextWithFormat:_NS("The VideoLAN Manager was not enabled in this version of VLC.")];
[theAlert runModal];
#endif
}
- (IBAction)showExtended:(id)sender
......
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