# 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>
vlc_value_t, vlc_value_t, void * );
static int SpecialKeyEvent( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-static int ActionKeyCB( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
static void PlayBookmark( intf_thread_t *, int );
static void SetBookmark ( intf_thread_t *, int );
static void DisplayPosition( intf_thread_t *, vout_thread_t *, input_thread_t * );
#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_AddCallback( p_intf->p_libvlc, p_hotkeys[i].psz_action,
- ActionKeyCB, p_hotkeys + i );
- 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( ;; )
{
input_thread_t *p_input;
vout_thread_t *p_last_vout;
- int i_times = 0;
int i_action = GetAction( p_intf );
if( i_action == -1 )
break; /* die */
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
- {
- if( p_hotkeys[i].i_action == i_action )
- {
- i_times = p_hotkeys[i].i_times;
- /* times key pressed within max. delta time */
- p_hotkeys[i].i_times = 0;
- break;
- }
- }
-
/* Update the input */
PL_LOCK;
p_input = p_playlist->p_input;
}
/* 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 )
#define SET_TIME( a, b ) \
i_interval = config_GetInt( p_input, a "-jump-size" ); \
if( i_interval > 0 ) { \
- val.i_time = ( (mtime_t)(i_interval * b) * 1000000L \
- * ((mtime_t)(1 << i_times))); \
+ val.i_time = (mtime_t)(i_interval * b) * 1000000L; \
var_Set( p_input, "time-offset", val ); \
DisplayPosition( p_intf, p_vout, p_input ); \
}
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 )
return PutAction( p_intf, newval.i_int );
}
-static int ActionKeyCB( vlc_object_t *libvlc, char const *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
- mtime_t i_date;
- struct hotkey *p_hotkey = p_data;
-
- (void)libvlc; (void)psz_var; (void)oldval;
-
- p_hotkey->i_key = newval.i_int;
-
- /* do hotkey accounting */
- i_date = mdate();
- if( (p_hotkey->i_delta_date > 0) &&
- (p_hotkey->i_delta_date <= (i_date - p_hotkey->i_last_date) ) )
- p_hotkey->i_times = 0;
- else
- p_hotkey->i_times++;
- p_hotkey->i_last_date = i_date;
-
- return VLC_SUCCESS;
-}
-
static void PlayBookmark( intf_thread_t *p_intf, int i_num )
{
vlc_value_t val;
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 );
projects / vlc / blobdiff