From 09fde6123c6d6b4ad18bcec1721ca88975cade7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Thu, 4 Aug 2011 13:49:09 +0300
Subject: [PATCH] Move and split dummy input
---
modules/LIST | 1 +
modules/access/Modules.am | 6 ++++++
.../{misc/dummy/input.c => access/idummy.c} | 18 ++++++++++++++----
modules/misc/dummy/Modules.am | 1 -
modules/misc/dummy/dummy.c | 5 -----
modules/misc/dummy/dummy.h | 3 ---
po/POTFILES.in | 2 +-
7 files changed, 22 insertions(+), 14 deletions(-)
rename modules/{misc/dummy/input.c => access/idummy.c} (92%)
diff --git a/modules/LIST b/modules/LIST
index e857fa403624..8c1e71d3c240 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -160,6 +160,7 @@ $Id$
* i422_yuy2: planar 4:2:2 YUV to packed YUV conversion functions
* i422_yuy2_mmx: MMX accelerated version of i422_yuy2
* i422_yuy2_sse2: sse2 accelerated version of i422_yuy2
+ * idummy: dummy input
* image: Image file video output
* inhibit: preventing the computer from suspending
* invert: inverse video filter
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 3183db7f21bb..0aa8d8b0f270 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -21,6 +21,11 @@ libfilesystem_plugin_la_CFLAGS = $(AM_CFLAGS)
libfilesystem_plugin_la_LIBADD = $(AM_LIBADD)
libfilesystem_plugin_la_DEPENDENCIES =
+libidummy_plugin_la_SOURCES = idummy.c
+libidummy_plugin_la_CFLAGS = $(AM_CFLAGS)
+libidummy_plugin_la_LIBADD = $(AM_LIBADD)
+libidummy_plugin_la_DEPENDENCIES =
+
libsdp_plugin_la_SOURCES = sdp.c
libsdp_plugin_la_CFLAGS = $(AM_CFLAGS)
libsdp_plugin_la_LIBADD = $(AM_LIBADD)
@@ -80,6 +85,7 @@ libaccess_rtmp_plugin_la_DEPENDENCIES =
libvlc_LTLIBRARIES += \
libfilesystem_plugin.la \
+ libidummy_plugin.la \
libaccess_udp_plugin.la \
libaccess_tcp_plugin.la \
libaccess_http_plugin.la \
diff --git a/modules/misc/dummy/input.c b/modules/access/idummy.c
similarity index 92%
rename from modules/misc/dummy/input.c
rename to modules/access/idummy.c
index 31b3c5162041..51f2692fb4b9 100644
--- a/modules/misc/dummy/input.c
+++ b/modules/access/idummy.c
@@ -1,5 +1,5 @@
/*****************************************************************************
- * input_dummy.c: dummy input plugin, to manage "vlc://" special options
+ * idummy.c: dummy input plugin, to manage "vlc://" special options
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* $Id$
@@ -30,11 +30,21 @@
#endif
#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_demux.h>
#include <vlc_charset.h>
-#include "dummy.h"
+static int OpenDemux( vlc_object_t * );
+static void CloseDemux( vlc_object_t * );
+
+vlc_module_begin ()
+ set_shortname( N_("Dummy") )
+ set_description( N_("Dummy input") )
+ set_capability( "access_demux", 0 )
+ set_callbacks( OpenDemux, CloseDemux )
+ add_shortcut( "dummy", "vlc" )
+vlc_module_end ()
static int DemuxControl( demux_t *, int, va_list );
@@ -129,7 +139,7 @@ static int ControlPause( demux_t *demux, int query, va_list args )
/*****************************************************************************
* OpenDemux: initialize the target, ie. parse the command
*****************************************************************************/
-int OpenDemux ( vlc_object_t *p_this )
+static int OpenDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
char * psz_name = p_demux->psz_location;
@@ -195,7 +205,7 @@ nop:
/*****************************************************************************
* CloseDemux: initialize the target, ie. parse the command
*****************************************************************************/
-void CloseDemux ( vlc_object_t *p_this )
+static void CloseDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am
index ae454e4ce310..92a197d7cc27 100644
--- a/modules/misc/dummy/Modules.am
+++ b/modules/misc/dummy/Modules.am
@@ -2,7 +2,6 @@ SOURCES_dummy = \
dummy.c \
dummy.h \
interface.c \
- input.c \
decoder.c \
encoder.c \
renderer.c \
diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index fd9f726cd136..e68ecfbb88a8 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -63,11 +63,6 @@ vlc_module_begin ()
add_category_hint( N_("Interface"), NULL, false )
add_bool( "dummy-quiet", false, QUIET_TEXT, QUIET_LONGTEXT, false )
#endif
- add_submodule ()
- set_description( N_("Dummy demux function") )
- set_capability( "access_demux", 0 )
- set_callbacks( OpenDemux, CloseDemux )
- add_shortcut( "vlc" )
add_submodule ()
set_section( N_( "Dummy decoder" ), NULL )
set_description( N_("Dummy decoder function") )
diff --git a/modules/misc/dummy/dummy.h b/modules/misc/dummy/dummy.h
index 297f6799a3c4..a5a284b338d7 100644
--- a/modules/misc/dummy/dummy.h
+++ b/modules/misc/dummy/dummy.h
@@ -26,9 +26,6 @@
*****************************************************************************/
int OpenIntf ( vlc_object_t * );
-int OpenDemux ( vlc_object_t * );
-void CloseDemux ( vlc_object_t * );
-
int OpenDecoder ( vlc_object_t * );
int OpenDecoderDump( vlc_object_t * );
void CloseDecoder ( vlc_object_t * );
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4d77eca16297..587a45ebc5e8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -207,6 +207,7 @@ modules/access/fs.c
modules/access/ftp.c
modules/access/gnomevfs.c
modules/access/http.c
+modules/access/idummy.c
modules/access/imem.c
modules/access/jack.c
modules/access/linsys/linsys_sdi.c
@@ -911,7 +912,6 @@ modules/misc/dummy/decoder.c
modules/misc/dummy/dummy.c
modules/misc/dummy/dummy.h
modules/misc/dummy/encoder.c
-modules/misc/dummy/input.c
modules/misc/dummy/interface.c
modules/misc/dummy/renderer.c
modules/misc/gnutls.c
--
GitLab