Rename upnp_intel to upnp

First this is a fork of the old intel code, and then we only have one
upnp module now

diff --git a/configure.ac b/configure.ac
index 9cc2f59ad0816c2410a8f9eeabc71b51b5941d23..beec261ec02a35687bbdc4817db91f4b1ca56b02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3681,8 +3681,8 @@ PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modul
 dnl
 dnl UPnP Plugin (Intel SDK)
 dnl
-PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
-VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}])
+PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto])
+VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}])
 
 dnl
 dnl  Interface plugins

diff --git a/modules/LIST b/modules/LIST
index ccace312aa01444eaa195a7c381355baf761e065..946e97571464c5a3a240f22219629a805ecd6e08 100644 (file)
--- a/modules/LIST
+++ b/modules/LIST
@@ -330,7 +330,7 @@ $Id$
  * ty: TY demuxer
  * udev: udev probing module
  * ugly_resampler: Ugly audio resampler
- * upnp_intel: Intel SDL UPNP discovery
+ * upnp: libupnpn UPNP service discovery
  * v4l2: Video 4 Linux 2 input module
  * vc1: VC-1 Video demuxer
  * vcd: input module for accessing Video CDs

diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am
index 846d112ede40a119d0b55e2aba31c4665bbb97ae..4798d49ffee914ed1c47bd11c63e4f0fa1bfe5ba 100644 (file)
--- a/modules/services_discovery/Modules.am
+++ b/modules/services_discovery/Modules.am
@@ -1,5 +1,5 @@
 SOURCES_sap = sap.c
-SOURCES_upnp_intel = upnp_intel.cpp upnp_intel.hpp
+SOURCES_upnp = upnp.cpp upnp.hpp
 SOURCES_bonjour = bonjour.c
 SOURCES_podcast = podcast.c
 SOURCES_mtp = mtp.c

diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp.cpp
similarity index 99%
rename from modules/services_discovery/upnp_intel.cpp
rename to modules/services_discovery/upnp.cpp
index 894c021a703ead113a58df085fce2d08e7b92cc4..366eeb1d35424c3c8ac0e78f97d6ee7a1683a6eb 100644 (file)
--- a/modules/services_discovery/upnp_intel.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Upnp_intel.cpp :  UPnP discovery module (Intel SDK)
+ * Upnp_intel.cpp :  UPnP discovery module (libupnp)
  *****************************************************************************
  * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include "upnp_intel.hpp"
+#include "upnp.hpp"
 
 #include <vlc_plugin.h>
 #include <vlc_services_discovery.h>

diff --git a/modules/services_discovery/upnp_intel.hpp b/modules/services_discovery/upnp.hpp
similarity index 98%
rename from modules/services_discovery/upnp_intel.hpp
rename to modules/services_discovery/upnp.hpp
index c571e8d97e8d1e76f7653ae05337e5b376756f2d..2b74463e5614be75519646955176bdb73ee8f03e 100644 (file)
--- a/modules/services_discovery/upnp_intel.hpp
+++ b/modules/services_discovery/upnp.hpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Upnp_intel.hpp :  UPnP discovery module (Intel SDK) header
+ * Upnp.hpp :  UPnP discovery module (libupnp) header
  *****************************************************************************
  * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$