Commit d1551e17 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* hotkey: Go to DVD menu (ctrl-M)

parent 6b2960cf
...@@ -252,3 +252,4 @@ static inline int StringToKey( char *psz_key ) ...@@ -252,3 +252,4 @@ static inline int StringToKey( char *psz_key )
#define ACTIONID_AUDIODELAY_DOWN 63 #define ACTIONID_AUDIODELAY_DOWN 63
#define ACTIONID_SNAPSHOT 64 #define ACTIONID_SNAPSHOT 64
#define ACTIONID_RECORD 65 #define ACTIONID_RECORD 65
#define ACTIONID_DISC_MENU 66
...@@ -606,6 +606,12 @@ static void Run( intf_thread_t *p_intf ) ...@@ -606,6 +606,12 @@ static void Run( intf_thread_t *p_intf )
val.b_bool = VLC_TRUE; val.b_bool = VLC_TRUE;
var_Set( p_input, "next-chapter", val ); var_Set( p_input, "next-chapter", val );
} }
else if( i_action == ACTIONID_DISC_MENU )
{
vlc_value_t val; val.i_int = 2;
msg_Dbg( p_input, "set dvdmenu" );
var_Set( p_input, "title 0", val);
}
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" );
......
...@@ -834,6 +834,8 @@ static char *ppsz_clock_descriptions[] = ...@@ -834,6 +834,8 @@ static char *ppsz_clock_descriptions[] =
#define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in DVD menus.") #define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in DVD menus.")
#define NAV_ACTIVATE_KEY_TEXT N_("Activate") #define NAV_ACTIVATE_KEY_TEXT N_("Activate")
#define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.") #define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.")
#define DISC_MENU_TEXT N_("Go to the DVD menu")
#define DISC_MENU_LONGTEXT N_("Select the key to take you to the DVD menu")
#define TITLE_PREV_TEXT N_("Select previous DVD title") #define TITLE_PREV_TEXT N_("Select previous DVD title")
#define TITLE_PREV_LONGTEXT N_("Select the key to choose the previous title from the DVD") #define TITLE_PREV_LONGTEXT N_("Select the key to choose the previous title from the DVD")
#define TITLE_NEXT_TEXT N_("Select next DVD title") #define TITLE_NEXT_TEXT N_("Select next DVD title")
...@@ -1412,6 +1414,7 @@ vlc_module_begin(); ...@@ -1412,6 +1414,7 @@ vlc_module_begin();
# define KEY_SUBTITLE_TRACK 's' # define KEY_SUBTITLE_TRACK 's'
# define KEY_INTF_SHOW 'i' # define KEY_INTF_SHOW 'i'
# define KEY_INTF_HIDE 'I' # define KEY_INTF_HIDE 'I'
# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m'
# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p' # define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p'
# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n' # define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n'
# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u' # define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
...@@ -1479,6 +1482,7 @@ vlc_module_begin(); ...@@ -1479,6 +1482,7 @@ vlc_module_begin();
# define KEY_SUBTITLE_TRACK 'k' # define KEY_SUBTITLE_TRACK 'k'
# define KEY_INTF_SHOW 'i' # define KEY_INTF_SHOW 'i'
# define KEY_INTF_HIDE 'I' # define KEY_INTF_HIDE 'I'
# define KEY_DISC MENU KEY_MODIFIER_CTRL|'m'
# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p' # define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p'
# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n' # define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n'
# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u' # define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
...@@ -1558,6 +1562,8 @@ vlc_module_begin(); ...@@ -1558,6 +1562,8 @@ vlc_module_begin();
add_key( "key-nav-right", KEY_NAV_RIGHT, NULL, NAV_RIGHT_KEY_TEXT, add_key( "key-nav-right", KEY_NAV_RIGHT, NULL, NAV_RIGHT_KEY_TEXT,
NAV_RIGHT_KEY_LONGTEXT, VLC_TRUE ); NAV_RIGHT_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-disc-menu", KEY_DISC_MENU, NULL, DISC_MENU_TEXT,
DISC_MENU_LONGTEXT, VLC_TRUE );
add_key( "key-title-prev", KEY_TITLE_PREV, NULL, TITLE_PREV_TEXT, add_key( "key-title-prev", KEY_TITLE_PREV, NULL, TITLE_PREV_TEXT,
TITLE_PREV_LONGTEXT, VLC_TRUE ); TITLE_PREV_LONGTEXT, VLC_TRUE );
add_key( "key-title-next", KEY_TITLE_NEXT, NULL, TITLE_NEXT_TEXT, add_key( "key-title-next", KEY_TITLE_NEXT, NULL, TITLE_NEXT_TEXT,
...@@ -1720,6 +1726,7 @@ static struct hotkey p_hotkeys[] = ...@@ -1720,6 +1726,7 @@ static struct hotkey p_hotkeys[] =
{ "key-nav-down", ACTIONID_NAV_DOWN, 0, 0, 0, 0 }, { "key-nav-down", ACTIONID_NAV_DOWN, 0, 0, 0, 0 },
{ "key-nav-left", ACTIONID_NAV_LEFT, 0, 0, 0, 0 }, { "key-nav-left", ACTIONID_NAV_LEFT, 0, 0, 0, 0 },
{ "key-nav-right", ACTIONID_NAV_RIGHT, 0, 0, 0, 0 }, { "key-nav-right", ACTIONID_NAV_RIGHT, 0, 0, 0, 0 },
{ "key-disc-menu", ACTIONID_DISC_MENU, 0, 0, 0, 0 },
{ "key-title-prev", ACTIONID_TITLE_PREV, 0, 0, 0, 0 }, { "key-title-prev", ACTIONID_TITLE_PREV, 0, 0, 0, 0 },
{ "key-title-next", ACTIONID_TITLE_NEXT, 0, 0, 0, 0 }, { "key-title-next", ACTIONID_TITLE_NEXT, 0, 0, 0, 0 },
{ "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, 0, 0, 0 }, { "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, 0, 0, 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