From 54d75f772ba75e1f318bdeecc874f02b9b06f840 Mon Sep 17 00:00:00 2001 From: Cyril Deguet Date: Sat, 25 Mar 2006 16:52:16 +0000 Subject: [PATCH] * added a new skin variable "vlc.hasVout", true when... there is a vout ! --- doc/skins/skins2-howto.xml | 3 +++ modules/gui/skins2/src/vlcproc.cpp | 4 ++++ modules/gui/skins2/src/vlcproc.hpp | 1 + 3 files changed, 8 insertions(+) diff --git a/doc/skins/skins2-howto.xml b/doc/skins/skins2-howto.xml index 4c2f3aec0a..f548bc5a96 100644 --- a/doc/skins/skins2-howto.xml +++ b/doc/skins/skins2-howto.xml @@ -939,6 +939,9 @@ difficulty to understand how VLC skins work. equalizer.isEnabled: True if the equalizer audio filter is enabled (since VLC 0.8.5). + + vlc.hasVout: True if a video is being played (since VLC 0.8.5). + vlc.isFullscreen: True when the video is in fullscreen mode (since VLC 0.8.5). diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp index e3f5c05357..125c43bafa 100644 --- a/modules/gui/skins2/src/vlcproc.cpp +++ b/modules/gui/skins2/src/vlcproc.cpp @@ -102,6 +102,7 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ), REGISTER_VAR( m_cVarEqPreamp, EqualizerPreamp, "equalizer.preamp" ) REGISTER_VAR( m_cVarDvdActive, VarBoolImpl, "dvd.isActive" ) REGISTER_VAR( m_cVarFullscreen, VarBoolImpl, "vlc.isFullscreen" ) + REGISTER_VAR( m_cVarHasVout, VarBoolImpl, "vlc.hasVout" ) #undef REGISTER_VAR m_cVarStreamName = VariablePtr( new VarText( getIntf(), false ) ); pVarManager->registerVar( m_cVarStreamName, "streamName" ); @@ -237,6 +238,7 @@ void VlcProc::manage() VarBoolImpl *pVarRepeat = (VarBoolImpl*)m_cVarRepeat.get(); VarBoolImpl *pVarDvdActive = (VarBoolImpl*)m_cVarDvdActive.get(); VarBoolImpl *pVarFullscreen = (VarBoolImpl*)m_cVarFullscreen.get(); + VarBoolImpl *pVarHasVout = (VarBoolImpl*)m_cVarHasVout.get(); // Refresh audio variables refreshAudio(); @@ -282,6 +284,7 @@ void VlcProc::manage() // Refresh fullscreen status vout_thread_t *pVout = (vout_thread_t *)vlc_object_find( pInput, VLC_OBJECT_VOUT, FIND_CHILD ); + pVarHasVout->set( pVout != NULL ); if( pVout ) { pVarFullscreen->set( pVout->b_fullscreen ); @@ -297,6 +300,7 @@ void VlcProc::manage() pVarDvdActive->set( false ); pTime->set( 0, false ); pVarFullscreen->set( false ); + pVarHasVout->set( false ); } // Refresh the random variable diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp index aef2f50a9e..94bf422b0a 100644 --- a/modules/gui/skins2/src/vlcproc.hpp +++ b/modules/gui/skins2/src/vlcproc.hpp @@ -120,6 +120,7 @@ class VlcProc: public SkinObject /// Variables related to the vout VariablePtr m_cVarFullscreen; VarBox m_varVoutSize; + VariablePtr m_cVarHasVout; /// Equalizer variables EqualizerBands m_varEqBands; VariablePtr m_cVarEqPreamp; -- 2.39.2