Mark ffmpeg-fast and ffmpeg-hw as normal preferences.

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index f3405a7806cd5fcfb5c9c8a99b0f9c8ffac8bbd4..670188930b9d5b34a8900eaf363ad4fb17773669 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1124,6 +1124,11 @@ static const char *const ppsz_clock_descriptions[] =
     "the correct demuxer is not automatically detected. You should not "\
     "set this as a global option unless you really know what you are doing." )
 
+#define VOD_SERVER_TEXT N_("VoD server module")
+#define VOD_SERVER_LONGTEXT N_( \
+    "You can select which VoD server module you want to use. Set this " \
+    "to `vod_rtsp' to switch back to the old, legacy module." )
+
 #define RT_PRIORITY_TEXT N_("Allow real-time priority")
 #define RT_PRIORITY_LONGTEXT N_( \
     "Running VLC in real-time priority will allow for much more precise " \
@@ -1475,8 +1480,6 @@ static const char *const ppsz_albumart_descriptions[] =
 
 #define RECORD_KEY_TEXT N_("Record")
 #define RECORD_KEY_LONGTEXT N_("Record access filter start/stop.")
-#define DUMP_KEY_TEXT N_("Dump")
-#define DUMP_KEY_LONGTEXT N_("Media dump access filter trigger.")
 
 #define LOOP_KEY_TEXT N_("Normal/Repeat/Loop")
 #define LOOP_KEY_LONGTEXT N_("Toggle Normal/Repeat/Loop playlist modes")
@@ -2067,6 +2070,9 @@ vlc_module_begin ()
     add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
                 MEMCPY_LONGTEXT, true )
         change_need_restart ()
+    add_module( "vod-server", "vod server", NULL, NULL, VOD_SERVER_TEXT,
+                VOD_SERVER_LONGTEXT, true )
+        change_need_restart ()
 
     set_section( N_("Plugins" ), NULL )
     add_bool( "plugins-cache", true, PLUGINS_CACHE_TEXT,
@@ -2360,7 +2366,6 @@ vlc_module_begin ()
 #   define KEY_PLAY_BOOKMARK9     KEY_UNSET
 #   define KEY_PLAY_BOOKMARK10    KEY_UNSET
 #   define KEY_RECORD             KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'r'
-#   define KEY_DUMP               KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'d'
 #   define KEY_WALLPAPER          KEY_MODIFIER_COMMAND|'w'
 
 #   define KEY_MENU_ON            KEY_MODIFIER_ALT|'m'
@@ -2444,7 +2449,6 @@ vlc_module_begin ()
 #   define KEY_AUDIODEVICE_CYCLE  KEY_MODIFIER_SHIFT|'a'
 
 #   define KEY_RECORD             KEY_MODIFIER_SHIFT|'r'
-#   define KEY_DUMP               KEY_MODIFIER_SHIFT|'d'
 #   define KEY_WALLPAPER          'w'
 
 /* Cropping */
@@ -2609,8 +2613,6 @@ vlc_module_begin ()
         SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, true )
     add_key( "key-record", KEY_RECORD,
              RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, true )
-    add_key( "key-dump", KEY_DUMP,
-             DUMP_KEY_TEXT, DUMP_KEY_LONGTEXT, true )
     add_key( "key-zoom", KEY_ZOOM,
              ZOOM_KEY_TEXT, ZOOM_KEY_LONGTEXT, true )
     add_key( "key-unzoom", KEY_UNZOOM,
@@ -2835,7 +2837,6 @@ const struct action libvlc_actions[] =
     { "key-decr-scalefactor", ACTIONID_SCALE_DOWN, },
     { "key-deinterlace", ACTIONID_DEINTERLACE, },
     { "key-disc-menu", ACTIONID_DISC_MENU, },
-    { "key-dump", ACTIONID_DUMP, },
     { "key-faster", ACTIONID_FASTER, },
     { "key-frame-next", ACTIONID_FRAME_NEXT, },
     { "key-incr-scalefactor", ACTIONID_SCALE_UP, },