From: Pierre d'Herbemont <pdherbemont@free.fr>
Date: Mon, 15 Feb 2010 15:54:52 +0000 (+0100)
Subject: macosx/framework: shoutcast is gone.
X-Git-Tag: 1.1.0-pre1~925
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e1bdce67e23065d1dd13294c9e7e43d9bcdfacf8;p=vlc

macosx/framework: shoutcast is gone.
---

diff --git a/projects/macosx/framework/Sources/VLCMediaDiscoverer.m b/projects/macosx/framework/Sources/VLCMediaDiscoverer.m
index 74d76e12ff..02b9ce9a20 100644
--- a/projects/macosx/framework/Sources/VLCMediaDiscoverer.m
+++ b/projects/macosx/framework/Sources/VLCMediaDiscoverer.m
@@ -78,9 +78,7 @@ static void HandleMediaDiscovererEnded( const libvlc_event_t * event, void * use
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"sap"] autorelease],
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"upnp_intel"] autorelease],
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"freebox"] autorelease],
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"video_dir"] autorelease],
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcast"] autorelease],
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"shoutcasttv"] autorelease], nil] retain];
+                                [[[VLCMediaDiscoverer alloc] initWithName:@"video_dir"] autorelease], nil] retain];
     }
     return availableMediaDiscoverer;
 }
@@ -93,7 +91,7 @@ static void HandleMediaDiscovererEnded( const libvlc_event_t * event, void * use
         discoveredMedia = nil;
         mdis = libvlc_media_discoverer_new_from_name([VLCLibrary sharedInstance],
                                                      [aServiceName UTF8String]);
-
+        NSAssert(mdis, @"No such media discoverer");
         libvlc_event_manager_t * p_em = libvlc_media_discoverer_event_manager(mdis);
         libvlc_event_attach(p_em, libvlc_MediaDiscovererStarted, HandleMediaDiscovererStarted, self);
         libvlc_event_attach(p_em, libvlc_MediaDiscovererEnded,   HandleMediaDiscovererEnded,   self);