Option to resume from recent bookmark

Change-Id: I23443cde26d259e9b05f5e268c123e42af169863
bahusoid · Mar 6, 2024 · c7c2d4a · c7c2d4a
1 parent b51c44d
commit c7c2d4a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 3 deletions.
diff --git a/apps/bookmark.c b/apps/bookmark.c
@@ -176,6 +176,12 @@ static char* get_mrb_path(char* dirbuf, int dirbuf_sz)
     return dirbuf;
 }
 
+bool bookmark_mrb_autoload()
+{
+    char max_path[MAX_PATH];
+    return bookmark_load(get_mrb_path(max_path, MAX_PATH), true);
+}
+
 /* ----------------------------------------------------------------------- */
 /* Gives the user a list of the Most Recent Bookmarks.  This is an         */
 /* interface function                                                      */

diff --git a/apps/bookmark.h b/apps/bookmark.h
@@ -39,6 +39,7 @@ int  bookmark_load_menu(void);
 bool bookmark_autobookmark(bool prompt_ok);
 bool bookmark_create_menu(void);
 bool bookmark_mrb_load(void);
+bool bookmark_mrb_autoload(void);
 int  bookmark_autoload(const char* file);
 bool bookmark_load(const char* file, bool autoload);
 bool bookmark_exists(void);

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
@@ -16641,3 +16641,17 @@
     *: "Go to Last Album"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS_RESUME_RECENT_BOOKMARK
+  desc: prompt for user to decide whether to resume playback from recent bookmark instead of playlist_control file
+  user: core
+  <source>
+    *: "Resume Recent Bookmark"
+  </source>
+  <dest>
+    *: "Resume Recent Bookmark"
+  </dest>
+  <voice>
+    *: "Resume Recent Bookmark"
+  </voice>
+</phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
@@ -645,9 +645,10 @@ MENUITEM_SETTING(autocreatebookmark,
 MENUITEM_SETTING(autoupdatebookmark, &global_settings.autoupdatebookmark, NULL);
 MENUITEM_SETTING(autoloadbookmark, &global_settings.autoloadbookmark, NULL);
 MENUITEM_SETTING(usemrb, &global_settings.usemrb, NULL);
+MENUITEM_SETTING(resume_mrb, &global_settings.resume_from_recent_bookmark, NULL);
 MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0,
           Icon_Bookmark,
-          &autocreatebookmark, &autoupdatebookmark, &autoloadbookmark, &usemrb);
+          &autocreatebookmark, &autoupdatebookmark, &autoloadbookmark, &usemrb, &resume_mrb);
 /*    BOOKMARK MENU                */
 /***********************************/
 

diff --git a/apps/root_menu.c b/apps/root_menu.c
@@ -328,6 +328,10 @@ static int wpsscrn(void* param)
         talk_shutup();
         ret_val = gui_wps_show();
     }
+    else if (global_settings.resume_from_recent_bookmark && global_settings.usemrb && bookmark_mrb_autoload())
+    {
+        ret_val = gui_wps_show();
+    }
     else if ( global_status.resume_index != -1 )
     {
         DEBUGF("Resume index %X crc32 %lX offset %lX\n",

diff --git a/apps/settings.h b/apps/settings.h
@@ -570,7 +570,7 @@ struct user_settings
     bool autoupdatebookmark;/* auto update option */
     int usemrb;             /* use MRB list: 0=No, 1=Yes, 2=One per playlist,
                                              3=One per playlist and track */
-
+    bool resume_from_recent_bookmark;
 #ifdef HAVE_DIRCACHE
     bool dircache;          /* enable directory cache */
 #endif
@@ -652,7 +652,7 @@ struct user_settings
     bool spdif_enable; /* S/PDIF power on/off */
 #endif
 #ifdef HAVE_USB_CHARGING_ENABLE
-    int usb_charging;
+        int usb_charging;
 #endif
     /* device settings */
 #ifdef HAVE_LCD_CONTRAST

diff --git a/apps/settings_list.c b/apps/settings_list.c
@@ -1425,6 +1425,8 @@ const struct settings_list settings[] = {
                    ID2P(LANG_SET_BOOL_YES),
                    ID2P(LANG_BOOKMARK_SETTINGS_ONE_PER_PLAYLIST),
                    ID2P(LANG_BOOKMARK_SETTINGS_ONE_PER_TRACK)),
+        OFFON_SETTING(0, resume_from_recent_bookmark, LANG_BOOKMARK_SETTINGS_RESUME_RECENT_BOOKMARK,
+                false, "resume most-recent-bookmark", NULL),
     /* peak meter */
     TABLE_SETTING_LIST(F_TIME_SETTING | F_ALLOW_ARBITRARY_VALS, peak_meter_clip_hold,
                   LANG_PM_CLIP_HOLD, 60, "peak meter clip hold", "eternal",