[vlc-commits] Remove modules/misc/dummy/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug  4 14:56:39 2011 +0300| [6c6e9b7f2190a1a5953dbbd2e82e56d2ccd477a8] | committer: Rémi Denis-Courmont

Remove modules/misc/dummy/

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

 configure.ac                             |    1 -
 modules/LIST                             |    1 +
 modules/misc/Modules.am                  |    5 ++++-
 modules/misc/dummy/Modules.am            |    5 -----
 modules/misc/{dummy/dummy.c => memcpy.c} |    4 ++--
 po/POTFILES.in                           |    2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index dd972f2..4980d2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4399,7 +4399,6 @@ AC_CONFIG_FILES([
   modules/lua/Makefile
   modules/meta_engine/Makefile
   modules/misc/Makefile
-  modules/misc/dummy/Makefile
   modules/misc/notify/Makefile
   modules/misc/playlist/Makefile
   modules/misc/osd/Makefile
diff --git a/modules/LIST b/modules/LIST
index 89f101d..ceb7fc0 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -186,6 +186,7 @@ $Id$
  * mash: OpenMash based decoder
  * media_library: a sql based media library
  * mediadirs: Picture/Music/Video user directories as service discoveries
+ * memcpy: default unaccelerated memcpy
  * memcpy3dn: 3D Now! accelerated version of memcpy
  * memcpyaltivec: Altivec accelerated version of memcpy
  * memcpymmx: MMX accelerated version of memcpy
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index c852cc5..9d96c07 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,4 +1,4 @@
-BASE_SUBDIRS = dummy notify playlist stats osd
+BASE_SUBDIRS = notify playlist stats osd
 
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS)
@@ -18,6 +18,9 @@ SOURCES_inhibit = inhibit.c
 SOURCES_sqlite = sqlite.c
 SOURCES_xml = xml/libxml.c
 
+SOURCES_memcpy = memcpy.c
+libvlc_LTLIBRARIES += libmemcpy_plugin.la
+
 libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
 libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
 libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am
deleted file mode 100644
index 7bc7f17..0000000
--- a/modules/misc/dummy/Modules.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES_dummy = \
-	dummy.c \
-	$(NULL)
-
-libvlc_LTLIBRARIES += libdummy_plugin.la
diff --git a/modules/misc/dummy/dummy.c b/modules/misc/memcpy.c
similarity index 95%
rename from modules/misc/dummy/dummy.c
rename to modules/misc/memcpy.c
index a3403b2..6bb9b6a 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/memcpy.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * dummy.c : dummy plugin for vlc
+ * memcpy.c : default memcpy plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 the VideoLAN team
  * $Id$
@@ -38,7 +38,7 @@ static int OpenDummy(vlc_object_t *);
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin ()
-    set_shortname( N_("Dummy"))
+    set_shortname( N_("Dummy") )
     set_description( N_("libc memcpy") )
     set_capability( "memcpy", 50 )
     set_callbacks( OpenDummy, NULL )
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e202d60..3c3561a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -911,13 +911,13 @@ modules/meta_engine/folder.c
 modules/meta_engine/taglib.cpp
 modules/misc/audioscrobbler.c
 modules/misc/dhparams.h
-modules/misc/dummy/dummy.c
 modules/misc/gnutls.c
 modules/misc/inhibit.c
 modules/misc/inhibit/osso.c
 modules/misc/inhibit/xdg.c
 modules/misc/inhibit/xscreensaver.c
 modules/misc/logger.c
+modules/misc/memcpy.c
 modules/misc/notify/growl.m
 modules/misc/notify/growl_udp.c
 modules/misc/notify/msn.c