diff options
Diffstat (limited to 'apps/plugins/pictureflow/pictureflow.c')
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 34d1db5d5c..52209e60a2 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -879,7 +879,7 @@ retry: | |||
879 | } | 879 | } |
880 | goto retry; | 880 | goto retry; |
881 | } | 881 | } |
882 | 882 | ||
883 | avail -= len; | 883 | avail -= len; |
884 | tracks--; | 884 | tracks--; |
885 | tracks->sort = ((disc_num - 1) << 24) + (track_num << 14) + track_count; | 885 | tracks->sort = ((disc_num - 1) << 24) + (track_num << 14) + track_count; |
@@ -2053,21 +2053,6 @@ int create_empty_slide(bool force) | |||
2053 | } | 2053 | } |
2054 | 2054 | ||
2055 | /** | 2055 | /** |
2056 | Shows the album name setting menu | ||
2057 | */ | ||
2058 | int album_name_menu(void) | ||
2059 | { | ||
2060 | int selection = show_album_name; | ||
2061 | |||
2062 | MENUITEM_STRINGLIST(album_name_menu,"Show album title",NULL, | ||
2063 | "Hide album title", "Show at the bottom", "Show at the top"); | ||
2064 | rb->do_menu(&album_name_menu, &selection, NULL, false); | ||
2065 | |||
2066 | show_album_name = selection; | ||
2067 | return GO_TO_PREVIOUS; | ||
2068 | } | ||
2069 | |||
2070 | /** | ||
2071 | Shows the settings menu | 2056 | Shows the settings menu |
2072 | */ | 2057 | */ |
2073 | int settings_menu(void) | 2058 | int settings_menu(void) |
@@ -2079,6 +2064,12 @@ int settings_menu(void) | |||
2079 | "Spacing", "Centre margin", "Number of slides", "Zoom", | 2064 | "Spacing", "Centre margin", "Number of slides", "Zoom", |
2080 | "Show album title", "Resize Covers", "Rebuild cache"); | 2065 | "Show album title", "Resize Covers", "Rebuild cache"); |
2081 | 2066 | ||
2067 | static const struct opt_items album_name_options[] = { | ||
2068 | { "Hide album title", -1 }, | ||
2069 | { "Show at the bottom", -1 }, | ||
2070 | { "Show at the top", -1 } | ||
2071 | }; | ||
2072 | |||
2082 | do { | 2073 | do { |
2083 | selection=rb->do_menu(&settings_menu,&selection, NULL, false); | 2074 | selection=rb->do_menu(&settings_menu,&selection, NULL, false); |
2084 | switch(selection) { | 2075 | switch(selection) { |
@@ -2117,7 +2108,8 @@ int settings_menu(void) | |||
2117 | reset_slides(); | 2108 | reset_slides(); |
2118 | break; | 2109 | break; |
2119 | case 5: | 2110 | case 5: |
2120 | album_name_menu(); | 2111 | rb->set_option("Show album title", &show_album_name, |
2112 | INT, album_name_options, 3, NULL); | ||
2121 | reset_track_list(); | 2113 | reset_track_list(); |
2122 | recalc_offsets(); | 2114 | recalc_offsets(); |
2123 | reset_slides(); | 2115 | reset_slides(); |
@@ -2729,8 +2721,6 @@ int main(void) | |||
2729 | break; | 2721 | break; |
2730 | } | 2722 | } |
2731 | } | 2723 | } |
2732 | |||
2733 | |||
2734 | } | 2724 | } |
2735 | 2725 | ||
2736 | /*************************** Plugin entry point ****************************/ | 2726 | /*************************** Plugin entry point ****************************/ |