Fixed an incorrect read() error handling (http access).

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 4f2f9405ecfffa4f17b4a3128f18fcd89792470f..66ca6fc455ff8784b4414d5c8e53f64891764c41 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -48,7 +48,7 @@ static const char *const ppsz_language[] =
     "auto",
     "en",
     "ar",
-    "bn"
+    "bn",
     "pt_BR",
     "en_GB",
     "bg",
@@ -1782,20 +1782,28 @@ vlc_module_begin ()
     set_section( N_("Metadata" ) , NULL )
     add_string( "meta-title", NULL, NULL, META_TITLE_TEXT,
                 META_TITLE_LONGTEXT, true )
+        change_safe()
     add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT,
                 META_AUTHOR_LONGTEXT, true )
+        change_safe()
     add_string( "meta-artist", NULL, NULL, META_ARTIST_TEXT,
                 META_ARTIST_LONGTEXT, true )
+        change_safe()
     add_string( "meta-genre", NULL, NULL, META_GENRE_TEXT,
                 META_GENRE_LONGTEXT, true )
+        change_safe()
     add_string( "meta-copyright", NULL, NULL, META_CPYR_TEXT,
                 META_CPYR_LONGTEXT, true )
+        change_safe()
     add_string( "meta-description", NULL, NULL, META_DESCR_TEXT,
                 META_DESCR_LONGTEXT, true )
+        change_safe()
     add_string( "meta-date", NULL, NULL, META_DATE_TEXT,
                 META_DATE_LONGTEXT, true )
+        change_safe()
     add_string( "meta-url", NULL, NULL, META_URL_TEXT,
                 META_URL_LONGTEXT, true )
+        change_safe()
 
     set_section( N_( "Advanced" ), NULL )
 
@@ -2224,6 +2232,7 @@ vlc_module_begin ()
 #   define KEY_MENU_UP            KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_UP
 #   define KEY_MENU_DOWN          KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_DOWN
 #   define KEY_MENU_SELECT        KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_ENTER
+#   define KEY_AUDIODEVICE_CYCLE  KEY_MODIFIER_SHIFT|'a'
 
 #else /* Non Mac OS X */
     /*
@@ -2434,7 +2443,7 @@ vlc_module_begin ()
              AUDIODELAY_DOWN_KEY_TEXT, AUDIODELAY_DOWN_KEY_LONGTEXT, true )
     add_key( "key-audio-track", KEY_AUDIO_TRACK, NULL, AUDIO_TRACK_KEY_TEXT,
              AUDIO_TRACK_KEY_LONGTEXT, false )
-    add_key( "key-audiodevice-cycle", KEY_STOP, NULL, AUDI_DEVICE_CYCLE_KEY_TEXT,
+    add_key( "key-audiodevice-cycle", KEY_AUDIODEVICE_CYCLE, NULL, AUDI_DEVICE_CYCLE_KEY_TEXT,
              AUDI_DEVICE_CYCLE_KEY_LONGTEXT, false )
     add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, NULL,
              SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, false )