Merge commit 'origin/1.0-bugfix'

diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 7a9144be73abd53f55345fdbba13c7dd754d143a..324acb8d0c3087b833f57b923809736ea6bd9565 100644 (file)
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -144,6 +144,7 @@ HTTPDestBox::HTTPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     layout->addWidget(HTTPPortLabel, 2, 0, 1, 1);
 
     HTTPEdit = new QLineEdit(this);
+    HTTPEdit->setText( "0.0.0.0" );
 
     HTTPPort = new QSpinBox(this);
     HTTPPort->setMaximumSize(QSize(90, 16777215));
@@ -188,6 +189,7 @@ MMSHDestBox::MMSHDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     layout->addWidget(MMSHPortLabel, 2, 0, 1, 1);
 
     MMSHEdit = new QLineEdit(this);
+    MMSHEdit->setText( "0.0.0.0" );
 
     MMSHPort = new QSpinBox(this);
     MMSHPort->setMaximumSize(QSize(90, 16777215));

diff --git a/modules/video_output/xcb/keys.c b/modules/video_output/xcb/keys.c
index d4a9a1f514a4255c9e6a451e617262d9e86b01d8..21491fee0b5a4d56b08c0194d659cb609a7b8a9d 100644 (file)
--- a/modules/video_output/xcb/keys.c
+++ b/modules/video_output/xcb/keys.c
@@ -32,6 +32,7 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_keysyms.h>
 #include <X11/keysym.h>
+#include <X11/XF86keysym.h>
 
 #include <vlc_common.h>
 #include <vlc_keys.h>
@@ -135,24 +136,25 @@ static int ConvertKeySym (xcb_keysym_t sym)
         { XK_F11,           KEY_F11, },
         { XK_F12,           KEY_F12, },
         { XK_Delete,        KEY_DELETE, },
+
+        /* XFree86 extensions */
+        { XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN, },
+        { XF86XK_AudioMute,        KEY_VOLUME_MUTE, },
+        { XF86XK_AudioRaiseVolume, KEY_VOLUME_UP, },
+        { XF86XK_AudioPlay,        KEY_MEDIA_PLAY_PAUSE, },
+        { XF86XK_AudioStop,        KEY_MEDIA_STOP, },
+        { XF86XK_AudioPrev,        KEY_MEDIA_PREV_TRACK, },
+        { XF86XK_AudioNext,        KEY_MEDIA_NEXT_TRACK, },
+        { XF86XK_HomePage,         KEY_BROWSER_HOME, },
+        { XF86XK_Search,           KEY_BROWSER_SEARCH, },
+        { XF86XK_Back,             KEY_BROWSER_BACK, },
+        { XF86XK_Forward,          KEY_BROWSER_FORWARD, },
+        { XF86XK_Stop,             KEY_BROWSER_STOP, },
+        { XF86XK_Refresh,          KEY_BROWSER_REFRESH, },
+        { XF86XK_Favorites,        KEY_BROWSER_FAVORITES, },
+        { XF86XK_AudioPause,       KEY_MEDIA_PLAY_PAUSE, },
+        { XF86XK_Reload,           KEY_BROWSER_REFRESH, },
     };
-    /* TODO: add XF86 extensions */
-#if 0
-    KEY_BROWSER_BACK
-    KEY_BROWSER_FORWARD
-    KEY_BROWSER_REFRESH
-    KEY_BROWSER_STOP
-    KEY_BROWSER_SEARCH
-    KEY_BROWSER_FAVORITES
-    KEY_BROWSER_HOME
-    KEY_VOLUME_MUTE
-    KEY_VOLUME_DOWN
-    KEY_VOLUME_UP
-    KEY_MEDIA_NEXT_TRACK
-    KEY_MEDIA_PREV_TRACK
-    KEY_MEDIA_STOP
-    KEY_MEDIA_PLAY_PAUSE
-#endif
 
     /* X11 and VLC both use the ASCII code for printable ASCII characters,
      * except for space (only X11). */

diff --git a/src/input/input.c b/src/input/input.c
index bf5373eeeabc3cc3aa7fcf5a121808d63188bf9e..542f1295a3c2fe3d0055a1debc3686b575386597 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1107,13 +1107,11 @@ static void InitPrograms( input_thread_t * p_input )
     /* Set up es_out */
     es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, true );
     i_es_out_mode = ES_OUT_MODE_AUTO;
-    val.p_list = NULL;
     if( p_input->p->p_sout )
     {
         if( var_GetBool( p_input, "sout-all" ) )
         {
             i_es_out_mode = ES_OUT_MODE_ALL;
-            val.p_list = NULL;
         }
         else
         {
@@ -1125,8 +1123,7 @@ static void InitPrograms( input_thread_t * p_input )
             }
             else
             {
-                var_Change( p_input, "programs", VLC_VAR_FREELIST, &val,
-                            NULL );
+                var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, NULL );
             }
         }
     }
@@ -1141,6 +1138,7 @@ static void InitPrograms( input_thread_t * p_input )
     {
         demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
                         val.p_list );
+        var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, NULL );
     }
     else
     {

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 8e262daf0046faad14ba31755553a9cd4f2c3aa0..fc7aa0caaa6558cd59d1bca97dacfd6219a8786e 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2000,12 +2000,16 @@ vlc_module_begin ()
     add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , false )
     add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, false )
         change_short('Z')
+        change_safe()
     add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, false )
         change_short('L')
+        change_safe()
     add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, false )
         change_short('R')
+        change_safe()
     add_bool( "play-and-exit", 0, NULL, PAE_TEXT, PAE_LONGTEXT, false )
     add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, false )
+        change_safe()
     add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, false )
     add_bool( "playlist-tree", 0, NULL, PLTREE_TEXT, PLTREE_LONGTEXT, false )