#include <vlc_common.h>
#include <vlc_aout.h>
+#include <vlc_aout_intf.h>
#include <vlc_vout.h>
#include <vlc_playlist.h>
#include <vlc_url.h>
#define ADD_CALLBACK( p_object, var ) \
var_AddCallback( p_object, var, onGenericCallback, this );
- ADD_CALLBACK( pIntf->p_sys->p_playlist, "volume-change" )
+ ADD_CALLBACK( pIntf->p_sys->p_playlist, "volume" )
ADD_CALLBACK( pIntf->p_libvlc, "intf-show" )
ADD_CALLBACK( pIntf->p_sys->p_playlist, "item-current" )
// 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 );
// initialize variables refering to liblvc and playlist objects
init_variables();
interaction_Unregister( getIntf() );
- var_DelCallback( getIntf()->p_sys->p_playlist, "volume-change",
+ var_DelCallback( getIntf()->p_sys->p_playlist, "volume",
onGenericCallback, this );
var_DelCallback( getIntf()->p_libvlc, "intf-show",
onGenericCallback, this );
int VlcProc::onInputNew( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldval, vlc_value_t newval, void *pParam )
{
+ (void)pObj; (void)pVariable; (void)oldval;
VlcProc *pThis = (VlcProc*)pParam;
input_thread_t *pInput = static_cast<input_thread_t*>(newval.p_address);
vlc_value_t oldval, vlc_value_t newval,
void *pParam )
{
+ (void)pObj; (void)pVariable; (void)oldval;
VlcProc *pThis = (VlcProc*)pParam;
input_item_t *p_item = static_cast<input_item_t*>(newval.p_address);
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
+ (void)pObj; (void)pVariable; (void)oldVal;
VlcProc *pThis = (VlcProc*)pParam;
playlist_add_t *p_add = static_cast<playlist_add_t*>(newVal.p_address);
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
+ (void)pObj; (void)pVariable; (void)oldVal;
VlcProc *pThis = (VlcProc*)pParam;
int i_id = newVal.i_int;
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
+ (void)pObj; (void)pVariable; (void)oldVal;
VlcProc *pThis = (VlcProc*)pParam;
interaction_dialog_t *p_dialog = (interaction_dialog_t *)(newVal.p_address);
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
+ (void)pObj; (void)pVariable; (void)oldVal;
VlcProc *pThis = (VlcProc*)pParam;
// Post a set equalizer bands command
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
+ (void)pObj; (void)pVariable; (void)oldVal;
VlcProc *pThis = (VlcProc*)pParam;
EqualizerPreamp *pVarPreamp = (EqualizerPreamp*)(pThis->m_cVarEqPreamp.get());
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
+ (void)oldVal;
VlcProc *pThis = (VlcProc*)pParam;
AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
}
ADD_CALLBACK_ENTRY( "item-current", on_item_current_changed, false )
- ADD_CALLBACK_ENTRY( "volume-change", on_volume_changed, true )
+ ADD_CALLBACK_ENTRY( "volume", on_volume_changed, true )
ADD_CALLBACK_ENTRY( "bit-rate", on_bit_rate_changed, false )
ADD_CALLBACK_ENTRY( "sample-rate", on_sample_rate_changed, false )
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
+ (void)oldVal;
VlcProc *pThis = (VlcProc*)pParam;
AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
void VlcProc::on_item_current_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
+ (void)p_obj;
input_item_t *p_item = static_cast<input_item_t*>(newVal.p_address);
// Update short name
void VlcProc::on_bit_rate_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
+ (void)newVal;
input_thread_t* pInput = (input_thread_t*) p_obj;
assert( getIntf()->p_sys->p_input == NULL || getIntf()->p_sys->p_input == pInput );
void VlcProc::on_sample_rate_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
+ (void)newVal;
input_thread_t* pInput = (input_thread_t*) p_obj;
assert( getIntf()->p_sys->p_input == NULL || getIntf()->p_sys->p_input == pInput );
void VlcProc::on_can_record_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
+ (void)newVal;
input_thread_t* pInput = (input_thread_t*) p_obj;
assert( getIntf()->p_sys->p_input == NULL || getIntf()->p_sys->p_input == pInput );
void VlcProc::on_random_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
+ (void)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 )
{
+ (void)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 )
{
+ (void)newVal;
playlist_t* pPlaylist = (playlist_t*) p_obj;
SET_BOOL( m_cVarRepeat, var_GetBool( pPlaylist, "repeat" ) );
(void)p_obj; (void)newVal;
playlist_t* pPlaylist = getIntf()->p_sys->p_playlist;
- audio_volume_t volume;
- aout_VolumeGet( pPlaylist, &volume );
+ audio_volume_t volume = aout_VolumeGet( pPlaylist );
SET_VOLUME( m_cVarVolume, volume, false );
SET_BOOL( m_cVarMute, volume == 0 );
}
void VlcProc::on_audio_filter_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
+ (void)newVal;
aout_instance_t* pAout = (aout_instance_t*) p_obj;
char *pFilters = newVal.psz_string;
void VlcProc::on_intf_show_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
- (void)p_obj;
+ (void)p_obj; (void)newVal;
bool b_fullscreen = getFullscreenVar().get();
if( !b_fullscreen )
void VlcProc::on_mouse_moved_changed( vlc_object_t* p_obj, vlc_value_t newVal )
{
+ (void)p_obj; (void)newVal;
FscWindow* pFscWindow = VoutManager::instance( getIntf() )->getFscWindow();
if( pFscWindow )
pFscWindow->onMouseMoved();
SET_BOOL( m_cVarLoop, var_GetBool( pPlaylist, "loop" ) );
SET_BOOL( m_cVarRepeat, var_GetBool( pPlaylist, "repeat" ) );
- audio_volume_t volume;
- aout_VolumeGet( pPlaylist, &volume );
+ audio_volume_t volume = aout_VolumeGet( pPlaylist );
SET_VOLUME( m_cVarVolume, volume, false );
SET_BOOL( m_cVarMute, volume == 0 );