Commit f91eaf0b authored by Erwan Tulou's avatar Erwan Tulou Committed by Joseph

skins2: remove dead code

The possibility to trigger callbacks when changing preferences was removed
 lately. So this code is now useless.
parent 2a7de277
...@@ -67,16 +67,6 @@ static int Open ( vlc_object_t * ); ...@@ -67,16 +67,6 @@ static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * ); static void Close ( vlc_object_t * );
static void *Run ( void * ); static void *Run ( void * );
//---------------------------------------------------------------------------
// Prototypes for configuration callbacks
//---------------------------------------------------------------------------
static int onSystrayChange( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam );
static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam );
static struct static struct
{ {
intf_thread_t *intf; intf_thread_t *intf;
...@@ -378,80 +368,6 @@ static void WindowClose( vlc_object_t *p_this ) ...@@ -378,80 +368,6 @@ static void WindowClose( vlc_object_t *p_this )
} }
//---------------------------------------------------------------------------
// Callbacks
//---------------------------------------------------------------------------
/// Callback for the systray configuration option
static int onSystrayChange( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
intf_thread_t *pIntf;
vlc_mutex_lock( &skin_load.mutex );
pIntf = skin_load.intf;
if( pIntf )
vlc_object_hold( pIntf );
vlc_mutex_unlock( &skin_load.mutex );
if( pIntf == NULL )
{
return VLC_EGENERIC;
}
AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
if( newVal.b_bool )
{
CmdAddInTray *pCmd = new CmdAddInTray( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) );
}
else
{
CmdRemoveFromTray *pCmd = new CmdRemoveFromTray( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) );
}
vlc_object_release( pIntf );
return VLC_SUCCESS;
}
/// Callback for the systray configuration option
static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal,
void *pParam )
{
intf_thread_t *pIntf;
vlc_mutex_lock( &skin_load.mutex );
pIntf = skin_load.intf;
if( pIntf )
vlc_object_hold( pIntf );
vlc_mutex_unlock( &skin_load.mutex );
if( pIntf == NULL )
{
return VLC_EGENERIC;
}
AsyncQueue *pQueue = AsyncQueue::instance( pIntf );
if( newVal.b_bool )
{
CmdAddInTaskBar *pCmd = new CmdAddInTaskBar( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) );
}
else
{
CmdRemoveFromTaskBar *pCmd = new CmdRemoveFromTaskBar( pIntf );
pQueue->push( CmdGenericPtr( pCmd ) );
}
vlc_object_release( pIntf );
return VLC_SUCCESS;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Module descriptor // Module descriptor
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
...@@ -486,13 +402,10 @@ vlc_module_begin () ...@@ -486,13 +402,10 @@ vlc_module_begin ()
change_autosave () change_autosave ()
change_private () change_private ()
#ifdef WIN32 #ifdef WIN32
#warning FIXME add_bool( "skins2-systray", true, SKINS2_SYSTRAY,
#if 0
add_bool( "skins2-systray", false, onSystrayChange, SKINS2_SYSTRAY,
SKINS2_SYSTRAY_LONG, false ); SKINS2_SYSTRAY_LONG, false );
add_bool( "skins2-taskbar", true, onTaskBarChange, SKINS2_TASKBAR, add_bool( "skins2-taskbar", true, SKINS2_TASKBAR,
SKINS2_TASKBAR_LONG, false ); SKINS2_TASKBAR_LONG, false );
#endif
#endif #endif
add_bool( "skins2-transparency", false, SKINS2_TRANSPARENCY, add_bool( "skins2-transparency", false, SKINS2_TRANSPARENCY,
SKINS2_TRANSPARENCY_LONG, false ); SKINS2_TRANSPARENCY_LONG, false );
......
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