diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/menus/settings_menu.c | 7 | ||||
| -rw-r--r-- | apps/plugin.h | 4 | ||||
| -rw-r--r-- | apps/settings.h | 2 | ||||
| -rw-r--r-- | apps/settings_list.c | 2 | ||||
| -rw-r--r-- | apps/tree.c | 4 |
5 files changed, 16 insertions, 3 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index bcb8976..cbd2faf 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -94,7 +94,9 @@ MENUITEM_SETTING(sort_file, &global_settings.sort_file, fileview_callback); MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL); MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); +#ifdef HAVE_LCD_BITMAP MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); +#endif static int fileview_callback(int action,const struct menu_item_ex *this_item) { static int oldval; @@ -115,7 +117,10 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item) MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, &sort_case, &sort_dir, &sort_file, &dirfilter, &show_filename_ext, &browse_current, - &show_path_in_browser); +#ifdef HAVE_LCD_BITMAP + &show_path_in_browser +#endif + ); /* FILE VIEW MENU */ /***********************************/ diff --git a/apps/plugin.h b/apps/plugin.h index a3ec9c3..a291e2b 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -119,12 +119,12 @@ #define PLUGIN_MAGIC 0x526F634B /* RocK */ /* increase this every time the api struct changes */ -#define PLUGIN_API_VERSION 96 +#define PLUGIN_API_VERSION 97 /* update this to latest version if a change to the api struct breaks backwards compatibility (and please take the opportunity to sort in any new function which are "waiting" at the end of the function table) */ -#define PLUGIN_MIN_API_VERSION 96 +#define PLUGIN_MIN_API_VERSION 97 /* plugin return codes */ enum plugin_status { diff --git a/apps/settings.h b/apps/settings.h index f365e16..39ff4da 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -658,7 +658,9 @@ struct user_settings #endif bool hold_lr_for_scroll_in_list; /* hold L/R scrolls the list left/right */ +#ifdef HAVE_LCD_BITMAP int show_path_in_browser; /* 0=off, 1=current directory, 2=full path */ +#endif #ifdef HAVE_HEADPHONE_DETECTION int unplug_mode; /* pause on headphone unplug */ diff --git a/apps/settings_list.c b/apps/settings_list.c index 9d74514..1abc154 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1027,9 +1027,11 @@ const struct settings_list settings[] = { OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true, "hold_lr_for_scroll_in_list",NULL), +#ifdef HAVE_LCD_BITMAP CHOICE_SETTING(0, show_path_in_browser, LANG_SHOW_PATH, SHOW_PATH_OFF, "show path in browser", "off,current directory,full path", NULL, 3, ID2P(LANG_OFF), ID2P(LANG_SHOW_PATH_CURRENT), ID2P(LANG_DISPLAY_FULL_PATH)), +#endif #ifdef HAVE_AGC {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORD_AGC_PRESET,INT(1), diff --git a/apps/tree.c b/apps/tree.c index 35fa053..09c70f0 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -423,6 +423,7 @@ static int update_dir(void) #ifdef HAVE_TAGCACHE if (id3db) { +#ifdef HAVE_LCD_BITMAP if (global_settings.show_path_in_browser == SHOW_PATH_FULL || global_settings.show_path_in_browser == SHOW_PATH_CURRENT) { @@ -434,10 +435,12 @@ static int update_dir(void) /* Must clear the title as the list is reused */ gui_synclist_set_title(&tree_lists, NULL, NOICON); } +#endif } else #endif { +#ifdef HAVE_LCD_BITMAP if (global_settings.show_path_in_browser && *(tc.dirfilter) == SHOW_PLUGINS) { @@ -474,6 +477,7 @@ static int update_dir(void) /* Must clear the title as the list is reused */ gui_synclist_set_title(&tree_lists, NULL, NOICON); } +#endif } gui_synclist_set_nb_items(&tree_lists, tc.filesindir); |