Skip to content

V
vlc-2-2
Commit 3396d9f3 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

skins2: use input_GetVout when possible.

parent be84b46a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 16 deletions
modules/gui/skins2/commands/cmd_fullscreen.cpp
View file @ 3396d9f3
/***************************************************************************** /*****************************************************************************
* cmd_fullscreen.cpp * cmd_fullscreen.cpp
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 the VideoLAN team * Copyright (C) 2003-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Cyril Deguet <asmax@via.ecp.fr> * Authors: Cyril Deguet <asmax@via.ecp.fr>
...@@ -29,15 +29,11 @@ ...@@ -29,15 +29,11 @@
void CmdFullscreen::execute() void CmdFullscreen::execute()
{ {
vout_thread_t *pVout;
if( getIntf()->p_sys->p_input == NULL ) if( getIntf()->p_sys->p_input == NULL )
{
return; return;
}
pVout = (vout_thread_t *)vlc_object_find( getIntf()->p_sys->p_input, vout_thread_t *pVout = input_GetVout( getIntf()->p_sys->p_input );
VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( pVout ) if( pVout )
{ {
// Switch to fullscreen // Switch to fullscreen
......
modules/gui/skins2/commands/cmd_snapshot.cpp
View file @ 3396d9f3
/***************************************************************************** /*****************************************************************************
* cmd_snapshot.cpp * cmd_snapshot.cpp
***************************************************************************** *****************************************************************************
* Copyright (C) 2006 the VideoLAN team * Copyright (C) 2006-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Olivier Teulière <ipkiss@via.ecp.fr> * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
...@@ -27,15 +27,10 @@ ...@@ -27,15 +27,10 @@
void CmdSnapshot::execute() void CmdSnapshot::execute()
{ {
vout_thread_t *pVout;
if( getIntf()->p_sys->p_input == NULL ) if( getIntf()->p_sys->p_input == NULL )
{
return; return;
}
pVout = (vout_thread_t *)vlc_object_find( getIntf()->p_sys->p_input, vout_thread_t *pVout = input_GetVout( getIntf()->p_sys->p_input );
VLC_OBJECT_VOUT, FIND_CHILD );
if( pVout ) if( pVout )
{ {
// Take a snapshot // Take a snapshot
......
modules/gui/skins2/src/vlcproc.cpp
View file @ 3396d9f3
/***************************************************************************** /*****************************************************************************
* vlcproc.cpp * vlcproc.cpp
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 the VideoLAN team * Copyright (C) 2003-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Cyril Deguet <asmax@via.ecp.fr> * Authors: Cyril Deguet <asmax@via.ecp.fr>
...@@ -369,8 +369,7 @@ void VlcProc::refreshInput() ...@@ -369,8 +369,7 @@ void VlcProc::refreshInput()
pVarHasAudio->set( audio_es.i_int > 0 ); pVarHasAudio->set( audio_es.i_int > 0 );
// Refresh fullscreen status // Refresh fullscreen status
vout_thread_t *pVout = (vout_thread_t *)vlc_object_find( pInput, vout_thread_t *pVout = input_GetVout( pInput );
VLC_OBJECT_VOUT, FIND_CHILD );
pVarHasVout->set( pVout != NULL ); pVarHasVout->set( pVout != NULL );
if( pVout ) if( pVout )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment