Changeset 37ce2848cd83ba8255190cb0c810f5586cfd785c

Timestamp:

04/08/07 20:50:37 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1186253437 +0000

git-parent:

[fe9e45cc87e5e966a945c5638d3c74c548811ded]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1186253437 +0000

Message:

Fix usage of add_shortcut.
Note that shortcuts are inherited from the main module to submodules, so it is
totally useless to duplicate them paste add_submodule. If you think this is
wrong, I do not necessarily disagree, but it would need a RFC.

Files:

• modules/access/directory.c (modified) (2 diffs)
• modules/access/dshow/dshow.cpp (modified) (1 diff)
• modules/access/ftp.c (modified) (1 diff)
• modules/codec/dirac.c (modified) (1 diff)
• modules/codec/flac.c (modified) (2 diffs)
• modules/codec/theora.c (modified) (2 diffs)
• modules/video_filter/logo.c (modified) (1 diff)

modules/access/directory.c

@@ -107 +107 @@
-        set_description( "Directory EOF");
-        set_capability( "demux2", 0 );
-        add_shortcut( "directory" );
-        set_callbacks( DemuxOpen, NULL );
-vlc_module_end();
@@ -269 +268 @@
-
-/*****************************************************************************
-DemuxOpen
+Control
- *****************************************************************************/
-static int Control( access_t *p_access, int i_query, va_list args )

modules/access/dshow/dshow.cpp

@@ -229 +229 @@
-    add_submodule();
-    set_description( _("DirectShow input") );
-    add_shortcut( "dshow" );
-    set_capability( "access2", 0 );
-    set_callbacks( AccessOpen, AccessClose );

modules/access/ftp.c

@@ -89 +89 @@
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_ACO );
-    add_shortcut( "ftp" );
-    set_callbacks( OutOpen, OutClose );
-vlc_module_end();

modules/codec/dirac.c

@@ -81 +81 @@
-    set_capability( "encoder", 100 );
-    set_callbacks( OpenEncoder, CloseEncoder );
-    add_shortcut( "dirac" );
-    add_float( ENC_CFG_PREFIX "quality", 7.0, NULL, ENC_QUALITY_TEXT,
-               ENC_QUALITY_LONGTEXT, VLC_FALSE );

modules/codec/flac.c

@@ -174 +174 @@
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACODEC );
+    add_shortcut( "flac" );
-
-#ifdef USE_LIBFLAC
@@ -191 +192 @@
-    set_callbacks( OpenPacketizer, CloseDecoder );
-
-    add_shortcut( "flac" );
-vlc_module_end();
-

modules/codec/theora.c

@@ -106 +106 @@
-    set_capability( "packetizer", 100 );
-    set_callbacks( OpenPacketizer, CloseDecoder );
-    add_shortcut( "theora" );
-
-    add_submodule();
@@ -112 +111 @@
-    set_capability( "encoder", 150 );
-    set_callbacks( OpenEncoder, CloseEncoder );
-    add_shortcut( "theora" );
-
-#   define ENC_CFG_PREFIX "sout-theora-"

modules/video_filter/logo.c

@@ -123 +123 @@
-    set_callbacks( CreateFilter, DestroyFilter );
-    set_description( _("Logo sub filter") );
-    add_shortcut( "logo" );
-vlc_module_end();
-