Fix loading of upnp module.

Also, remove leftover _intel parts here and there.

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 366eeb1d35424c3c8ac0e78f97d6ee7a1683a6eb..e7bd68897b6fd83a354f025f865e20582564bd1e 100644 (file)
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Upnp_intel.cpp :  UPnP discovery module (libupnp)
+ * Upnp.cpp :  UPnP discovery module (libupnp)
  *****************************************************************************
  * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
@@ -55,7 +55,7 @@ struct services_discovery_sys_t
 // VLC callback prototypes
 static int Open( vlc_object_t* );
 static void Close( vlc_object_t* );
-VLC_SD_PROBE_HELPER("upnp_intel", "Universal Plug'n'Play", SD_CAT_LAN)
+VLC_SD_PROBE_HELPER("upnp", "Universal Plug'n'Play", SD_CAT_LAN)
 
 // Module descriptor
 

diff --git a/projects/macosx/framework/Sources/VLCMediaDiscoverer.m b/projects/macosx/framework/Sources/VLCMediaDiscoverer.m
index 6d5d75a4dd491294bee1e70d5167d73f9727da24..2c273805805f167d05e512a255eaabc502241e48 100644 (file)
--- a/projects/macosx/framework/Sources/VLCMediaDiscoverer.m
+++ b/projects/macosx/framework/Sources/VLCMediaDiscoverer.m
@@ -75,7 +75,7 @@ static void HandleMediaDiscovererEnded( const libvlc_event_t * event, void * use
     {
         availableMediaDiscoverer = [[NSArray arrayWithObjects:
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"sap"] autorelease],
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"upnp_intel"] autorelease],
+                                [[[VLCMediaDiscoverer alloc] initWithName:@"upnp"] autorelease],
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"freebox"] autorelease],
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"video_dir"] autorelease], nil] retain];
     }