summaryrefslogtreecommitdiff
path: root/apps/filetree.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-07-14 07:59:39 -0400
committerMichael Sevakis <jethead71@rockbox.org>2014-03-10 04:12:30 +0100
commit31b712286721dd606940c7b557d03e3f714b9604 (patch)
tree8c4a4cc32e9000ea721ebb23aa3c0129ca97bf53 /apps/filetree.c
parentdda54b85daa83b7803b4fb189ab45859f96ff3f9 (diff)
downloadrockbox-31b712286721dd606940c7b557d03e3f714b9604.tar.gz
rockbox-31b712286721dd606940c7b557d03e3f714b9604.zip
Implement time-based resume and playback start.
This complements offset-based resume and playback start funcionality. The implementation is global on both HWCODEC and SWCODEC. Basically, if either the specified elapsed or offset are non-zero, it indicates a mid-track resume. To resume by time only, set elapsed to nonzero and offset to zero. To resume by offset only, set offset to nonzero and elapsed to zero. Which one the codec uses and which has priority is up to the codec; however, using an elapsed time covers more cases: * Codecs not able to use an offset such as VGM or other atomic formats * Starting playback at a nonzero elapsed time from a source that contains no offset, such as a cuesheet The change re-versions pretty much everything from tagcache to nvram. Change-Id: Ic7aebb24e99a03ae99585c5e236eba960d163f38 Reviewed-on: http://gerrit.rockbox.org/516 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'apps/filetree.c')
-rw-r--r--apps/filetree.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/filetree.c b/apps/filetree.c
index 2edcaf3a03..319b5f4a77 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -118,7 +118,7 @@ bool ft_play_playlist(char* pathname, char* dirname, char* filename)
118 playlist_shuffle(current_tick, -1); 118 playlist_shuffle(current_tick, -1);
119 } 119 }
120 120
121 playlist_start(0, 0); 121 playlist_start(0, 0, 0);
122 return true; 122 return true;
123 } 123 }
124 124
@@ -498,7 +498,7 @@ int ft_enter(struct tree_context* c)
498 start_index = 0; 498 start_index = 0;
499 } 499 }
500 500
501 playlist_start(start_index, 0); 501 playlist_start(start_index, 0, 0);
502 play = true; 502 play = true;
503 } 503 }
504 break; 504 break;
@@ -705,6 +705,7 @@ int ft_enter(struct tree_context* c)
705 global_status.resume_index = start_index; 705 global_status.resume_index = start_index;
706 global_status.resume_crc32 = 706 global_status.resume_crc32 =
707 playlist_get_filename_crc32(NULL, start_index); 707 playlist_get_filename_crc32(NULL, start_index);
708 global_status.resume_elapsed = 0;
708 global_status.resume_offset = 0; 709 global_status.resume_offset = 0;
709 status_save(); 710 status_save();
710 rc = GO_TO_WPS; 711 rc = GO_TO_WPS;