X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fskins2%2Fsrc%2Fvlcproc.cpp;h=0b563739df38a653d4b0706cb37c62ef45d145bc;hb=64f57223de186cbaf01bc59c2c5d362f6f1c6f07;hp=02519e945699f46b0ac00cdea8a48ceeea0bfe9d;hpb=52840752b088a6a7a8abfc100026204cf430cac9;p=vlc

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index 02519e9456..0b563739df 100644
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -29,6 +29,7 @@
 
 #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>
@@ -151,7 +152,7 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
 #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" )
@@ -178,7 +179,6 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
     // 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();
@@ -203,7 +203,7 @@ VlcProc::~VlcProc()
 
     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 );
@@ -253,6 +253,7 @@ void VlcProc::CmdManage::execute()
 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);
 
@@ -269,6 +270,7 @@ int VlcProc::onItemChange( 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_item_t *p_item = static_cast<input_item_t*>(newval.p_address);
 
@@ -287,6 +289,7 @@ int VlcProc::onItemAppend( 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;
 
     playlist_add_t *p_add = static_cast<playlist_add_t*>(newVal.p_address);
@@ -304,6 +307,7 @@ int VlcProc::onItemDelete( 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;
 
     int i_id = newVal.i_int;
@@ -321,6 +325,7 @@ int VlcProc::onInteraction( 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;
     interaction_dialog_t *p_dialog = (interaction_dialog_t *)(newVal.p_address);
 
@@ -334,6 +339,7 @@ int VlcProc::onEqBandsChange( 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;
 
     // Post a set equalizer bands command
@@ -351,6 +357,7 @@ int VlcProc::onEqPreampChange( 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;
     EqualizerPreamp *pVarPreamp = (EqualizerPreamp*)(pThis->m_cVarEqPreamp.get());
 
@@ -368,6 +375,7 @@ int VlcProc::onGenericCallback( vlc_object_t *pObj, const char *pVariable,
                                 vlc_value_t oldVal, vlc_value_t newVal,
                                 void *pParam )
 {
+    (void)oldVal;
     VlcProc *pThis = (VlcProc*)pParam;
     AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
 
@@ -385,7 +393,7 @@ int VlcProc::onGenericCallback( vlc_object_t *pObj, const char *pVariable,
     }
 
     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 )
@@ -412,6 +420,7 @@ int VlcProc::onGenericCallback2( vlc_object_t *pObj, const char *pVariable,
                                  vlc_value_t oldVal, vlc_value_t newVal,
                                  void *pParam )
 {
+    (void)oldVal;
     VlcProc *pThis = (VlcProc*)pParam;
     AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
 
@@ -467,6 +476,7 @@ int VlcProc::onGenericCallback2( vlc_object_t *pObj, const char *pVariable,
 
 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
@@ -641,6 +651,7 @@ void VlcProc::on_intf_event_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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 );
@@ -651,6 +662,7 @@ void VlcProc::on_bit_rate_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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 );
@@ -661,6 +673,7 @@ void VlcProc::on_sample_rate_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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 );
@@ -670,6 +683,7 @@ void VlcProc::on_can_record_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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" ) );
@@ -677,6 +691,7 @@ void VlcProc::on_random_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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" ) );
@@ -684,6 +699,7 @@ void VlcProc::on_loop_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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" ) );
@@ -694,14 +710,14 @@ 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 );
+    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;
@@ -718,7 +734,7 @@ void VlcProc::on_audio_filter_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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 )
@@ -763,6 +779,7 @@ void VlcProc::on_intf_show_changed( vlc_object_t* p_obj, vlc_value_t newVal )
 
 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();
@@ -797,8 +814,7 @@ void VlcProc::init_variables()
     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 );