/*****************************************************************************
* vlcproc.cpp
*****************************************************************************
- * Copyright (C) 2003 the VideoLAN team
+ * Copyright (C) 2003-2009 the VideoLAN team
* $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
- * Olivier Teulière <ipkiss@via.ecp.fr>
+ * Olivier Teulière <ipkiss@via.ecp.fr>
+ * Erwan Tulou <erwan10@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/aout.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+#include <vlc_playlist.h>
#include "vlcproc.hpp"
#include "os_factory.hpp"
+#include "os_loop.hpp"
#include "os_timer.hpp"
#include "var_manager.hpp"
+#include "vout_manager.hpp"
#include "theme.hpp"
#include "window_manager.hpp"
#include "../commands/async_queue.hpp"
#include "../commands/cmd_change_skin.hpp"
#include "../commands/cmd_show_window.hpp"
#include "../commands/cmd_quit.hpp"
+#include "../commands/cmd_resize.hpp"
#include "../commands/cmd_vars.hpp"
+#include "../commands/cmd_dialogs.hpp"
+#include "../commands/cmd_update_item.hpp"
+#include "../commands/cmd_audio.hpp"
+#include "../commands/cmd_callbacks.hpp"
#include "../utils/var_bool.hpp"
+#include <sstream>
+#include <assert.h>
VlcProc *VlcProc::instance( intf_thread_t *pIntf )
{
void VlcProc::destroy( intf_thread_t *pIntf )
{
- if( pIntf->p_sys->p_vlcProc )
- {
- delete pIntf->p_sys->p_vlcProc;
- pIntf->p_sys->p_vlcProc = NULL;
- }
+ delete pIntf->p_sys->p_vlcProc;
+ pIntf->p_sys->p_vlcProc = NULL;
}
-VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ), m_pVout( NULL ),
+VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
+ m_varVoutSize( pIntf ), m_varEqBands( pIntf ),
+ m_pVout( NULL ), m_pAout( NULL ), m_bEqualizer_started( false ),
m_cmdManage( this )
{
// Create a timer to poll the status of the vlc
#define REGISTER_VAR( var, type, name ) \
var = VariablePtr( new type( getIntf() ) ); \
pVarManager->registerVar( var, name );
- REGISTER_VAR( m_cPlaylist, Playlist, "playlist" )
- pVarManager->registerVar( getPlaylistVar().getPositionVarPtr(),
- "playlist.slider" );
REGISTER_VAR( m_cVarRandom, VarBoolImpl, "playlist.isRandom" )
REGISTER_VAR( m_cVarLoop, VarBoolImpl, "playlist.isLoop" )
REGISTER_VAR( m_cVarRepeat, VarBoolImpl, "playlist.isRepeat" )
- REGISTER_VAR( m_cVarTime, StreamTime, "time" )
- REGISTER_VAR( m_cVarVolume, Volume, "volume" )
- REGISTER_VAR( m_cVarMute, VarBoolImpl, "vlc.isMute" )
+ REGISTER_VAR( m_cPlaytree, Playtree, "playtree" )
+ pVarManager->registerVar( getPlaytreeVar().getPositionVarPtr(),
+ "playtree.slider" );
+ pVarManager->registerVar( m_cVarRandom, "playtree.isRandom" );
+ pVarManager->registerVar( m_cVarLoop, "playtree.isLoop" );
+
REGISTER_VAR( m_cVarPlaying, VarBoolImpl, "vlc.isPlaying" )
REGISTER_VAR( m_cVarStopped, VarBoolImpl, "vlc.isStopped" )
REGISTER_VAR( m_cVarPaused, VarBoolImpl, "vlc.isPaused" )
+
+ /* Input variables */
+ pVarManager->registerVar( m_cVarRepeat, "playtree.isRepeat" );
+ REGISTER_VAR( m_cVarTime, StreamTime, "time" )
REGISTER_VAR( m_cVarSeekable, VarBoolImpl, "vlc.isSeekable" )
+ REGISTER_VAR( m_cVarDvdActive, VarBoolImpl, "dvd.isActive" )
+
+ REGISTER_VAR( m_cVarRecordable, VarBoolImpl, "vlc.canRecord" )
+ REGISTER_VAR( m_cVarRecording, VarBoolImpl, "vlc.isRecording" )
+
+ /* Vout variables */
+ REGISTER_VAR( m_cVarFullscreen, VarBoolImpl, "vlc.isFullscreen" )
+ REGISTER_VAR( m_cVarHasVout, VarBoolImpl, "vlc.hasVout" )
+
+ /* Aout variables */
+ REGISTER_VAR( m_cVarHasAudio, VarBoolImpl, "vlc.hasAudio" )
+ REGISTER_VAR( m_cVarVolume, Volume, "volume" )
+ REGISTER_VAR( m_cVarMute, VarBoolImpl, "vlc.isMute" )
+ REGISTER_VAR( m_cVarEqualizer, VarBoolImpl, "equalizer.isEnabled" )
+ REGISTER_VAR( m_cVarEqPreamp, EqualizerPreamp, "equalizer.preamp" )
+
#undef REGISTER_VAR
m_cVarStreamName = VariablePtr( new VarText( getIntf(), false ) );
pVarManager->registerVar( m_cVarStreamName, "streamName" );
m_cVarStreamURI = VariablePtr( new VarText( getIntf(), false ) );
pVarManager->registerVar( m_cVarStreamURI, "streamURI" );
+ m_cVarStreamBitRate = VariablePtr( new VarText( getIntf(), false ) );
+ pVarManager->registerVar( m_cVarStreamBitRate, "bitrate" );
+ m_cVarStreamSampleRate = VariablePtr( new VarText( getIntf(), false ) );
+ pVarManager->registerVar( m_cVarStreamSampleRate, "samplerate" );
+
+ // Register the equalizer bands
+ for( int i = 0; i < EqualizerBands::kNbBands; i++)
+ {
+ stringstream ss;
+ ss << "equalizer.band(" << i << ")";
+ pVarManager->registerVar( m_varEqBands.getBand( i ), ss.str() );
+ }
// XXX WARNING XXX
// The object variable callbacks are called from other VLC threads,
// so they must put commands in the queue and NOT do anything else
// (X11 calls are not reentrant)
+#define ADD_CALLBACK( p_object, var ) \
+ var_AddCallback( p_object, var, onGenericCallback, this );
+
+ ADD_CALLBACK( pIntf->p_libvlc, "volume-change" )
+ ADD_CALLBACK( pIntf->p_libvlc, "intf-show" )
+
+ ADD_CALLBACK( pIntf->p_sys->p_playlist, "item-current" )
+ ADD_CALLBACK( pIntf->p_sys->p_playlist, "random" )
+ ADD_CALLBACK( pIntf->p_sys->p_playlist, "loop" )
+ ADD_CALLBACK( pIntf->p_sys->p_playlist, "repeat" )
+
+#undef ADD_CALLBACK
+
// Called when the playlist changes
var_AddCallback( pIntf->p_sys->p_playlist, "intf-change",
onIntfChange, this );
// Called when a playlist item is added
- // TODO: properly handle item-append
- var_AddCallback( pIntf->p_sys->p_playlist, "item-append",
- onIntfChange, this );
+ var_AddCallback( pIntf->p_sys->p_playlist, "playlist-item-append",
+ onItemAppend, this );
// Called when a playlist item is deleted
// TODO: properly handle item-deleted
- var_AddCallback( pIntf->p_sys->p_playlist, "item-deleted",
- onIntfChange, this );
- // Called when the "interface shower" wants us to show the skin
- var_AddCallback( pIntf->p_sys->p_playlist, "intf-show",
- onIntfShow, this );
- // Called when the current played item changes
- var_AddCallback( pIntf->p_sys->p_playlist, "playlist-current",
- onPlaylistChange, this );
+ var_AddCallback( pIntf->p_sys->p_playlist, "playlist-item-deleted",
+ onItemDelete, this );
+ // Called when the current input changes
+ var_AddCallback( pIntf->p_sys->p_playlist, "input-current",
+ onInputNew, this );
// Called when a playlist item changed
var_AddCallback( pIntf->p_sys->p_playlist, "item-change",
onItemChange, this );
// Called when our skins2 demux wants us to load a new skin
var_AddCallback( pIntf, "skin-to-load", onSkinToLoad, this );
- // Callbacks for vout requests
- getIntf()->pf_request_window = &getWindow;
- getIntf()->pf_release_window = &releaseWindow;
- getIntf()->pf_control_window = &controlWindow;
+ // Called when we have an interaction dialog to display
+ var_Create( pIntf, "interaction", VLC_VAR_ADDRESS );
+ var_AddCallback( pIntf, "interaction", onInteraction, this );
+ interaction_Register( pIntf );
- getIntf()->p_sys->p_input = NULL;
+ // initialize variables refering to liblvc and playlist objects
+ init_variables();
}
{
m_pTimer->stop();
delete( m_pTimer );
- if( getIntf()->p_sys->p_input )
+
+ if( m_pAout )
{
- vlc_object_release( getIntf()->p_sys->p_input );
+ vlc_object_release( m_pAout );
+ m_pAout = NULL;
}
+ if( m_pVout )
+ {
+ vlc_object_release( m_pVout );
+ m_pVout = NULL;
+ }
+
+ interaction_Unregister( getIntf() );
+
+ var_DelCallback( getIntf()->p_libvlc, "volume-change",
+ onGenericCallback, this );
+ var_DelCallback( getIntf()->p_libvlc, "intf-show",
+ onGenericCallback, this );
- // Callbacks for vout requests
- getIntf()->pf_request_window = NULL;
- getIntf()->pf_release_window = NULL;
- getIntf()->pf_control_window = NULL;
+ var_DelCallback( getIntf()->p_sys->p_playlist, "item-current",
+ onGenericCallback, this );
+ var_DelCallback( getIntf()->p_sys->p_playlist, "random",
+ onGenericCallback, this );
+ var_DelCallback( getIntf()->p_sys->p_playlist, "loop",
+ onGenericCallback, this );
+ var_DelCallback( getIntf()->p_sys->p_playlist, "repeat",
+ onGenericCallback, this );
var_DelCallback( getIntf()->p_sys->p_playlist, "intf-change",
onIntfChange, this );
- var_DelCallback( getIntf()->p_sys->p_playlist, "item-append",
- onIntfChange, this );
- var_DelCallback( getIntf()->p_sys->p_playlist, "item-deleted",
- onIntfChange, this );
- var_DelCallback( getIntf()->p_sys->p_playlist, "intf-show",
- onIntfShow, this );
- var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-current",
- onPlaylistChange, this );
+ var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-item-append",
+ onItemAppend, this );
+ var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-item-deleted",
+ onItemDelete, this );
+ var_DelCallback( getIntf()->p_sys->p_playlist, "input-current",
+ onInputNew, this );
var_DelCallback( getIntf()->p_sys->p_playlist, "item-change",
onItemChange, this );
var_DelCallback( getIntf(), "skin-to-load", onSkinToLoad, this );
+ var_DelCallback( getIntf(), "interaction", onInteraction, this );
}
-
-void VlcProc::registerVoutWindow( void *pVoutWindow )
+void VlcProc::manage()
{
- m_handleSet.insert( pVoutWindow );
- // Reparent the vout window
- if( m_pVout )
+ // Did the user request to quit vlc ?
+ if( !vlc_object_alive( getIntf() ) )
{
- if( vout_Control( m_pVout, VOUT_REPARENT ) != VLC_SUCCESS )
- vout_Control( m_pVout, VOUT_CLOSE );
- }
-}
+ // Get the instance of OSFactory
+ OSFactory *pOsFactory = OSFactory::instance( getIntf() );
+ // Exit the main OS loop
+ pOsFactory->getOSLoop()->exit();
-void VlcProc::unregisterVoutWindow( void *pVoutWindow )
-{
- m_handleSet.erase( pVoutWindow );
+ return;
+ }
}
-
-void VlcProc::dropVout()
+void VlcProc::CmdManage::execute()
{
- if( m_pVout )
- {
- if( vout_Control( m_pVout, VOUT_REPARENT ) != VLC_SUCCESS )
- vout_Control( m_pVout, VOUT_CLOSE );
- m_pVout = NULL;
- }
+ // Just forward to VlcProc
+ m_pParent->manage();
}
-void VlcProc::manage()
+int VlcProc::onIntfChange( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldVal, vlc_value_t newVal,
+ void *pParam )
{
- // Did the user requested to quit vlc ?
- if( getIntf()->b_die || getIntf()->p_vlc->b_die )
- {
- CmdQuit *pCmd = new CmdQuit( getIntf() );
- AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
- pQueue->push( CmdGenericPtr( pCmd ) );
- }
-
- // Get the VLC variables
- StreamTime *pTime = (StreamTime*)m_cVarTime.get();
- Volume *pVolume = (Volume*)m_cVarVolume.get();
- VarBoolImpl *pVarPlaying = (VarBoolImpl*)m_cVarPlaying.get();
- VarBoolImpl *pVarStopped = (VarBoolImpl*)m_cVarStopped.get();
- VarBoolImpl *pVarPaused = (VarBoolImpl*)m_cVarPaused.get();
- VarBoolImpl *pVarSeekable = (VarBoolImpl*)m_cVarSeekable.get();
- VarBoolImpl *pVarMute = (VarBoolImpl*)m_cVarMute.get();
- VarBoolImpl *pVarRandom = (VarBoolImpl*)m_cVarRandom.get();
- VarBoolImpl *pVarLoop = (VarBoolImpl*)m_cVarLoop.get();
- VarBoolImpl *pVarRepeat = (VarBoolImpl*)m_cVarRepeat.get();
-
- // Refresh sound volume
- audio_volume_t volume;
- aout_VolumeGet( getIntf(), &volume );
- pVolume->set( (double)volume * 2.0 / AOUT_VOLUME_MAX );
- // Set the mute variable
- pVarMute->set( volume == 0 );
+ VlcProc *pThis = (VlcProc*)pParam;
- // Update the input
- if( getIntf()->p_sys->p_input == NULL )
- {
- getIntf()->p_sys->p_input = (input_thread_t *)vlc_object_find(
- getIntf(), VLC_OBJECT_INPUT, FIND_ANYWHERE );
- }
- else if( getIntf()->p_sys->p_input->b_dead )
- {
- vlc_object_release( getIntf()->p_sys->p_input );
- getIntf()->p_sys->p_input = NULL;
- }
+ // Update the stream variable
+ pThis->updateStreamName();
- input_thread_t *pInput = getIntf()->p_sys->p_input;
+ // Create a playtree notify command (for new style playtree)
+ CmdPlaytreeChanged *pCmdTree = new CmdPlaytreeChanged( pThis->getIntf() );
- if( pInput && !pInput->b_die )
- {
- // Refresh time variables
- vlc_value_t pos;
- var_Get( pInput, "position", &pos );
- pTime->set( pos.f_float, false );
+ // Push the command in the asynchronous command queue
+ AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
+ pQueue->push( CmdGenericPtr( pCmdTree ) );
- // Get the status of the playlist
- playlist_status_t status =
- getIntf()->p_sys->p_playlist->status.i_status;
+ return VLC_SUCCESS;
+}
- pVarPlaying->set( status == PLAYLIST_RUNNING );
- pVarStopped->set( status == PLAYLIST_STOPPED );
- pVarPaused->set( status == PLAYLIST_PAUSED );
- pVarSeekable->set( pos.f_float != 0.0 );
- }
- else
- {
- pVarPlaying->set( false );
- pVarPaused->set( false );
- pVarStopped->set( true );
- pVarSeekable->set( false );
- pTime->set( 0, false );
- }
- // Refresh the random variable
- vlc_value_t val;
- var_Get( getIntf()->p_sys->p_playlist, "random", &val );
- pVarRandom->set( val.b_bool != 0 );
+int VlcProc::onInputNew( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldval, vlc_value_t newval, void *pParam )
+{
+ VlcProc *pThis = (VlcProc*)pParam;
+ input_thread_t *pInput = static_cast<input_thread_t*>(newval.p_address);
- // Refresh the loop variable
- var_Get( getIntf()->p_sys->p_playlist, "loop", &val );
- pVarLoop->set( val.b_bool != 0 );
+ var_AddCallback( pInput, "intf-event", onGenericCallback, pThis );
+ var_AddCallback( pInput, "bit-rate", onGenericCallback, pThis );
+ var_AddCallback( pInput, "sample-rate", onGenericCallback, pThis );
+ var_AddCallback( pInput, "can-record", onGenericCallback, pThis );
- // Refresh the repeat variable
- var_Get( getIntf()->p_sys->p_playlist, "repeat", &val );
- pVarRepeat->set( val.b_bool != 0 );
+ return VLC_SUCCESS;
}
-void VlcProc::CmdManage::execute()
+int VlcProc::onItemChange( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *pParam )
{
- // Just forward to VlcProc
- m_pParent->manage();
-}
+ VlcProc *pThis = (VlcProc*)pParam;
+ input_item_t *p_item = static_cast<input_item_t*>(newval.p_address);
+
+ // Update the stream variable
+ pThis->updateStreamName();
+ // Create a playtree notify command
+ CmdPlaytreeUpdate *pCmdTree = new CmdPlaytreeUpdate( pThis->getIntf(),
+ p_item->i_id );
-int VlcProc::onIntfChange( vlc_object_t *pObj, const char *pVariable,
+ // Push the command in the asynchronous command queue
+ AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
+ pQueue->push( CmdGenericPtr( pCmdTree ), true );
+
+ return VLC_SUCCESS;
+}
+
+int VlcProc::onItemAppend( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
VlcProc *pThis = (VlcProc*)pParam;
- // Update the stream variable
- playlist_t *p_playlist = (playlist_t*)pObj;
- pThis->updateStreamName(p_playlist);
+ playlist_add_t *p_add = (playlist_add_t*)malloc( sizeof(
+ playlist_add_t ) ) ;
- // Create a playlist notify command
- CmdNotifyPlaylist *pCmd = new CmdNotifyPlaylist( pThis->getIntf() );
+ memcpy( p_add, newVal.p_address, sizeof( playlist_add_t ) ) ;
+
+ CmdGenericPtr ptrTree;
+ CmdPlaytreeAppend *pCmdTree = new CmdPlaytreeAppend( pThis->getIntf(),
+ p_add );
+ ptrTree = CmdGenericPtr( pCmdTree );
// Push the command in the asynchronous command queue
AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
- pQueue->remove( "notify playlist" );
- pQueue->push( CmdGenericPtr( pCmd ) );
+ pQueue->push( ptrTree , false );
return VLC_SUCCESS;
}
-
-int VlcProc::onIntfShow( vlc_object_t *pObj, const char *pVariable,
- vlc_value_t oldVal, vlc_value_t newVal,
- void *pParam )
+int VlcProc::onItemDelete( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldVal, vlc_value_t newVal,
+ void *pParam )
{
- if (newVal.i_int)
- {
- VlcProc *pThis = (VlcProc*)pParam;
+ VlcProc *pThis = (VlcProc*)pParam;
- // Create a raise all command
- CmdRaiseAll *pCmd = new CmdRaiseAll( pThis->getIntf(),
- pThis->getIntf()->p_sys->p_theme->getWindowManager() );
+ int i_id = newVal.i_int;
- // Push the command in the asynchronous command queue
- AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
- pQueue->remove( "raise all windows" );
- pQueue->push( CmdGenericPtr( pCmd ) );
- }
+ CmdGenericPtr ptrTree;
+ CmdPlaytreeDelete *pCmdTree = new CmdPlaytreeDelete( pThis->getIntf(),
+ i_id);
+ ptrTree = CmdGenericPtr( pCmdTree );
+
+ // Push the command in the asynchronous command queue
+ AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
+ pQueue->push( ptrTree , false );
return VLC_SUCCESS;
}
-int VlcProc::onItemChange( vlc_object_t *pObj, const char *pVariable,
+int VlcProc::onSkinToLoad( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
VlcProc *pThis = (VlcProc*)pParam;
- // Update the stream variable
- playlist_t *p_playlist = (playlist_t*)pObj;
- pThis->updateStreamName(p_playlist);
-
// Create a playlist notify command
- // TODO: selective update
- CmdNotifyPlaylist *pCmd = new CmdNotifyPlaylist( pThis->getIntf() );
+ CmdChangeSkin *pCmd =
+ new CmdChangeSkin( pThis->getIntf(), newVal.psz_string );
// Push the command in the asynchronous command queue
AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
- pQueue->remove( "notify playlist" );
pQueue->push( CmdGenericPtr( pCmd ) );
return VLC_SUCCESS;
}
-
-int VlcProc::onPlaylistChange( vlc_object_t *pObj, const char *pVariable,
- vlc_value_t oldVal, vlc_value_t newVal,
- void *pParam )
+int VlcProc::onInteraction( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldVal, vlc_value_t newVal,
+ void *pParam )
{
VlcProc *pThis = (VlcProc*)pParam;
+ interaction_dialog_t *p_dialog = (interaction_dialog_t *)(newVal.p_address);
+ CmdInteraction *pCmd = new CmdInteraction( pThis->getIntf(), p_dialog );
AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ return VLC_SUCCESS;
+}
- // Update the stream variable
- playlist_t *p_playlist = (playlist_t*)pObj;
- pThis->updateStreamName(p_playlist);
- // Create a playlist notify command
- // TODO: selective update
- CmdNotifyPlaylist *pCmd = new CmdNotifyPlaylist( pThis->getIntf() );
+void VlcProc::updateStreamName()
+{
+ // Create a update item command
+ CmdUpdateItem *pCmdItem = new CmdUpdateItem( getIntf(), getStreamNameVar(), getStreamURIVar() );
// Push the command in the asynchronous command queue
- pQueue->remove( "notify playlist" );
+ AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
+ pQueue->push( CmdGenericPtr( pCmdItem ) );
+}
+
+int VlcProc::onEqBandsChange( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldVal, vlc_value_t newVal,
+ void *pParam )
+{
+ VlcProc *pThis = (VlcProc*)pParam;
+
+ // Post a set equalizer bands command
+ CmdSetEqBands *pCmd = new CmdSetEqBands( pThis->getIntf(),
+ pThis->m_varEqBands,
+ newVal.psz_string );
+ AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
pQueue->push( CmdGenericPtr( pCmd ) );
return VLC_SUCCESS;
}
-int VlcProc::onSkinToLoad( vlc_object_t *pObj, const char *pVariable,
- vlc_value_t oldVal, vlc_value_t newVal,
- void *pParam )
+int VlcProc::onEqPreampChange( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldVal, vlc_value_t newVal,
+ void *pParam )
{
VlcProc *pThis = (VlcProc*)pParam;
+ EqualizerPreamp *pVarPreamp = (EqualizerPreamp*)(pThis->m_cVarEqPreamp.get());
- // Create a playlist notify command
- CmdChangeSkin *pCmd =
- new CmdChangeSkin( pThis->getIntf(), newVal.psz_string );
-
- // Push the command in the asynchronous command queue
+ // Post a set preamp command
+ CmdSetEqPreamp *pCmd = new CmdSetEqPreamp( pThis->getIntf(), *pVarPreamp,
+ (newVal.f_float + 20.0) / 40.0 );
AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
- pQueue->remove( "change skin" );
pQueue->push( CmdGenericPtr( pCmd ) );
return VLC_SUCCESS;
}
-void VlcProc::updateStreamName( playlist_t *p_playlist )
+int VlcProc::onGenericCallback( vlc_object_t *pObj, const char *pVariable,
+ vlc_value_t oldVal, vlc_value_t newVal,
+ void *pParam )
+{
+ VlcProc *pThis = (VlcProc*)pParam;
+ AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
+
+ CmdGeneric *pCmd = NULL;
+
+#define ADD_CALLBACK_ENTRY( var, label ) \
+ { \
+ if( strcmp( pVariable, var ) == 0 ) \
+ pCmd = new Cmd_##label( pThis->getIntf(), pObj, newVal ); \
+ }
+
+ ADD_CALLBACK_ENTRY( "item-current", item_current_changed )
+ ADD_CALLBACK_ENTRY( "volume-change", volume_changed )
+
+ ADD_CALLBACK_ENTRY( "intf-event", intf_event_changed )
+ ADD_CALLBACK_ENTRY( "bit-rate", bit_rate_changed )
+ ADD_CALLBACK_ENTRY( "sample-rate", sample_rate_changed )
+ ADD_CALLBACK_ENTRY( "can-record", can_record_changed )
+
+ ADD_CALLBACK_ENTRY( "random", random_changed )
+ ADD_CALLBACK_ENTRY( "loop", loop_changed )
+ ADD_CALLBACK_ENTRY( "repeat", repeat_changed )
+
+ ADD_CALLBACK_ENTRY( "audio-filter", audio_filter_changed )
+
+ ADD_CALLBACK_ENTRY( "intf-show", intf_show_changed )
+
+#undef ADD_CALLBACK_ENTRY
+
+ if( pCmd )
+ pQueue->push( CmdGenericPtr( pCmd ), false );
+ else
+ msg_Err( pObj, "no Callback entry provided for %s", pVariable );
+
+ return VLC_SUCCESS;
+}
+
+void VlcProc::on_item_current_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ input_item_t *p_item = static_cast<input_item_t*>(newVal.p_address);
+
+ // Update the stream variable
+ updateStreamName();
+
+ // Create a playtree notify command
+ AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
+ CmdPlaytreeUpdate *pCmdTree =
+ new CmdPlaytreeUpdate( getIntf(), p_item->i_id );
+ pQueue->push( CmdGenericPtr( pCmdTree ) , true );
+}
+
+#define SET_BOOL(m,v) ((VarBoolImpl*)(m).get())->set(v)
+#define SET_STREAMTIME(m,v,b) ((StreamTime*)(m).get())->set(v,b)
+#define SET_TEXT(m,v) ((VarText*)(m).get())->set(v)
+#define SET_VOLUME(m,v,b) ((Volume*)(m).get())->set(v,b)
+
+void VlcProc::on_intf_event_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
- if( p_playlist->p_input )
+ input_thread_t* pInput = (input_thread_t*) p_obj;
+
+ assert( getIntf()->p_sys->p_input == NULL || getIntf()->p_sys->p_input == pInput );
+
+ if( !getIntf()->p_sys->p_input )
{
- VarText &rStreamName = getStreamNameVar();
- VarText &rStreamURI = getStreamURIVar();
- // XXX: we should not need to access p_input->psz_source directly, a
- // getter should be provided by VLC core
- string name = p_playlist->p_input->input.p_item->psz_name;
- // XXX: This should be done in VLC core, not here...
- // Remove path information if any
- OSFactory *pFactory = OSFactory::instance( getIntf() );
- string::size_type pos = name.rfind( pFactory->getDirSeparator() );
- if( pos != string::npos )
+ msg_Dbg( getIntf(), "new input %p detected", pInput );
+
+ getIntf()->p_sys->p_input = pInput;
+ vlc_object_hold( pInput );
+ }
+
+ switch( newVal.i_int )
+ {
+ case INPUT_EVENT_STATE:
+ {
+ int state = var_GetInteger( pInput, "state" );
+ SET_BOOL( m_cVarStopped, false );
+ SET_BOOL( m_cVarPlaying, state != PAUSE_S );
+ SET_BOOL( m_cVarPaused, state == PAUSE_S );
+ break;
+ }
+
+ case INPUT_EVENT_POSITION:
+ {
+ float pos = var_GetFloat( pInput, "position" );
+ SET_STREAMTIME( m_cVarTime, pos, false );
+ SET_BOOL( m_cVarSeekable, pos != 0.0 );
+ break;
+ }
+
+ case INPUT_EVENT_ES:
+ {
+ // Do we have audio
+ vlc_value_t audio_es;
+ var_Change( pInput, "audio-es", VLC_VAR_CHOICESCOUNT,
+ &audio_es, NULL );
+ SET_BOOL( m_cVarHasAudio, audio_es.i_int > 0 );
+ break;
+ }
+
+ case INPUT_EVENT_VOUT:
{
- name = name.substr( pos + 1, name.size() - pos + 1 );
+ vout_thread_t* pVout = input_GetVout( pInput );
+ SET_BOOL( m_cVarHasVout, pVout != NULL );
+ if( pVout )
+ {
+ SET_BOOL( m_cVarFullscreen,
+ var_GetBool( pVout, "fullscreen" ) );
+ vlc_object_release( pVout );
+ }
+ break;
}
- UString srcName( getIntf(), name.c_str() );
- UString srcURI( getIntf(),
- p_playlist->p_input->input.p_item->psz_uri );
-
- // Create commands to update the stream variables
- CmdSetText *pCmd1 = new CmdSetText( getIntf(), rStreamName, srcName );
- CmdSetText *pCmd2 = new CmdSetText( getIntf(), rStreamURI, srcURI );
- // Push the commands in the asynchronous command queue
- AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
- pQueue->push( CmdGenericPtr( pCmd1 ) );
- pQueue->push( CmdGenericPtr( pCmd2 ) );
+
+ case INPUT_EVENT_AOUT:
+ {
+ aout_instance_t* pAout = input_GetAout( pInput );
+
+ // end of input or aout reuse (nothing to do)
+ if( !pAout || pAout == m_pAout )
+ {
+ if( pAout )
+ vlc_object_release( pAout );
+ break;
+ }
+
+ // remove previous Aout if any
+ if( m_pAout )
+ {
+ var_DelCallback( m_pAout, "audio-filter",
+ onGenericCallback, this );
+ if( m_bEqualizer_started )
+ {
+ var_DelCallback( m_pAout, "equalizer-bands",
+ onEqBandsChange, this );
+ var_DelCallback( m_pAout, "equalizer-preamp",
+ onEqPreampChange, this );
+ }
+ vlc_object_release( m_pAout );
+ m_pAout = NULL;
+ m_bEqualizer_started = false;
+ }
+
+ // New Aout (addCallbacks)
+ var_AddCallback( pAout, "audio-filter", onGenericCallback, this );
+
+ char *pFilters = var_GetNonEmptyString( pAout, "audio-filter" );
+ bool b_equalizer = pFilters && strstr( pFilters, "equalizer" );
+ free( pFilters );
+ SET_BOOL( m_cVarEqualizer, b_equalizer );
+ if( b_equalizer )
+ {
+ var_AddCallback( pAout, "equalizer-bands",
+ onEqBandsChange, this );
+ var_AddCallback( pAout, "equalizer-preamp",
+ onEqPreampChange, this );
+ m_bEqualizer_started = true;
+ }
+ m_pAout = pAout;
+ break;
+ }
+
+ case INPUT_EVENT_CHAPTER:
+ {
+ vlc_value_t chapters_count;
+ var_Change( pInput, "chapter", VLC_VAR_CHOICESCOUNT,
+ &chapters_count, NULL );
+ SET_BOOL( m_cVarDvdActive, chapters_count.i_int > 0 );
+ break;
+ }
+
+ case INPUT_EVENT_RECORD:
+ SET_BOOL( m_cVarRecording, var_GetBool( pInput, "record" ) );
+ break;
+
+ case INPUT_EVENT_DEAD:
+ msg_Dbg( getIntf(), "end of input detected for %p", pInput );
+
+ var_DelCallback( pInput, "intf-event", onGenericCallback, this );
+ var_DelCallback( pInput, "bit-rate", onGenericCallback, this );
+ var_DelCallback( pInput, "sample-rate", onGenericCallback, this );
+ var_DelCallback( pInput, "can-record" , onGenericCallback, this );
+ vlc_object_release( pInput );
+ getIntf()->p_sys->p_input = NULL;
+ reset_input();
+ break;
+
+ default:
+ break;
}
}
+void VlcProc::on_bit_rate_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ input_thread_t* pInput = (input_thread_t*) p_obj;
+
+ assert( getIntf()->p_sys->p_input == NULL || getIntf()->p_sys->p_input == pInput );
+
+ int bitrate = var_GetInteger( pInput, "bit-rate" ) / 1000;
+ SET_TEXT( m_cVarStreamBitRate, UString::fromInt( getIntf(), bitrate ) );
+}
+
+void VlcProc::on_sample_rate_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ input_thread_t* pInput = (input_thread_t*) p_obj;
+
+ assert( getIntf()->p_sys->p_input == NULL || getIntf()->p_sys->p_input == pInput );
+
+ int sampleRate = var_GetInteger( pInput, "sample-rate" ) / 1000;
+ SET_TEXT( m_cVarStreamSampleRate, UString::fromInt(getIntf(),sampleRate) );
+}
+
+void VlcProc::on_can_record_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ input_thread_t* pInput = (input_thread_t*) p_obj;
+
+ assert( getIntf()->p_sys->p_input == NULL || getIntf()->p_sys->p_input == pInput );
+
+ SET_BOOL( m_cVarRecordable, var_GetBool( pInput, "can-record" ) );
+}
+
+void VlcProc::on_random_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ playlist_t* pPlaylist = (playlist_t*) p_obj;
+
+ SET_BOOL( m_cVarRandom, var_GetBool( pPlaylist, "random" ) );
+}
+
+void VlcProc::on_loop_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ playlist_t* pPlaylist = (playlist_t*) p_obj;
+
+ SET_BOOL( m_cVarLoop, var_GetBool( pPlaylist, "loop" ) );
+}
+
+void VlcProc::on_repeat_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ playlist_t* pPlaylist = (playlist_t*) p_obj;
+
+ SET_BOOL( m_cVarRepeat, var_GetBool( pPlaylist, "repeat" ) );
+}
+
+void VlcProc::on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ (void)p_obj; (void)newVal;
+ playlist_t* pPlaylist = getIntf()->p_sys->p_playlist;
+
+ audio_volume_t volume;
+ aout_VolumeGet( pPlaylist, &volume );
+ SET_VOLUME( m_cVarVolume, (double)volume * 2.0 / AOUT_VOLUME_MAX, false );
+ SET_BOOL( m_cVarMute, volume == 0 );
+}
-void *VlcProc::getWindow( intf_thread_t *pIntf, vout_thread_t *pVout,
- int *pXHint, int *pYHint,
- unsigned int *pWidthHint,
- unsigned int *pHeightHint )
+void VlcProc::on_audio_filter_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
- VlcProc *pThis = pIntf->p_sys->p_vlcProc;
- pThis->m_pVout = pVout;
- if( pThis->m_handleSet.empty() )
+ aout_instance_t* pAout = (aout_instance_t*) p_obj;
+
+ char *pFilters = newVal.psz_string;
+
+ bool b_equalizer = pFilters && strstr( pFilters, "equalizer" );
+ SET_BOOL( m_cVarEqualizer, b_equalizer );
+ if( b_equalizer && !m_bEqualizer_started )
{
- return NULL;
+ var_AddCallback( pAout, "equalizer-bands", onEqBandsChange, this );
+ var_AddCallback( pAout, "equalizer-preamp", onEqPreampChange, this );
+ m_bEqualizer_started = true;
+ }
+}
+
+void VlcProc::on_intf_show_changed( vlc_object_t* p_obj, vlc_value_t newVal )
+{
+ (void)p_obj;
+ bool b_fullscreen = getFullscreenVar().get();
+
+ if( !b_fullscreen )
+ {
+ if( newVal.b_bool )
+ {
+ // Create a raise all command
+ CmdRaiseAll *pCmd = new CmdRaiseAll( getIntf(),
+ getIntf()->p_sys->p_theme->getWindowManager() );
+
+ // Push the command in the asynchronous command queue
+ AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ }
}
else
{
- return *pThis->m_handleSet.begin();
+ Theme* pTheme = getIntf()->p_sys->p_theme;
+ TopWindow *pWin = pTheme->getWindowById( "fullscreenController" );
+ if( pWin )
+ {
+ bool b_visible = pWin->getVisibleVar().get();
+ AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
+
+ if( !b_visible )
+ {
+ CmdShowWindow* pCmd = new CmdShowWindow( getIntf(),
+ getIntf()->p_sys->p_theme->getWindowManager(),
+ *pWin );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ }
+ else
+ {
+ CmdHideWindow* pCmd = new CmdHideWindow( getIntf(),
+ getIntf()->p_sys->p_theme->getWindowManager(),
+ *pWin );
+ pQueue->push( CmdGenericPtr( pCmd ) );
+ }
+ }
}
}
+void VlcProc::reset_input()
+{
+ SET_BOOL( m_cVarSeekable, false );
+ SET_BOOL( m_cVarRecordable, false );
+ SET_BOOL( m_cVarRecording, false );
+ SET_BOOL( m_cVarDvdActive, false );
+ SET_BOOL( m_cVarFullscreen, false );
+ SET_BOOL( m_cVarHasAudio, false );
+ SET_BOOL( m_cVarHasVout, false );
+ SET_BOOL( m_cVarStopped, true );
+ SET_BOOL( m_cVarPlaying, false );
+ SET_BOOL( m_cVarPaused, false );
+
+ SET_STREAMTIME( m_cVarTime, 0, false );
+ SET_TEXT( m_cVarStreamBitRate, UString( getIntf(), "") );
+ SET_TEXT( m_cVarStreamSampleRate, UString( getIntf(), "") );
+}
-void VlcProc::releaseWindow( intf_thread_t *pIntf, void *pWindow )
+void VlcProc::init_variables()
{
- VlcProc *pThis = pIntf->p_sys->p_vlcProc;
- pThis->m_pVout = NULL;
+ playlist_t* pPlaylist = getIntf()->p_sys->p_playlist;
+
+ SET_BOOL( m_cVarRandom, var_GetBool( pPlaylist, "random" ) );
+ SET_BOOL( m_cVarLoop, var_GetBool( pPlaylist, "loop" ) );
+ SET_BOOL( m_cVarRepeat, var_GetBool( pPlaylist, "repeat" ) );
+
+ audio_volume_t volume;
+ aout_VolumeGet( pPlaylist, &volume );
+ SET_VOLUME( m_cVarVolume, (double)volume * 2.0 / AOUT_VOLUME_MAX, false );
+ SET_BOOL( m_cVarMute, volume == 0 );
+
+ update_equalizer();
}
+void VlcProc::update_equalizer()
+{
+
+ char *pFilters;
+ if( m_pAout )
+ pFilters = var_GetNonEmptyString( m_pAout, "audio-filter" );
+ else
+ pFilters = config_GetPsz( getIntf(), "audio-filter" );
+
+ bool b_equalizer = pFilters && strstr( pFilters, "equalizer" );
+ free( pFilters );
-int VlcProc::controlWindow( intf_thread_t *pIntf, void *pWindow,
- int query, va_list args )
+ SET_BOOL( m_cVarEqualizer, b_equalizer );
+}
+
+void VlcProc::setFullscreenVar( bool b_fullscreen )
{
- return VLC_SUCCESS;
+ SET_BOOL( m_cVarFullscreen, b_fullscreen );
}
+#undef SET_BOOL
+#undef SET_STREAMTIME
+#undef SET_TEXT
+#undef SET_VOLUME