[vlc-devel] commit: Move libc memcpy module to dummy ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 10 11:27:07 2010 +0200| [90e94ab5dc8bcbaa59d2fb0959ddc191a6f05b2b] | committer: Rémi Denis-Courmont 

Move libc memcpy module to dummy

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

 modules/misc/dummy/dummy.c     |   13 +++++++++++++
 modules/misc/memcpy/Modules.am |    6 ------
 modules/misc/memcpy/memcpy.c   |   16 +++-------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index da746a6..3f61dd9 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -34,6 +34,8 @@
 
 #include "dummy.h"
 
+static int OpenDummy(vlc_object_t *);
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -113,5 +115,16 @@ vlc_module_begin ()
         set_description( N_("Dummy font renderer function") )
         set_capability( "text renderer", 1 )
         set_callbacks( OpenRenderer, NULL )
+    add_submodule ()
+        set_description( N_("libc memcpy") )
+        set_capability( "memcpy", 50 )
+        set_callbacks( OpenDummy, NULL )
+        add_shortcut( "c" )
+        add_shortcut( "libc" )
 vlc_module_end ()
 
+static int OpenDummy( vlc_object_t *obj )
+{
+    (void) obj;
+    return VLC_SUCCESS;
+}
diff --git a/modules/misc/memcpy/Modules.am b/modules/misc/memcpy/Modules.am
index 447495a..0400ffd 100644
--- a/modules/misc/memcpy/Modules.am
+++ b/modules/misc/memcpy/Modules.am
@@ -1,7 +1,3 @@
-SOURCES_memcpy = \
-	memcpy.c \
-	$(NULL)
-
 SOURCES_memcpymmx = \
 	memcpy.c \
 	fastmemcpy.h \
@@ -20,5 +16,3 @@ SOURCES_memcpy3dn = \
 SOURCES_memcpyaltivec = \
 	memcpyaltivec.c \
 	$(NULL)
-
-libvlc_LTLIBRARIES += libmemcpy_plugin.la
diff --git a/modules/misc/memcpy/memcpy.c b/modules/misc/memcpy/memcpy.c
index 6202a9e..08280d1 100644
--- a/modules/misc/memcpy/memcpy.c
+++ b/modules/misc/memcpy/memcpy.c
@@ -49,17 +49,13 @@
 #elif defined( MODULE_NAME_IS_memcpymmxext )
 #   define PRIORITY 200
 #   define HAVE_MMX2
-#else
-#   define PRIORITY 50
 #endif
 
 /*****************************************************************************
  * Extern prototype
  *****************************************************************************/
-#ifndef MODULE_NAME_IS_memcpy
-#   define fast_memcpy fast_memcpy
-#   include "fastmemcpy.h"
-#endif
+#define fast_memcpy fast_memcpy
+#include "fastmemcpy.h"
 
 /*****************************************************************************
  * Module initializer
@@ -67,9 +63,7 @@
 static int Activate ( vlc_object_t *p_this )
 {
     VLC_UNUSED(p_this);
-#ifndef MODULE_NAME_IS_memcpy
     vlc_fastmem_register( fast_memcpy, NULL );
-#endif
 
     return VLC_SUCCESS;
 }
@@ -80,11 +74,7 @@ static int Activate ( vlc_object_t *p_this )
 vlc_module_begin ()
     set_category( CAT_ADVANCED )
     set_subcategory( SUBCAT_ADVANCED_MISC )
-#ifdef MODULE_NAME_IS_memcpy
-    set_description( N_("libc memcpy") )
-    add_shortcut( "c" )
-    add_shortcut( "libc" )
-#elif defined( MODULE_NAME_IS_memcpy3dn )
+#if defined( MODULE_NAME_IS_memcpy3dn )
     set_description( N_("3D Now! memcpy") )
     add_requirement( 3DNOW )
     add_shortcut( "3dn" )