[vlc-devel] commit: Use input_GetVout ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Feb 10 17:59:59 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 10 18:41:59 2010 +0200| [39b8902447610f6a1c7f595436fbe59f846e0582] | committer: Rémi Denis-Courmont 

Use input_GetVout

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39b8902447610f6a1c7f595436fbe59f846e0582
---

 modules/control/rc.c          |    4 +---
 modules/gui/ncurses.c         |    4 +---
 modules/misc/lua/libs/video.c |    3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index db0d966..8a85af2 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -743,9 +743,7 @@ static void Run( intf_thread_t *p_intf )
         case 'F':
             if( p_input )
             {
-                vout_thread_t *p_vout;
-                p_vout = input_GetVout( p_input );
-
+                vout_thread_t *p_vout = input_GetVout( p_input );
                 if( p_vout )
                 {
                     vlc_value_t val;
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index f40f81d..0ea1a53 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -1117,9 +1117,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
         {
             if( p_intf->p_sys->p_input )
             {
-                vout_thread_t *p_vout;
-                p_vout = vlc_object_find( p_intf->p_sys->p_input,
-                                          VLC_OBJECT_VOUT, FIND_CHILD );
+                vout_thread_t *p_vout = inputGetVout( p_intf->p_sys->p_input );
                 if( p_vout )
                 {
                     var_ToggleBool( p_vout, "fullscreen" );
diff --git a/modules/misc/lua/libs/video.c b/modules/misc/lua/libs/video.c
index ff26fee..c1c023d 100644
--- a/modules/misc/lua/libs/video.c
+++ b/modules/misc/lua/libs/video.c
@@ -53,8 +53,9 @@ static int vlclua_fullscreen( lua_State *L )
     input_thread_t * p_input = vlclua_get_input_internal( L );
     if( !p_input ) return vlclua_error( L );
 
-    p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
+    p_vout = input_GetVout( p_input );
     if( !p_vout ) return vlclua_error( L );
+#warning ^^ How about releasing the input?
 
     i_ret = vlclua_var_toggle_or_set( L, p_vout, "fullscreen" );
     vlc_object_release( p_vout );




More information about the vlc-devel mailing list