# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_input.h>
#include <vlc_vout.h>
#define BOOKMARK_LONGTEXT N_("Define playlist bookmarks.")
vlc_module_begin();
- set_shortname( _("Hotkeys") );
- set_description( _("Hotkeys management interface") );
+ set_shortname( N_("Hotkeys") );
+ set_description( N_("Hotkeys management interface") );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
static void Run( intf_thread_t *p_intf )
{
vout_thread_t *p_vout = NULL;
- struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
vlc_value_t val;
int i;
playlist_t *p_playlist = pl_Yield( p_intf );
/* Initialize hotkey structure */
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
+ for( struct hotkey *p_hotkey = p_intf->p_libvlc->p_hotkeys;
+ p_hotkey->psz_action != NULL;
+ p_hotkey++ )
{
- var_Create( p_intf->p_libvlc, p_hotkeys[i].psz_action,
- VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT );
-
- var_Get( p_intf->p_libvlc, p_hotkeys[i].psz_action, &val );
- var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
+ p_hotkey->i_key = config_GetInt( p_intf, p_hotkey->psz_action );
}
for( ;; )
}
/* Interface showing */
else if( i_action == ACTIONID_INTF_SHOW )
- var_SetBool( p_playlist, "intf-show", VLC_TRUE );
+ var_SetBool( p_intf->p_libvlc, "intf-show", true );
else if( i_action == ACTIONID_INTF_HIDE )
- var_SetBool( p_playlist, "intf-show", VLC_FALSE );
+ var_SetBool( p_intf->p_libvlc, "intf-show", false );
/* Video Output actions */
else if( i_action == ACTIONID_SNAPSHOT )
{
{
if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
{
- var_SetBool( p_vout, "fullscreen", VLC_FALSE );
+ var_SetBool( p_vout, "fullscreen", false );
}
}
else if( i_action == ACTIONID_ZOOM_QUARTER ||
vlc_value_t val2;
var_Get( p_playlist, "loop", &val );
var_Get( p_playlist, "repeat", &val2 );
- if( val2.b_bool == VLC_TRUE )
+ if( val2.b_bool == true )
{
- val.b_bool = VLC_FALSE;
- val2.b_bool = VLC_FALSE;
+ val.b_bool = false;
+ val2.b_bool = false;
}
- else if( val.b_bool == VLC_TRUE )
+ else if( val.b_bool == true )
{
- val.b_bool = VLC_FALSE;
- val2.b_bool = VLC_TRUE;
+ val.b_bool = false;
+ val2.b_bool = true;
}
else
{
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
}
var_Set( p_playlist, "loop", val );
var_Set( p_playlist, "repeat", val2 );
/* Input options */
else if( p_input )
{
- /* FIXME --fenrir
- * How to get a valid value ?
- * That's not that easy with some special stream
- */
- vlc_bool_t b_seekable = VLC_TRUE;
+ bool b_seekable = var_GetBool( p_input, "seekable" );
int i_interval =0;
if( i_action == ACTIONID_PAUSE )
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Aspect ratio: %s"),
text_list.p_list->p_values[i].psz_string );
+
+ var_Change( p_vout, "aspect-ratio", VLC_VAR_FREELIST, &val_list, &text_list );
}
free( val.psz_string );
}
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Crop: %s"),
text_list.p_list->p_values[i].psz_string );
+
+ var_Change( p_vout, "crop", VLC_VAR_FREELIST, &val_list, &text_list );
}
free( val.psz_string );
}
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Deinterlace mode: %s"),
text_list.p_list->p_values[i].psz_string );
+
+ var_Change( p_vout, "deinterlace", VLC_VAR_FREELIST, &val_list, &text_list );
}
free( val.psz_string );
}
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Zoom mode: %s"),
text_list.p_list->p_values[i].var.psz_name );
+
+ var_Change( p_vout, "zoom", VLC_VAR_FREELIST, &val_list, &text_list );
}
}
else if( i_action == ACTIONID_CROP_TOP && p_vout )
if( !strcmp( psz_bookmark, psz_uri ) )
{
free( psz_uri );
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE,
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
NULL, p_item );
break;
}
vout_OSDMessage( p_input, POSITION_TEXT_CHAN, psz_time );
}
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ if( !p_vout->p_window || p_vout->b_fullscreen )
{
var_Get( p_input, "position", &pos );
vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN,
}
ClearChannels( p_intf, p_vout );
- if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
+ if( !p_vout->p_window || p_vout->b_fullscreen )
{
vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN,
i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );