Forward port [15485] and [15486].

diff --git a/doc/skins/skins2-howto.xml b/doc/skins/skins2-howto.xml
index 1ce25af3c2134c31db911c19f5021ec70f4f5d7e..99bfa03a7feb6af5f2e61c64bb5871cf4488bb4c 100644 (file)
--- a/doc/skins/skins2-howto.xml
+++ b/doc/skins/skins2-howto.xml
@@ -577,7 +577,7 @@ difficulty to understand how VLC skins work.</para>
   </sect4>
   <sect4 id="textscrolling">
     <title>scrolling</title>
-    <para>Scrolling behaviour of the text (only when it doesn't fit in the <link linkend="textwidth">width</link> of the control). Possible values are 'auto', 'autooff', 'manual' and 'none'. If this attribute is set to 'auto', the text automatically starts scrolling. The user can drag the text, and click on it to start/stop the scrolling. If this attribute is set to 'manual', the text only scrolls when dragged by the user. If this attribute is set to 'none', no scrolling is possible at all. Available since VLC 0.8.5.</para>
+    <para>Scrolling behaviour of the text (only when it doesn't fit in the <link linkend="textwidth">width</link> of the control). Possible values are 'auto', 'manual' and 'none'. If this attribute is set to 'auto', the text automatically starts scrolling. The user can drag the text, and click on it to start/stop the scrolling. If this attribute is set to 'manual', the text only scrolls when dragged by the user. If this attribute is set to 'none', no scrolling is possible at all. Available since VLC 0.8.5.</para>
     <para>Default value: auto</para>
   </sect4>
 </sect3>

diff --git a/modules/gui/skins2/controls/ctrl_text.cpp b/modules/gui/skins2/controls/ctrl_text.cpp
index 47644929f9b4d28919edbc20fd148a76001e0028..1d3d4361045e9f4fd1945df1b25bd5c1e24a4779 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_text.cpp
+++ b/modules/gui/skins2/controls/ctrl_text.cpp
@@ -74,7 +74,7 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable,
                              &m_cmdManualStill );
         m_fsm.addTransition( "manual1", "motion", "manual1", &m_cmdMove );
     }
-    else if( m_scrollMode == kAutomatic || m_scrollMode == kAutomaticOff )
+    else if( m_scrollMode == kAutomatic )
     {
         m_fsm.addTransition( "still", "mouse:left:down", "manual1",
                              &m_cmdToManual );
@@ -91,10 +91,7 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable,
     }
 
     // Initial state
-    if( m_scrollMode == kAutomatic )
-        m_fsm.setState( "outMoving" );
-    else
-        m_fsm.setState( "outStill" );
+    m_fsm.setState( "outStill" );
 
     // Observe the variable
     m_rVariable.addObserver( this );

diff --git a/modules/gui/skins2/controls/ctrl_text.hpp b/modules/gui/skins2/controls/ctrl_text.hpp
index 3a6a8ff19efeb60229ef85ab88abe6e3066a7567..62449627a50b2e263b8be723cf2cbfa6d8c171b0 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_text.hpp
+++ b/modules/gui/skins2/controls/ctrl_text.hpp
@@ -54,8 +54,6 @@ class CtrlText: public CtrlGeneric, public Observer<VarText, void*>
             // width of the control. The user can still stop it or make it
             // scroll manually with the mouse.
             kAutomatic,
-            // Same as above butt default state is off
-            kAutomaticOff,
             // Only manual scrolling is allowed (with the mouse)
             kManual,
             // No scrolling of the text is allowed

diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp
index ceba8c0c5ddc48856b6b1e2b50c6d6466e4098b8..bc0d31927eb6a24a952a2acb42fa592c0cec2bfa 100644 (file)
--- a/modules/gui/skins2/parser/builder.cpp
+++ b/modules/gui/skins2/parser/builder.cpp
@@ -607,8 +607,6 @@ void Builder::addText( const BuilderData::Text &rData )
     CtrlText::Scrolling_t scrolling;
     if( rData.m_scrolling == "auto" )
         scrolling = CtrlText::kAutomatic;
-    else if( rData.m_scrolling == "autooff" )
-        scrolling = CtrlText::kAutomaticOff;
     else if( rData.m_scrolling == "manual" )
         scrolling = CtrlText::kManual;
     else if( rData.m_scrolling == "none" )

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 8e18b3af97e26da0d3bbdb6e1c2d9354396d510d..9b8d263d662bd8fbaae8c3d6fff314cbb930f202 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -202,6 +202,7 @@ static void Close( vlc_object_t *p_this )
             p_sd->p_sys->pp_input[i] = NULL;
         }
     }
+    free( p_sd->p_sys->pp_input );
     if( p_playlist )
     {
         playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );

diff --git a/share/skins2/default/theme.xml b/share/skins2/default/theme.xml
index c34ffcee71ecd143192383057d305eab1444f5f1..1bacf88569224487c7350a3ddab57bd015e751dd 100644 (file)
--- a/share/skins2/default/theme.xml
+++ b/share/skins2/default/theme.xml
@@ -214,9 +214,9 @@
                <Button x="408" y="2" up="close_up" over="close_over" down="close_down" lefttop="righttop" rightbottom="righttop" action="vlc.quit()" tooltiptext="Quit VLC"/>\r
                \r
                \r
-               <Text x="21" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="320" text="$N" visible="not dvd.isActive" scrolling="autooff"/>\r
+               <Text x="21" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="320" text="$N" visible="not dvd.isActive"/>\r
                \r
-               <Text x="125" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="215" text="$N" visible="dvd.isActive" scrolling="autooff"/>\r
+               <Text x="125" y="207" alignment="left" color="#FFFFFF" font="mainfont" lefttop="leftbottom" rightbottom="rightbottom" width="215" text="$N" visible="dvd.isActive"/>\r
                <Text x="342" y="208" alignment="right" color="#FFFFFF" font="defaultfont" lefttop="rightbottom" rightbottom="rightbottom" width="88" text="$T/$D"/>\r
                <Button x="21" y="207" up="dvd_prevtitle" action="dvd.previousTitle()" tooltiptext="Play Previous Title on DVD" lefttop="leftbottom" rightbottom="rightbottom" visible="dvd.isActive"/>\r
                <Button x="41" y="207" up="dvd_prevchapter" action="dvd.previousChapter()" tooltiptext="Go to Previous Chapter of Title" lefttop="leftbottom" rightbottom="rightbottom" visible="dvd.isActive"/>\r
@@ -342,7 +342,7 @@
                <Anchor x="300" y="0" priority="3"/>\r
                <Image x="0" y="0" action="move" image="minimal_bg"/>\r
 \r
-               <Text x="10" y="20" alignment="left" color="#FFFFFF" font="mainfont" text="$N" width="190" scrolling="autooff"/>\r
+               <Text x="10" y="20" alignment="left" color="#FFFFFF" font="mainfont" text="$N" width="190"/>\r
                <Text x="202" y="21" alignment="right" color="#FFFFFF" font="defaultfont" text="$T/$D" width="88"/>\r
                <Slider x="10" y="42" points="(5,0),(275,0)" up="timeslider" value="time" tooltiptext="$T / $D"/>\r
 \r