From f38e73af8348d8cc1581a71883b6aa2c70778bdf Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Sun, 23 Dec 2007 01:38:20 +0000 Subject: [PATCH] modules/macosx/playlist.m: Remove code that shouldn't be here, to re-enable services discovery. --- modules/gui/macosx/playlist.m | 46 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 241c9ea24b..49d9263f63 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -400,30 +400,28 @@ char *objectname; 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 */ - b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, objectname ); - - /* Create the menu entries used in the playlist menu */ - o_lmi = [[o_mi_services submenu] addItemWithTitle: - [NSString stringWithUTF8String: name] - action: @selector(servicesChange:) - keyEquivalent: @""]; - [o_lmi setTarget: self]; - [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: - [NSString stringWithUTF8String: name] - action: @selector(servicesChange:) - keyEquivalent: @""]; - [o_lmi setTarget: self]; - [o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]]; - if( b_enabled ) [o_lmi setState: NSOnState]; - } + char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i]; + /* 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: + [NSString stringWithUTF8String: name] + action: @selector(servicesChange:) + keyEquivalent: @""]; + [o_lmi setTarget: self]; + [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: + [NSString stringWithUTF8String: name] + action: @selector(servicesChange:) + keyEquivalent: @""]; + [o_lmi setTarget: self]; + [o_lmi setRepresentedObject: [NSString stringWithCString: ppsz_services[i]]]; + if( b_enabled ) [o_lmi setState: NSOnState]; + free( ppsz_services[i] ); free( ppsz_name[i] ); } -- 2.39.2