[vlc-commits] Fix loading of upnp module.

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Fri Feb 25 12:27:07 2011 +0300| [815340f625054f1e9e0b5a6d82cb843fd1cc0886] | committer: Konstantin Pavlov

Fix loading of upnp module.

Also, remove leftover _intel parts here and there.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=815340f625054f1e9e0b5a6d82cb843fd1cc0886
---

 modules/services_discovery/upnp.cpp                |    4 ++--
 .../macosx/framework/Sources/VLCMediaDiscoverer.m  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 366eeb1..e7bd688 100644
--- 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 6d5d75a..2c27380 100644
--- 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];
     }