[vlc-commits] access: fold access_demux capability
Rémi Denis-Courmont
git at videolan.org
Sat Mar 31 17:02:27 CEST 2018
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 24 11:50:13 2018 +0200| [66b98787821b9fce1a68292de417c32e77ca3510] | committer: Rémi Denis-Courmont
access: fold access_demux capability
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=66b98787821b9fce1a68292de417c32e77ca3510
---
include/vlc_stream.h | 2 +-
modules/access/alsa.c | 2 +-
modules/access/avcapture.m | 2 +-
modules/access/bluray.c | 2 +-
modules/access/dc1394.c | 2 +-
modules/access/dcp/dcp.cpp | 2 +-
modules/access/decklink.cpp | 2 +-
modules/access/dshow/dshow.cpp | 2 +-
modules/access/dvdnav.c | 2 +-
modules/access/dvdread.c | 2 +-
modules/access/idummy.c | 2 +-
modules/access/imem.c | 2 +-
modules/access/jack.c | 2 +-
modules/access/linsys/linsys_hdsdi.c | 2 +-
modules/access/linsys/linsys_sdi.c | 2 +-
modules/access/live555.cpp | 2 +-
modules/access/oss.c | 2 +-
modules/access/pulse.c | 2 +-
modules/access/qtsound.m | 2 +-
modules/access/rdp.c | 2 +-
modules/access/rtp/rtp.c | 2 +-
modules/access/screen/screen.c | 2 +-
modules/access/screen/wayland.c | 2 +-
modules/access/screen/xcb.c | 2 +-
modules/access/shm.c | 2 +-
modules/access/timecode.c | 2 +-
modules/access/v4l2/v4l2.c | 4 ++--
modules/access/vnc.c | 2 +-
modules/access/wasapi.c | 2 +-
29 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 8374592db4..d76d90b2e6 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -62,7 +62,7 @@ struct stream_t
*
* Depending on the module capability:
* - "stream filter" or "demux": input byte stream (not NULL)
- * - "access" or "access_demux": a NULL pointer
+ * - "access": a NULL pointer
* - "demux_filter": undefined
*/
stream_t *s;
diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index 5cc0768de8..1126d97c5d 100644
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -55,7 +55,7 @@ static const char *const rate_names[] = { N_("192000 Hz"), N_("176400 Hz"),
vlc_module_begin ()
set_shortname (N_("ALSA"))
set_description (N_("ALSA audio capture"))
- set_capability ("access_demux", 0)
+ set_capability ("access", 0)
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
set_help (HELP_TEXT)
diff --git a/modules/access/avcapture.m b/modules/access/avcapture.m
index 278e7f8e94..a88d0aeba0 100644
--- a/modules/access/avcapture.m
+++ b/modules/access/avcapture.m
@@ -59,7 +59,7 @@ vlc_module_begin ()
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_ACCESS)
add_shortcut("avcapture")
- set_capability("access_demux", 0)
+ set_capability("access", 0)
set_callbacks(Open, Close)
vlc_module_end ()
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index cf4676a302..2fcea51abe 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -94,7 +94,7 @@ vlc_module_begin ()
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_ACCESS)
- set_capability("access_demux", 500)
+ set_capability("access", 500)
add_bool("bluray-menu", true, BD_MENU_TEXT, BD_MENU_LONGTEXT, false)
add_string("bluray-region", ppsz_region_code[REGION_DEFAULT], BD_REGION_TEXT, BD_REGION_LONGTEXT, false)
change_string_list(ppsz_region_code, ppsz_region_code_text)
diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 631abf6f9b..adec9ac313 100644
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -50,7 +50,7 @@ static void Close( vlc_object_t * );
vlc_module_begin()
set_shortname( N_("DC1394") )
set_description( N_("IIDC Digital Camera (FireWire) input") )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
set_callbacks( Open, Close )
vlc_module_end()
diff --git a/modules/access/dcp/dcp.cpp b/modules/access/dcp/dcp.cpp
index e53813beb3..6867c94354 100644
--- a/modules/access/dcp/dcp.cpp
+++ b/modules/access/dcp/dcp.cpp
@@ -78,7 +78,7 @@ vlc_module_begin()
add_shortcut( "dcp" )
add_loadfile( "kdm", "", KDM_HELP_TEXT, KDM_HELP_LONG_TEXT, false )
set_description( N_( "Digital Cinema Package module" ) )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
set_callbacks( Open, Close )
diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index 761396c75a..b083a79f0f 100644
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -119,7 +119,7 @@ vlc_module_begin ()
add_bool("decklink-tenbits", false, N_("10 bits"), N_("10 bits"), true)
add_shortcut("decklink")
- set_capability("access_demux", 0)
+ set_capability("access", 0)
set_callbacks(Open, Close)
vlc_module_end ()
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 100d9b9a65..da18701ad2 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -291,7 +291,7 @@ vlc_module_begin ()
AUDIO_BITSPERSAMPLE_LONGTEXT, true )
add_shortcut( "dshow" )
- set_capability( "access_demux", 1 )
+ set_capability( "access", 1 )
set_callbacks( DemuxOpen, DemuxClose )
add_submodule ()
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index b6fe4304c3..1be6762199 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -94,7 +94,7 @@ vlc_module_begin ()
ANGLE_LONGTEXT, false )
add_bool( "dvdnav-menu", true,
MENU_TEXT, MENU_LONGTEXT, false )
- set_capability( "access_demux", 305 )
+ set_capability( "access", 305 )
add_shortcut( "dvd", "dvdnav", "file" )
set_callbacks( AccessDemuxOpen, Close )
#ifdef HAVE_DVDNAV_DEMUX
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 8bf626298a..44ae8b60df 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -80,7 +80,7 @@ vlc_module_begin ()
add_integer( "dvdread-angle", 1, ANGLE_TEXT,
ANGLE_LONGTEXT, false )
add_obsolete_string( "dvdread-css-method" ) /* obsolete since 1.1.0 */
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
add_shortcut( "dvd", "dvdread", "dvdsimple" )
set_callbacks( Open, Close )
vlc_module_end ()
diff --git a/modules/access/idummy.c b/modules/access/idummy.c
index 18ce6d4257..f95e68634f 100644
--- a/modules/access/idummy.c
+++ b/modules/access/idummy.c
@@ -40,7 +40,7 @@ static int OpenDemux( vlc_object_t * );
vlc_module_begin ()
set_shortname( N_("Dummy") )
set_description( N_("Dummy input") )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
set_callbacks( OpenDemux, NULL )
add_shortcut( "dummy", "vlc" )
vlc_module_end ()
diff --git a/modules/access/imem.c b/modules/access/imem.c
index 668b0e5000..008e0ebde2 100644
--- a/modules/access/imem.c
+++ b/modules/access/imem.c
@@ -172,7 +172,7 @@ vlc_module_begin()
change_safe()
add_shortcut("imem")
- set_capability("access_demux", 1)
+ set_capability("access", 1)
set_callbacks(OpenDemux, CloseDemux)
add_submodule()
diff --git a/modules/access/jack.c b/modules/access/jack.c
index 4a066e32ec..d986dc14a0 100644
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -65,7 +65,7 @@ static void Close( vlc_object_t * );
vlc_module_begin ()
set_description( N_("JACK audio input") )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
set_shortname( N_( "JACK Input" ) )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
diff --git a/modules/access/linsys/linsys_hdsdi.c b/modules/access/linsys/linsys_hdsdi.c
index 9924290a99..01f195a410 100644
--- a/modules/access/linsys/linsys_hdsdi.c
+++ b/modules/access/linsys/linsys_hdsdi.c
@@ -101,7 +101,7 @@ vlc_module_begin()
add_string( "linsys-hdsdi-audio", "0=1,1",
AUDIO_TEXT, AUDIO_LONGTEXT, true )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
add_shortcut( "linsys-hdsdi" )
set_callbacks( Open, Close )
vlc_module_end()
diff --git a/modules/access/linsys/linsys_sdi.c b/modules/access/linsys/linsys_sdi.c
index 9c544d1003..c9efc415ea 100644
--- a/modules/access/linsys/linsys_sdi.c
+++ b/modules/access/linsys/linsys_sdi.c
@@ -106,7 +106,7 @@ vlc_module_begin()
add_string( "linsys-sdi-telx-lang", "", TELX_LANG_TEXT, TELX_LANG_LONGTEXT,
true )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
add_shortcut( "linsys-sdi" )
set_callbacks( Open, Close )
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index b2c32867e8..cdc3741f35 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -104,7 +104,7 @@ vlc_module_begin ()
add_submodule ()
set_description( N_("RTSP/RTP access and demux") )
add_shortcut( "rtsp", "pnm", "live", "livedotcom" )
- set_capability( "access_demux", 300 )
+ set_capability( "access", 300 )
set_callbacks( Open, Close )
add_bool( "rtsp-tcp", false,
N_("Use RTP over RTSP (TCP)"),
diff --git a/modules/access/oss.c b/modules/access/oss.c
index 367aed1574..aa03f6e4aa 100644
--- a/modules/access/oss.c
+++ b/modules/access/oss.c
@@ -79,7 +79,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACCESS )
add_shortcut( "oss" )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
set_callbacks( DemuxOpen, DemuxClose )
add_bool( CFG_PREFIX "stereo", true, STEREO_TEXT, STEREO_LONGTEXT,
diff --git a/modules/access/pulse.c b/modules/access/pulse.c
index 4f75e2f660..a5808ae387 100644
--- a/modules/access/pulse.c
+++ b/modules/access/pulse.c
@@ -41,7 +41,7 @@ static void Close(vlc_object_t *);
vlc_module_begin ()
set_shortname (N_("PulseAudio"))
set_description (N_("PulseAudio input"))
- set_capability ("access_demux", 0)
+ set_capability ("access", 0)
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
set_help (HELP_TEXT)
diff --git a/modules/access/qtsound.m b/modules/access/qtsound.m
index 82a1c03269..40f4a21f09 100644
--- a/modules/access/qtsound.m
+++ b/modules/access/qtsound.m
@@ -61,7 +61,7 @@ set_description(N_("QuickTime Sound Capture"))
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_ACCESS)
add_shortcut("qtsound")
-set_capability("access_demux", 0)
+set_capability("access", 0)
set_callbacks(Open, Close)
vlc_module_end ()
diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index afb29c671f..8ecceb60a3 100644
--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
@@ -87,7 +87,7 @@ vlc_module_begin()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
set_description( N_("RDP Remote Desktop") )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
add_string( CFG_PREFIX "user", NULL, USER_TEXT, USER_LONGTEXT, false )
change_safe()
diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index 136600cb02..6f76485f9c 100644
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -96,7 +96,7 @@ vlc_module_begin ()
set_description (N_("Real-Time Protocol (RTP) input"))
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_DEMUX)
- set_capability ("access_demux", 0)
+ set_capability ("access", 0)
set_callbacks (Open, Close)
add_integer ("rtcp-port", 0, RTCP_PORT_TEXT,
diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index a3a267c729..ac0ed09c47 100644
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -125,7 +125,7 @@ vlc_module_begin ()
add_integer( "screen-index", 0, INDEX_TEXT, INDEX_LONGTEXT, true )
#endif
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
add_shortcut( "screen" )
set_callbacks( Open, Close )
vlc_module_end ()
diff --git a/modules/access/screen/wayland.c b/modules/access/screen/wayland.c
index 28b658984e..c0505fbc52 100644
--- a/modules/access/screen/wayland.c
+++ b/modules/access/screen/wayland.c
@@ -477,7 +477,7 @@ vlc_module_begin ()
set_description (N_("Screen capture (with Wayland)"))
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
- set_capability ("access_demux", 0)
+ set_capability ("access", 0)
set_callbacks (Open, Close)
/* XXX: VLC core does not support multiple configuration items with the
diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c
index eb2219a1b2..1d7b16325f 100644
--- a/modules/access/screen/xcb.c
+++ b/modules/access/screen/xcb.c
@@ -71,7 +71,7 @@ vlc_module_begin ()
set_description (N_("Screen capture (with X11/XCB)"))
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
- set_capability ("access_demux", 0)
+ set_capability ("access", 0)
set_callbacks (Open, Close)
add_float ("screen-fps", 2.0, FPS_TEXT, FPS_LONGTEXT, true)
diff --git a/modules/access/shm.c b/modules/access/shm.c
index de6853684d..740fc67098 100644
--- a/modules/access/shm.c
+++ b/modules/access/shm.c
@@ -84,7 +84,7 @@ vlc_module_begin ()
set_description (N_("Shared memory framebuffer"))
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
- set_capability ("access_demux", 0)
+ set_capability ("access", 0)
set_callbacks (Open, Close)
add_float ("shm-fps", 10.0, FPS_TEXT, FPS_LONGTEXT, true)
diff --git a/modules/access/timecode.c b/modules/access/timecode.c
index c80852c1f1..97787468df 100644
--- a/modules/access/timecode.c
+++ b/modules/access/timecode.c
@@ -43,7 +43,7 @@ vlc_module_begin ()
set_description (N_("Time code subpicture elementary stream generator"))
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
- set_capability ("access_demux", 0)
+ set_capability ("access", 0)
set_callbacks (Open, NULL)
add_string ("timecode-fps", "25/1", FPS_TEXT, FPS_TEXT, false)
diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index d98bcf35f9..2e8f6fda7c 100644
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -416,7 +416,7 @@ vlc_module_begin ()
add_obsolete_integer( CFG_PREFIX "samplerate" )
add_shortcut( "v4l", "v4l2" )
- set_capability( "access_demux", 2 )
+ set_capability( "access", 2 )
set_callbacks( DemuxOpen, DemuxClose )
add_submodule ()
@@ -429,7 +429,7 @@ vlc_module_begin ()
add_submodule ()
add_shortcut ("radio" /*, "fm", "am" */)
set_description (N_("Video4Linux radio tuner"))
- set_capability ("access_demux", 1)
+ set_capability ("access", 1)
set_callbacks (RadioOpen, RadioClose)
vlc_module_end ()
diff --git a/modules/access/vnc.c b/modules/access/vnc.c
index 10c4c444df..8f3ed54f20 100644
--- a/modules/access/vnc.c
+++ b/modules/access/vnc.c
@@ -80,7 +80,7 @@ vlc_module_begin()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
set_description( N_("VNC client access") )
- set_capability( "access_demux", 0 )
+ set_capability( "access", 0 )
add_string( CFG_PREFIX "user", NULL, RFB_USER, RFB_USER, false )
change_safe()
diff --git a/modules/access/wasapi.c b/modules/access/wasapi.c
index 9ecd4ccde0..58ee86c959 100644
--- a/modules/access/wasapi.c
+++ b/modules/access/wasapi.c
@@ -491,7 +491,7 @@ static void Close (vlc_object_t *obj)
vlc_module_begin()
set_shortname(N_("WASAPI"))
set_description(N_("Windows Audio Session API input"))
- set_capability("access_demux", 0)
+ set_capability("access", 0)
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_ACCESS)
More information about the vlc-commits
mailing list