Commit 65d40ed4 authored by Gildas Bazin's avatar Gildas Bazin

* modules/control/hotkeys.c: snapshot hotkey.

parent 519e40a3
...@@ -236,7 +236,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -236,7 +236,7 @@ static void Run( intf_thread_t *p_intf )
/* Find action triggered by hotkey */ /* Find action triggered by hotkey */
i_action = 0; i_action = 0;
i_key = GetKey( p_intf ); i_key = GetKey( p_intf );
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ )
{ {
if( p_hotkeys[i].i_key == i_key ) if( p_hotkeys[i].i_key == i_key )
{ {
...@@ -299,6 +299,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -299,6 +299,10 @@ static void Run( intf_thread_t *p_intf )
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
} }
else if( i_action == ACTIONID_SNAPSHOT )
{
if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
}
else if( i_action == ACTIONID_SUBDELAY_DOWN ) else if( i_action == ACTIONID_SUBDELAY_DOWN )
{ {
int64_t i_delay = var_GetTime( p_input, "spu-delay" ); int64_t i_delay = var_GetTime( p_input, "spu-delay" );
......
...@@ -252,6 +252,11 @@ static char *ppsz_align_descriptions[] = ...@@ -252,6 +252,11 @@ static char *ppsz_align_descriptions[] =
"picture quality, for instance deinterlacing, or to clone or distort " \ "picture quality, for instance deinterlacing, or to clone or distort " \
"the video window.") "the video window.")
#define SNAP_PATH_TEXT N_("Video snapshot directory")
#define SNAP_PATH_LONGTEXT N_( \
"Allows you to specify the directory where the video snapshots will " \
"be stored.")
#define ASPECT_RATIO_TEXT N_("Source aspect ratio") #define ASPECT_RATIO_TEXT N_("Source aspect ratio")
#define ASPECT_RATIO_LONGTEXT N_( \ #define ASPECT_RATIO_LONGTEXT N_( \
"This will force the source aspect ratio. For instance, some DVDs claim " \ "This will force the source aspect ratio. For instance, some DVDs claim " \
...@@ -788,6 +793,8 @@ static char *ppsz_align_descriptions[] = ...@@ -788,6 +793,8 @@ static char *ppsz_align_descriptions[] =
#define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks") #define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks")
#define INTF_SHOW_KEY_TEXT N_("Show interface") #define INTF_SHOW_KEY_TEXT N_("Show interface")
#define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above all other windows") #define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above all other windows")
#define SNAP_KEY_TEXT N_("Take video snapshot")
#define SNAP_KEY_LONGTEXT N_("Takes a video snapshot and writes it to disk.")
#define PLAYLIST_USAGE N_( \ #define PLAYLIST_USAGE N_( \
"\nPlaylist MRL syntax:" \ "\nPlaylist MRL syntax:" \
...@@ -899,6 +906,8 @@ vlc_module_begin(); ...@@ -899,6 +906,8 @@ vlc_module_begin();
set_subcategory( SUBCAT_VIDEO_VFILTER ); set_subcategory( SUBCAT_VIDEO_VFILTER );
add_module_list_cat( "filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, add_module_list_cat( "filter", SUBCAT_VIDEO_VFILTER, NULL, NULL,
FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE );
add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT,
SNAP_PATH_LONGTEXT, VLC_TRUE );
#if 0 #if 0
add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT ); add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT );
#endif #endif
...@@ -1193,6 +1202,7 @@ vlc_module_begin(); ...@@ -1193,6 +1202,7 @@ vlc_module_begin();
# define KEY_AUDIO_TRACK 'l' # define KEY_AUDIO_TRACK 'l'
# define KEY_SUBTITLE_TRACK 's' # define KEY_SUBTITLE_TRACK 's'
# define KEY_INTF_SHOW 'i' # define KEY_INTF_SHOW 'i'
# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|'s'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1 # define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2 # define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2
...@@ -1251,6 +1261,7 @@ vlc_module_begin(); ...@@ -1251,6 +1261,7 @@ vlc_module_begin();
# define KEY_AUDIO_TRACK 'l' # define KEY_AUDIO_TRACK 'l'
# define KEY_SUBTITLE_TRACK 'k' # define KEY_SUBTITLE_TRACK 'k'
# define KEY_INTF_SHOW 'i' # define KEY_INTF_SHOW 'i'
# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|'s'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1 # define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_CTRL|KEY_F2 # define KEY_SET_BOOKMARK2 KEY_MODIFIER_CTRL|KEY_F2
...@@ -1342,6 +1353,8 @@ vlc_module_begin(); ...@@ -1342,6 +1353,8 @@ vlc_module_begin();
SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, VLC_FALSE ); SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-intf-show", KEY_INTF_SHOW, NULL, add_key( "key-intf-show", KEY_INTF_SHOW, NULL,
INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, VLC_TRUE ); INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-snapshot", KEY_SNAPSHOT, NULL,
SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL, add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL,
SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
...@@ -1454,6 +1467,7 @@ static struct hotkey p_hotkeys[] = ...@@ -1454,6 +1467,7 @@ static struct hotkey p_hotkeys[] =
{ "key-audio-track", ACTIONID_AUDIO_TRACK, 0}, { "key-audio-track", ACTIONID_AUDIO_TRACK, 0},
{ "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0}, { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0},
{ "key-intf-show", ACTIONID_INTF_SHOW, 0}, { "key-intf-show", ACTIONID_INTF_SHOW, 0},
{ "key-snapshot", ACTIONID_SNAPSHOT, 0},
{ "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 }, { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 },
{ "key-nav-up", ACTIONID_NAV_UP, 0 }, { "key-nav-up", ACTIONID_NAV_UP, 0 },
{ "key-nav-down", ACTIONID_NAV_DOWN, 0 }, { "key-nav-down", ACTIONID_NAV_DOWN, 0 },
......
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