From 2765bc39c5c79d6462e30d48fb1f19ae31b602c2 Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Wed, 17 Nov 2010 23:30:29 -0200 Subject: [PATCH] Remove "upnp_" prefix from samples. --- .gitignore | 6 +-- upnp/sample/Makefile.am | 44 +++++++++---------- .../{upnp_tv_combo_main.c => tv_combo_main.c} | 4 +- .../tvcombo/{upnp_tv_ctrlpt.c => tv_ctrlpt.c} | 2 +- .../tvcombo/{upnp_tv_ctrlpt.h => tv_ctrlpt.h} | 0 .../tvcombo/{upnp_tv_device.c => tv_device.c} | 2 +- .../tvcombo/{upnp_tv_device.h => tv_device.h} | 0 ...upnp_tv_ctrlpt_main.c => tv_ctrlpt_main.c} | 2 +- .../{upnp_tv_ctrlpt.c => tv_ctrlpt.c} | 5 +-- .../{upnp_tv_ctrlpt.h => tv_ctrlpt.h} | 0 ...upnp_tv_device_main.c => tv_device_main.c} | 2 +- .../{upnp_tv_device.c => tv_device.c} | 2 +- .../{upnp_tv_device.h => tv_device.h} | 0 13 files changed, 33 insertions(+), 36 deletions(-) rename upnp/sample/tvcombo/linux/{upnp_tv_combo_main.c => tv_combo_main.c} (99%) rename upnp/sample/tvcombo/{upnp_tv_ctrlpt.c => tv_ctrlpt.c} (99%) rename upnp/sample/tvcombo/{upnp_tv_ctrlpt.h => tv_ctrlpt.h} (100%) rename upnp/sample/tvcombo/{upnp_tv_device.c => tv_device.c} (99%) rename upnp/sample/tvcombo/{upnp_tv_device.h => tv_device.h} (100%) rename upnp/sample/tvctrlpt/linux/{upnp_tv_ctrlpt_main.c => tv_ctrlpt_main.c} (99%) rename upnp/sample/tvctrlpt/{upnp_tv_ctrlpt.c => tv_ctrlpt.c} (99%) rename upnp/sample/tvctrlpt/{upnp_tv_ctrlpt.h => tv_ctrlpt.h} (100%) rename upnp/sample/tvdevice/linux/{upnp_tv_device_main.c => tv_device_main.c} (99%) rename upnp/sample/tvdevice/{upnp_tv_device.c => tv_device.c} (99%) rename upnp/sample/tvdevice/{upnp_tv_device.h => tv_device.h} (100%) diff --git a/.gitignore b/.gitignore index 3bc4f3c..5f6547b 100644 --- a/.gitignore +++ b/.gitignore @@ -98,8 +98,8 @@ m4/lt~obsolete.m4 stamp-h1 upnp/inc/stamp-h2 upnp/inc/upnpconfig.h -upnp/sample/upnp_tv_combo -upnp/sample/upnp_tv_ctrlpt -upnp/sample/upnp_tv_device +upnp/sample/tv_combo +upnp/sample/tv_ctrlpt +upnp/sample/tv_device docs/doxygen diff --git a/upnp/sample/Makefile.am b/upnp/sample/Makefile.am index db8063e..baa9eb1 100644 --- a/upnp/sample/Makefile.am +++ b/upnp/sample/Makefile.am @@ -19,21 +19,21 @@ LDADD = \ noinst_PROGRAMS = if ENABLE_SAMPLES if ENABLE_CLIENT -noinst_PROGRAMS += upnp_tv_ctrlpt -upnp_tv_ctrlpt_CPPFLAGS = \ +noinst_PROGRAMS += tv_ctrlpt +tv_ctrlpt_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(srcdir)/common/ \ -I$(srcdir)/tvctrlpt if ENABLE_DEVICE -noinst_PROGRAMS += upnp_tv_combo -upnp_tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \ +noinst_PROGRAMS += tv_combo +tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \ -I$(srcdir)/common/ \ -I$(srcdir)/tvcombo endif endif if ENABLE_DEVICE -noinst_PROGRAMS += upnp_tv_device -upnp_tv_device_CPPFLAGS = \ +noinst_PROGRAMS += tv_device +tv_device_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(srcdir)/common/ \ -I$(srcdir)/tvdevice @@ -41,37 +41,37 @@ endif endif -upnp_tv_device_SOURCES = \ +tv_device_SOURCES = \ common/sample_util.c \ common/sample_util.h \ - tvdevice/upnp_tv_device.c \ - tvdevice/upnp_tv_device.h \ - tvdevice/linux/upnp_tv_device_main.c + tvdevice/tv_device.c \ + tvdevice/tv_device.h \ + tvdevice/linux/tv_device_main.c -upnp_tv_ctrlpt_SOURCES = \ +tv_ctrlpt_SOURCES = \ common/sample_util.c \ common/sample_util.h \ - tvctrlpt/upnp_tv_ctrlpt.c \ - tvctrlpt/upnp_tv_ctrlpt.h \ - tvctrlpt/linux/upnp_tv_ctrlpt_main.c + tvctrlpt/tv_ctrlpt.c \ + tvctrlpt/tv_ctrlpt.h \ + tvctrlpt/linux/tv_ctrlpt_main.c -upnp_tv_combo_SOURCES = \ +tv_combo_SOURCES = \ common/sample_util.c \ common/sample_util.h \ - tvcombo/upnp_tv_ctrlpt.c \ - tvcombo/upnp_tv_ctrlpt.h \ - tvcombo/upnp_tv_device.c \ - tvcombo/upnp_tv_device.h \ - tvcombo/linux/upnp_tv_combo_main.c + tvcombo/tv_ctrlpt.c \ + tvcombo/tv_ctrlpt.h \ + tvcombo/tv_device.c \ + tvcombo/tv_device.h \ + tvcombo/linux/tv_combo_main.c if WITH_DOCUMENTATION examplesdir = $(docdir)/examples examples_DATA = \ $(sort \ - $(upnp_tv_ctrlpt_SOURCES) \ - $(upnp_tv_device_SOURCES)) + $(tv_ctrlpt_SOURCES) \ + $(tv_device_SOURCES)) endif diff --git a/upnp/sample/tvcombo/linux/upnp_tv_combo_main.c b/upnp/sample/tvcombo/linux/tv_combo_main.c similarity index 99% rename from upnp/sample/tvcombo/linux/upnp_tv_combo_main.c rename to upnp/sample/tvcombo/linux/tv_combo_main.c index 6272721..7a2c022 100644 --- a/upnp/sample/tvcombo/linux/upnp_tv_combo_main.c +++ b/upnp/sample/tvcombo/linux/tv_combo_main.c @@ -30,8 +30,8 @@ ******************************************************************************/ #include "sample_util.h" -#include "upnp_tv_ctrlpt.h" -#include "upnp_tv_device.h" +#include "tv_ctrlpt.h" +#include "tv_device.h" #include #include diff --git a/upnp/sample/tvcombo/upnp_tv_ctrlpt.c b/upnp/sample/tvcombo/tv_ctrlpt.c similarity index 99% rename from upnp/sample/tvcombo/upnp_tv_ctrlpt.c rename to upnp/sample/tvcombo/tv_ctrlpt.c index 186f522..f2021e9 100644 --- a/upnp/sample/tvcombo/upnp_tv_ctrlpt.c +++ b/upnp/sample/tvcombo/tv_ctrlpt.c @@ -30,7 +30,7 @@ ******************************************************************************/ -#include "upnp_tv_ctrlpt.h" +#include "tv_ctrlpt.h" #include "upnp.h" diff --git a/upnp/sample/tvcombo/upnp_tv_ctrlpt.h b/upnp/sample/tvcombo/tv_ctrlpt.h similarity index 100% rename from upnp/sample/tvcombo/upnp_tv_ctrlpt.h rename to upnp/sample/tvcombo/tv_ctrlpt.h diff --git a/upnp/sample/tvcombo/upnp_tv_device.c b/upnp/sample/tvcombo/tv_device.c similarity index 99% rename from upnp/sample/tvcombo/upnp_tv_device.c rename to upnp/sample/tvcombo/tv_device.c index 3958eb5..0b3a720 100644 --- a/upnp/sample/tvcombo/upnp_tv_device.c +++ b/upnp/sample/tvcombo/tv_device.c @@ -29,7 +29,7 @@ * ******************************************************************************/ -#include "upnp_tv_device.h" +#include "tv_device.h" #include diff --git a/upnp/sample/tvcombo/upnp_tv_device.h b/upnp/sample/tvcombo/tv_device.h similarity index 100% rename from upnp/sample/tvcombo/upnp_tv_device.h rename to upnp/sample/tvcombo/tv_device.h diff --git a/upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c b/upnp/sample/tvctrlpt/linux/tv_ctrlpt_main.c similarity index 99% rename from upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c rename to upnp/sample/tvctrlpt/linux/tv_ctrlpt_main.c index c5b2652..da5c6ad 100644 --- a/upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c +++ b/upnp/sample/tvctrlpt/linux/tv_ctrlpt_main.c @@ -30,7 +30,7 @@ ******************************************************************************/ #include "sample_util.h" -#include "upnp_tv_ctrlpt.h" +#include "tv_ctrlpt.h" #include #include diff --git a/upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c b/upnp/sample/tvctrlpt/tv_ctrlpt.c similarity index 99% rename from upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c rename to upnp/sample/tvctrlpt/tv_ctrlpt.c index dbc113d..74539c1 100644 --- a/upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c +++ b/upnp/sample/tvctrlpt/tv_ctrlpt.c @@ -29,13 +29,10 @@ * ******************************************************************************/ - -#include "upnp_tv_ctrlpt.h" - +#include "tv_ctrlpt.h" #include "upnp.h" - /*! Mutex for protecting the global device list in a multi-threaded, asynchronous environment. diff --git a/upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h b/upnp/sample/tvctrlpt/tv_ctrlpt.h similarity index 100% rename from upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h rename to upnp/sample/tvctrlpt/tv_ctrlpt.h diff --git a/upnp/sample/tvdevice/linux/upnp_tv_device_main.c b/upnp/sample/tvdevice/linux/tv_device_main.c similarity index 99% rename from upnp/sample/tvdevice/linux/upnp_tv_device_main.c rename to upnp/sample/tvdevice/linux/tv_device_main.c index 7b79855..e1492d3 100644 --- a/upnp/sample/tvdevice/linux/upnp_tv_device_main.c +++ b/upnp/sample/tvdevice/linux/tv_device_main.c @@ -31,7 +31,7 @@ #include "sample_util.h" -#include "upnp_tv_device.h" +#include "tv_device.h" #include diff --git a/upnp/sample/tvdevice/upnp_tv_device.c b/upnp/sample/tvdevice/tv_device.c similarity index 99% rename from upnp/sample/tvdevice/upnp_tv_device.c rename to upnp/sample/tvdevice/tv_device.c index 3655b34..6b3f6f5 100644 --- a/upnp/sample/tvdevice/upnp_tv_device.c +++ b/upnp/sample/tvdevice/tv_device.c @@ -29,7 +29,7 @@ * ******************************************************************************/ -#include "upnp_tv_device.h" +#include "tv_device.h" #include diff --git a/upnp/sample/tvdevice/upnp_tv_device.h b/upnp/sample/tvdevice/tv_device.h similarity index 100% rename from upnp/sample/tvdevice/upnp_tv_device.h rename to upnp/sample/tvdevice/tv_device.h