* open file widget: do nothing if the user clicked on cancel

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 75cd6b7f8cd18d9f6cf706c0c890a3a91f2f9960..754d7b2d49375d099d85b4f5a6cc4b53c625535b 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -381,10 +381,9 @@ static const char *ppsz_align_descriptions[] =
     "pixels (1:1). If you have a 16:9 screen, you might need to change this " \
     "to 4:3 in order to keep proportions.")
 
-/// \bug [String] Remove "this option"
 #define SKIP_FRAMES_TEXT N_("Skip frames")
 #define SKIP_FRAMES_LONGTEXT N_( \
-    "This option enables framedropping on MPEG2 stream. Framedropping " \
+    "Enables framedropping on MPEG2 stream. Framedropping " \
     "occurs when your computer is not powerful enough" )
 
 #define DROP_LATE_FRAMES_TEXT N_("Drop late frames")
@@ -558,11 +557,10 @@ static const char *ppsz_clock_descriptions[] =
 #define TEXTRENDERER_LONGTEXT N_( \
     "VLC normally uses Freetype for rendering, but this allows you to use svg for instance.")
 
-/// \bug typo arbitraty
 #define SUB_FILTER_TEXT N_("Subpictures filter module")
 #define SUB_FILTER_LONGTEXT N_( \
     "This adds so-called \"subpicture filters\". These filters overlay " \
-    "some images or text over the video (like a logo, arbitraty text...)." )
+    "some images or text over the video (like a logo, arbitrary text...)." )
 
 #define SUB_AUTO_TEXT N_("Autodetect subtitle files")
 #define SUB_AUTO_LONGTEXT N_( \
@@ -1173,6 +1171,12 @@ static const char *ppsz_pltree_descriptions[] = { N_("Default"), N_("Always"), N
 #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")
+
+#define RANDOM_KEY_TEXT N_("Random")
+#define RANDOM_KEY_LONGTEXT N_("Toggle random playlist playback")
+
 #define ZOOM_KEY_TEXT N_("Zoom")
 #define ZOOM_KEY_LONGTEXT N_("Zoom")
 
@@ -1532,7 +1536,7 @@ vlc_module_begin();
     add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT, VLC_TRUE );
     add_bool( "sout-display", VLC_FALSE, NULL, SOUT_DISPLAY_TEXT,
                                 SOUT_DISPLAY_LONGTEXT, VLC_TRUE );
-    add_bool( "sout-keep", VLC_FALSE, NULL, SOUT_KEEP_TEXT,
+    add_bool( "sout-keep", VLC_TRUE, NULL, SOUT_KEEP_TEXT,
                                 SOUT_KEEP_LONGTEXT, VLC_TRUE );
     add_bool( "sout-all", 0, NULL, SOUT_ALL_TEXT,
                                 SOUT_ALL_LONGTEXT, VLC_TRUE );
@@ -1841,6 +1845,8 @@ vlc_module_begin();
 #   define KEY_SNAPSHOT           KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s'
 #   define KEY_ZOOM               'z'
 #   define KEY_UNZOOM             KEY_MODIFIER_SHIFT|'z'
+#   define KEY_RANDOM             'r'
+#   define KEY_LOOP               KEY_MODIFIER_SHIFT|'l'
 
 #   define KEY_CROP_TOP           KEY_MODIFIER_ALT|'i'
 #   define KEY_UNCROP_TOP         KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'i'
@@ -1908,6 +1914,8 @@ vlc_module_begin();
 #   define KEY_SUBDELAY_DOWN      KEY_MODIFIER_CTRL|'j'
 #   define KEY_AUDIODELAY_UP      KEY_MODIFIER_CTRL|'k'
 #   define KEY_AUDIODELAY_DOWN    KEY_MODIFIER_CTRL|'l'
+#   define KEY_RANDOM             'r'
+#   define KEY_LOOP               KEY_MODIFIER_SHIFT|'l'
 
 #   define KEY_AUDIO_TRACK        'l'
 #   define KEY_SUBTITLE_TRACK     'k'
@@ -2078,6 +2086,10 @@ vlc_module_begin();
              CROP_RIGHT_KEY_TEXT, CROP_RIGHT_KEY_LONGTEXT, VLC_TRUE );
     add_key( "key-uncrop-right", KEY_UNCROP_RIGHT, NULL,
              UNCROP_RIGHT_KEY_TEXT, UNCROP_RIGHT_KEY_LONGTEXT, VLC_TRUE );
+    add_key( "key-random", KEY_RANDOM, NULL,
+             RANDOM_KEY_TEXT, RANDOM_KEY_LONGTEXT, VLC_FALSE );
+    add_key( "key-loop", KEY_LOOP, NULL,
+             LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, VLC_FALSE );
 
     set_section ( N_("Jump sizes" ), NULL );
     add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
@@ -2316,6 +2328,8 @@ const struct hotkey libvlc_hotkeys[] =
     { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0, 0, 0, 0 },
     { "key-record", ACTIONID_RECORD, 0, 0, 0, 0 },
     { "key-dump", ACTIONID_DUMP, 0, 0, 0, 0 },
+    { "key-random", ACTIONID_RANDOM, 0, 0, 0, 0 },
+    { "key-loop", ACTIONID_LOOP, 0, 0, 0, 0 },
     { NULL, 0, 0, 0, 0, 0 }
 };