Remove modules/misc/dummy/

diff --git a/configure.ac b/configure.ac
index dd972f28c5b4f055e02cea5017a2e82e3bdac013..4980d2ebec66e31abdb8c222bfeaaeb7ed992eff 100644 (file)
--- 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 89f101d3dc4a6e3666ea8e70cffc173c5027b3a6..ceb7fc04e4f00d36ab00a8e064988656f156d64f 100644 (file)
--- 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 c852cc54d2d2a133d99a2d2efea0851826abf737..9d96c07a4770702ccd3a5acf89842b64b9ac9e43 100644 (file)
--- 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 (file)
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 a3403b2f04ae73d6751ab2d6ae05cc2ad8eb2563..6bb9b6a08f32b91df0a362c3a69bf7ff4e06ff7a 100644 (file)
--- 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 e202d6076237975264b8c79de2cc6c209c347771..3c3561a8f1e55026ca99cc737926bb66af2a7ce9 100644 (file)
--- 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