From 1aff501d32fbab62f1c5f2d7fad39e91e8c4150d Mon Sep 17 00:00:00 2001 From: Antoine Cellerier Date: Sun, 30 Apr 2006 19:16:39 +0000 Subject: [PATCH] Forward port [15485] and [15486]. --- doc/skins/skins2-howto.xml | 2 +- modules/gui/skins2/controls/ctrl_text.cpp | 7 ++----- modules/gui/skins2/controls/ctrl_text.hpp | 2 -- modules/gui/skins2/parser/builder.cpp | 2 -- modules/services_discovery/podcast.c | 1 + share/skins2/default/theme.xml | 6 +++--- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/doc/skins/skins2-howto.xml b/doc/skins/skins2-howto.xml index 1ce25af3c2..99bfa03a7f 100644 --- a/doc/skins/skins2-howto.xml +++ b/doc/skins/skins2-howto.xml @@ -577,7 +577,7 @@ difficulty to understand how VLC skins work. scrolling - Scrolling behaviour of the text (only when it doesn't fit in the width 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. + Scrolling behaviour of the text (only when it doesn't fit in the width 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. Default value: auto diff --git a/modules/gui/skins2/controls/ctrl_text.cpp b/modules/gui/skins2/controls/ctrl_text.cpp index 47644929f9..1d3d436104 100644 --- 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 3a6a8ff19e..62449627a5 100644 --- 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 // 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 ceba8c0c5d..bc0d31927e 100644 --- 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 8e18b3af97..9b8d263d66 100644 --- 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 c34ffcee71..1bacf88569 100644 --- a/share/skins2/default/theme.xml +++ b/share/skins2/default/theme.xml @@ -214,9 +214,9 @@