Skip to content

V
vlc-2-2
Commit f38e73af authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

modules/macosx/playlist.m: Remove code that shouldn't be here, to re-enable services discovery.

parent 4449fe0e
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 24 deletions
modules/gui/macosx/playlist.m
View file @ f38e73af
...@@ -400,30 +400,28 @@ ...@@ -400,30 +400,28 @@
char *objectname; char *objectname;
NSMenuItem *o_lmi; NSMenuItem *o_lmi;
if( !strcmp( ppsz_services[i], "services_discovery" ) ) char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i];
{ /* Check whether to enable these menuitems */
char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i]; b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, objectname );
/* Check whether to enable these menuitems */
b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, objectname ); /* Create the menu entries used in the playlist menu */
o_lmi = [[o_mi_services submenu] addItemWithTitle:
/* Create the menu entries used in the playlist menu */ [NSString stringWithUTF8String: name]
o_lmi = [[o_mi_services submenu] addItemWithTitle: action: @selector(servicesChange:)
[NSString stringWithUTF8String: name] keyEquivalent: @""];
action: @selector(servicesChange:) [o_lmi setTarget: self];
keyEquivalent: @""]; [o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]];
[o_lmi setTarget: self]; if( b_enabled ) [o_lmi setState: NSOnState];
[o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState]; /* Create the menu entries for the main menu */
o_lmi = [[o_mm_mi_services submenu] addItemWithTitle:
/* Create the menu entries for the main menu */ [NSString stringWithUTF8String: name]
o_lmi = [[o_mm_mi_services submenu] addItemWithTitle: action: @selector(servicesChange:)
[NSString stringWithUTF8String: name] keyEquivalent: @""];
action: @selector(servicesChange:) [o_lmi setTarget: self];
keyEquivalent: @""]; [o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]];
[o_lmi setTarget: self]; if( b_enabled ) [o_lmi setState: NSOnState];
[o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState];
}
free( ppsz_services[i] ); free( ppsz_services[i] );
free( ppsz_name[i] ); free( ppsz_name[i] );
} }
......
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