Commit ddfbadf3 authored by Martin Zeman's avatar Martin Zeman Committed by Jean-Baptiste Kempf

Added a hotkey for playlist deletion.

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent b63d80bf
......@@ -159,6 +159,7 @@ typedef enum vlc_action {
ACTIONID_PLAY_BOOKMARK9,
ACTIONID_PLAY_BOOKMARK10,
/* end of contiguous zone */
ACTIONID_PLAY_CLEAR,
ACTIONID_SUBDELAY_UP,
ACTIONID_SUBDELAY_DOWN,
ACTIONID_SUBPOS_UP,
......
......@@ -241,7 +241,12 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
case ACTIONID_SET_BOOKMARK10:
SetBookmark( p_intf, i_action - ACTIONID_SET_BOOKMARK1 + 1 );
break;
case ACTIONID_PLAY_CLEAR:
{
playlist_t *p_playlist = pl_Get( p_intf );
playlist_Clear( p_playlist, pl_Unlocked );
break;
}
case ACTIONID_VOL_UP:
{
float vol;
......
......@@ -275,6 +275,7 @@ static const struct action actions[] =
{ "audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, },
{ "chapter-next", ACTIONID_CHAPTER_NEXT, },
{ "chapter-prev", ACTIONID_CHAPTER_PREV, },
{ "clear-playlist", ACTIONID_PLAY_CLEAR, },
{ "crop", ACTIONID_CROP, },
{ "crop-bottom", ACTIONID_CROP_BOTTOM, },
{ "crop-left", ACTIONID_CROP_LEFT, },
......
......@@ -1346,6 +1346,8 @@ static const char *const mouse_wheel_texts[] =
#define SET_BOOKMARK9_KEY_TEXT N_("Set playlist bookmark 9")
#define SET_BOOKMARK10_KEY_TEXT N_("Set playlist bookmark 10")
#define SET_BOOKMARK_KEY_LONGTEXT N_("Select the key to set this playlist bookmark.")
#define PLAY_CLEAR_KEY_TEXT N_("Clear the playlist")
#define PLAY_CLEAR_KEY_LONGTEXT N_("Select the key to clear the current playlist.")
#define BOOKMARK1_TEXT N_("Playlist bookmark 1")
#define BOOKMARK2_TEXT N_("Playlist bookmark 2")
......@@ -2245,6 +2247,7 @@ vlc_module_begin ()
# define KEY_RECORD "Command+Shift+r"
# define KEY_WALLPAPER "w"
# define KEY_AUDIODEVICE_CYCLE "Shift+a"
# define KEY_PLAY_CLEAR NULL
#else /* Non Mac OS X */
/*
......@@ -2361,6 +2364,9 @@ vlc_module_begin ()
# define KEY_PLAY_BOOKMARK8 "F8"
# define KEY_PLAY_BOOKMARK9 "F9"
# define KEY_PLAY_BOOKMARK10 "F10"
/* Playlist clear */
# define KEY_PLAY_CLEAR "Ctrl+w"
#endif
add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, TOGGLE_FULLSCREEN_KEY_TEXT,
......@@ -2577,6 +2583,8 @@ vlc_module_begin ()
PLAY_BOOKMARK9_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, true )
add_key( "key-play-bookmark10", KEY_PLAY_BOOKMARK10,
PLAY_BOOKMARK10_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, true )
add_key( "key-clear-playlist", KEY_PLAY_CLEAR,
PLAY_CLEAR_KEY_TEXT, PLAY_CLEAR_KEY_LONGTEXT, true )
add_string( "bookmark1", NULL,
......
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