Index: apps/action.h
===================================================================
--- apps/action.h (revision 19103)
+++ apps/action.h (working copy)
@@ -142,6 +142,7 @@
ACTION_TREE_PGRIGHT,/* optional */
ACTION_TREE_STOP,
ACTION_TREE_WPS,
+ ACTION_TREE_INSERT,
/* radio */
ACTION_FM_MENU,
Index: apps/tree.c
===================================================================
--- apps/tree.c (revision 19103)
+++ apps/tree.c (working copy)
@@ -676,6 +676,47 @@
restore = true;
break;
+ case ACTION_TREE_INSERT: /* button insert modification */
+ /* nothing to do if no files to display */
+ if ( numentries == 0 )
+ break;
+
+ int i;
+ int attr = 0;
+
+ if (id3db)
+ {
+ if (tagtree_get_attr(&tc) == FILE_ATTR_AUDIO)
+ {
+ attr = FILE_ATTR_AUDIO;
+ tagtree_get_filename(&tc, buf, sizeof(buf));
+ }
+ else
+ attr = ATTR_DIRECTORY;
+ }
+ else
+ {
+ attr = dircache[tc.selected_item].attr;
+ if (currdir[1])
+ snprintf(buf, sizeof buf, "%s/%s",
+ currdir, dircache[tc.selected_item].name);
+ else
+ snprintf(buf, sizeof buf, "/%s",
+ dircache[tc.selected_item].name);
+ }
+ i=onplay_one_click(buf, attr, curr_context,&tc);
+
+ switch (i)
+ {
+ case 1: reload_dir = true; break;
+ case 2: start_wps = true; break;
+ case 3: exit_func = true; break;
+ default: break;
+ }
+
+ restore = true;
+ break;
+
case ACTION_STD_CANCEL:
if (*tc.dirfilter > NUM_FILTER_MODES && tc.dirlevel < 1) {
exit_func = true;
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang (revision 19103)
+++ apps/lang/english.lang (working copy)
@@ -511,6 +511,34 @@
+ id: LANG_CLICK_DEFAULT
+ desc: in click insert menu
+ user:
+
+ *: "Original Behaviour"
+
+
+ *: "Original Behaviour"
+
+
+ *: ""
+
+
+
+ id: LANG_CLICK_INSERT
+ desc: in playlist menu
+ user:
+
+ *: "Click Insert Options"
+
+
+ *: "Click Insert Options"
+
+
+ *: ""
+
+
+
id: LANG_PLUGINS
desc: in the main menu
user:
Index: apps/onplay.c
===================================================================
--- apps/onplay.c (revision 19103)
+++ apps/onplay.c (working copy)
@@ -57,6 +57,7 @@
#include "icons.h"
#endif
#include "sound_menu.h"
+#include "filetree.h"
#include "playlist_menu.h"
#include "playlist_catalog.h"
#ifdef HAVE_TAGCACHE
@@ -1202,3 +1203,24 @@
return context == CONTEXT_WPS ? ONPLAY_OK : ONPLAY_RELOAD_DIR;
}
}
+/*one click insert modification*/
+
+int onplay_one_click(char* file, int attr, int from,struct tree_context* c){
+ int ret=1;
+ context=from;
+ selected_file = file;
+ selected_file_attr = attr;
+ if(global_settings.click_insert==0)
+ ret=ft_enter(c);
+ else if(global_settings.click_insert==1)
+ add_to_playlist(PLAYLIST_INSERT, false);
+ else if(global_settings.click_insert==2)
+ add_to_playlist(PLAYLIST_INSERT_LAST, false);
+ else if(global_settings.click_insert==3)
+ add_to_playlist(PLAYLIST_INSERT_SHUFFLED, false);
+ else if(global_settings.click_insert==4)
+ add_to_playlist(PLAYLIST_INSERT, true);
+ else
+ add_to_playlist(PLAYLIST_INSERT_LAST, true);
+ return ret;
+}
Index: apps/settings.h
===================================================================
--- apps/settings.h (revision 19103)
+++ apps/settings.h (working copy)
@@ -420,6 +420,9 @@
int backlight_fade_in; /* backlight fade in timing: 0..3 */
int backlight_fade_out; /* backlight fade in timing: 0..7 */
#endif
+ int click_insert; /*setting for click behaviour in file tree:
+ 0:insert, 1:insert last,2:queue,
+ 3:queue last,4:insert shuffled*/
#ifdef HAVE_BACKLIGHT_BRIGHTNESS
int brightness;
#endif
Index: apps/menus/playlist_menu.c
===================================================================
--- apps/menus/playlist_menu.c (revision 19103)
+++ apps/menus/playlist_menu.c (working copy)
@@ -64,6 +64,22 @@
return 0;
}
+static bool click_insert(void)
+{
+ static const struct opt_items names[] = {
+ { STR(LANG_CLICK_DEFAULT)},
+ { STR(LANG_INSERT)},
+ { STR(LANG_INSERT_LAST)},
+ { STR(LANG_INSERT_SHUFFLED)},
+ { STR(LANG_QUEUE) },
+ { STR(LANG_QUEUE_LAST) },
+ };
+
+ return set_option( str(LANG_CLICK_INSERT),
+ &global_settings.click_insert, INT, names, 6,
+ NULL );
+}
+
MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST),
(int(*)(void))create_playlist, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(view_playlist, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST),
@@ -76,10 +92,11 @@
NULL, NULL, Icon_NOICON);
MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL);
MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL);
+MENUITEM_FUNCTION(click_insert_item, 0, ID2P(LANG_CLICK_INSERT), (int(*)(void))click_insert, NULL, NULL, Icon_NOICON);
MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLISTS), NULL,
Icon_Playlist,
- &recursive_dir_insert, &warn_on_erase);
+ &recursive_dir_insert, &warn_on_erase, &click_insert_item);
MAKE_MENU(playlist_options, ID2P(LANG_PLAYLISTS), NULL,
Icon_Playlist,
&create_playlist_item, &view_playlist, &save_playlist, &catalog);
Index: apps/onplay.h
===================================================================
--- apps/onplay.h (revision 19103)
+++ apps/onplay.h (working copy)
@@ -22,6 +22,7 @@
#define _ONPLAY_H_
int onplay(char* file, int attr, int from_screen);
+int onplay_one_click(char* file, int attr, int from,struct tree_context* c);
enum {
ONPLAY_MAINMENU = -1,
Index: apps/settings_list.c
===================================================================
--- apps/settings_list.c (revision 19103)
+++ apps/settings_list.c (working copy)
@@ -1176,6 +1176,7 @@
#ifdef HAVE_TC_RAMCACHE
OFFON_SETTING(F_BANFROMQS,tagcache_ram,LANG_TAGCACHE_RAM,false,"tagcache_ram",NULL),
#endif
+ {F_T_INT,&global_settings.click_insert,LANG_CLICK_INSERT,INT(0),"click insert setting","original,insert,insert last,insert shuffled,queue,queue last",UNUSED},
OFFON_SETTING(F_BANFROMQS, tagcache_autoupdate, LANG_TAGCACHE_AUTOUPDATE, false,
"tagcache_autoupdate", NULL),
#endif
Index: apps/keymaps/keymap-h1x0_h3x0.c
===================================================================
--- apps/keymaps/keymap-h1x0_h3x0.c (revision 19103)
+++ apps/keymaps/keymap-h1x0_h3x0.c (working copy)
@@ -111,6 +111,7 @@
{ ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON },
{ ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE },
{ ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_TREE_INSERT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
}; /* button_context_tree */
@@ -374,13 +375,14 @@
static const struct button_mapping button_context_tree_h100remote[] = {
{ ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE },
-
+ { ACTION_TREE_INSERT, BUTTON_RC_REC, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE)
}; /* button_context_tree_h100remote */
static const struct button_mapping button_context_tree_h300lcdremote[] = {
{ ACTION_TREE_STOP, BUTTON_RC_STOP, BUTTON_NONE },
{ ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE },
+ { ACTION_TREE_INSERT, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE)
}; /* button_context_tree_h300lcdremote */
Index: apps/keymaps/keymap-ipod.c
===================================================================
--- apps/keymaps/keymap-ipod.c (revision 19103)
+++ apps/keymaps/keymap-ipod.c (working copy)
@@ -59,7 +59,7 @@
static const struct button_mapping button_context_tree[] = {
{ ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
{ ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
-
+ { ACTION_TREE_INSERT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_tree */
Index: apps/keymaps/keymap-x5.c
===================================================================
--- apps/keymaps/keymap-x5.c (revision 19103)
+++ apps/keymaps/keymap-x5.c (working copy)
@@ -266,6 +266,7 @@
{ ACTION_NONE, BUTTON_PLAY, BUTTON_NONE },
{ ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
{ ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
+ { ACTION_TREE_INSERT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_tree */
Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c (revision 19103)
+++ apps/keymaps/keymap-gigabeat.c (working copy)
@@ -127,6 +127,7 @@
{ ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE },
{ ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_TREE_INSERT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
}; /* button_context_tree */