len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FS#10856 - Skip to previous track inconsistent when using cuesheet

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24191 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Chicoine 2010-01-06 14:48:42 +00:00
parent f011fe2b5d
commit 8e8e2627b2
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/cuesheet.c
View file

@ -39,6 +39,7 @@
#include "plugin.h" #include "plugin.h"
#include "playback.h" #include "playback.h"
#include "cuesheet.h" #include "cuesheet.h"
#include "gui/wps.h"
#define CUE_DIR ROCKBOX_DIR "/cue" #define CUE_DIR ROCKBOX_DIR "/cue"
@ -328,7 +329,18 @@ bool curr_cuesheet_skip(struct cuesheet *cue, int direction, unsigned long curr_
else else
{ {
if (!(direction <= 0 && track == 0)) if (!(direction <= 0 && track == 0))
track += direction; {
/* If skipping forward, skip to next cuesheet segment. If skipping
backward before DEFAULT_SKIP_TRESH milliseconds have elapsed, skip
to previous cuesheet segment. If skipping backward after
DEFAULT_SKIP_TRESH seconds have elapsed, skip to the start of the
current cuesheet segment */
if (direction == 1 ||
((curr_pos - cue->tracks[track].offset) < DEFAULT_SKIP_TRESH))
{
track += direction;
}
}
seek(cue->tracks[track].offset); seek(cue->tracks[track].offset);
return true; return true;

3
apps/gui/wps.c
View file

@ -70,9 +70,6 @@
#define RESTORE_WPS_INSTANTLY 0l #define RESTORE_WPS_INSTANTLY 0l
#define RESTORE_WPS_NEXT_SECOND ((long)(HZ+current_tick)) #define RESTORE_WPS_NEXT_SECOND ((long)(HZ+current_tick))
/* in milliseconds */
#define DEFAULT_SKIP_TRESH 3000l
#define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */
/* 3% of 30min file == 54s step size */ /* 3% of 30min file == 54s step size */

3
apps/gui/wps.h
View file

@ -43,4 +43,7 @@ bool is_wps_fading(void);
int wps_get_ff_rewind_count(void); int wps_get_ff_rewind_count(void);
#endif /* IPOD_ACCESSORY_PROTOCOL */ #endif /* IPOD_ACCESSORY_PROTOCOL */
/* in milliseconds */
#define DEFAULT_SKIP_TRESH 3000l
#endif /* _WPS_H_ */ #endif /* _WPS_H_ */