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

[Bugfix] shuffle shenanigans from g5288 Fix #13369 shuffle & repeat callbacks

Browse source 
shuffle and sort were called on startup before playlist_init
and also on setting switch even without select

repeat is also now handled in settings_list as well

after moving the callbacks to settings_list.c
there was then a problem of unintended callbacks on exit of the menus
fixed that with F_CB_ON_SELECT_ONLY

since the callback was called regardless of the setting being changed
on F_CB_ON_SELECT_ONLY which is preferable in some circumstances
I co-opted F_TEMPVAR to allow the callback only when the setting was changed
with the flag F_CB_ON_SELECT_ONLY_IF_CHANGED

Change-Id: I5265233bbb556dc06c45273e742be5d78510a806
This commit is contained in:
William Wilgus 2023-08-27 10:54:44 -04:00 • committed by William Wilgus
parent 3883c978ab
commit 1c80f53581
5 changed files with 37 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/gui/option_select.c
View file

@ -471,6 +471,9 @@ bool option_screen(const struct settings_list *setting,
bool allow_wrap = setting->flags & F_NO_WRAP ? false : true;
bool cb_on_select_only =
((setting->flags & F_CB_ON_SELECT_ONLY) == F_CB_ON_SELECT_ONLY);
bool cb_on_changed =
((setting->flags & F_CB_ON_SELECT_ONLY_IF_CHANGED) == F_CB_ON_SELECT_ONLY_IF_CHANGED);
int var_type = setting->flags&F_T_MASK;
void (*function)(int) = NULL;
char *title;
@ -561,9 +564,13 @@ bool option_screen(const struct settings_list *setting,
}
settings_save();
done = true;
if (cb_on_select_only && function)
{
if (!cb_on_changed || (*variable != oldvalue))
function(*variable);
}
}
else if(default_event_handler(action) == SYS_USB_CONNECTED)
{
pop_current_activity();

17
apps/gui/quickscreen.c
View file

@ -418,8 +418,6 @@ static int gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter
int quick_screen_quick(int button_enter)
{
struct gui_quickscreen qs;
bool oldshuffle = global_settings.playlist_shuffle;
int oldrepeat = global_settings.repeat_mode;
#ifdef HAVE_ALBUMART
int old_album_art = global_settings.album_art;
#endif
@ -438,21 +436,6 @@ int quick_screen_quick(int button_enter)
if (ret & QUICKSCREEN_CHANGED)
{
settings_save();
/* make sure repeat/shuffle/any other nasty ones get updated */
if ( oldrepeat != global_settings.repeat_mode &&
(audio_status() & AUDIO_STATUS_PLAY) )
{
audio_flush_and_reload_tracks();
}
if (oldshuffle != global_settings.playlist_shuffle
&& audio_status() & AUDIO_STATUS_PLAY)
{
replaygain_update();
if (global_settings.playlist_shuffle)
playlist_randomise(NULL, current_tick, true);
else
playlist_sort(NULL, true);
}
#ifdef HAVE_ALBUMART
if (old_album_art != global_settings.album_art)
set_albumart_mode(global_settings.album_art);

39
apps/menus/playback_menu.c
View file

@ -244,19 +244,9 @@ static int playback_callback(int action,
struct gui_synclist *this_list)
{
(void)this_list;
static bool old_shuffle = false;
static int old_repeat = 0;
switch (action)
{
case ACTION_ENTER_MENUITEM:
if (this_item == &shuffle_item)
{
old_shuffle = global_settings.playlist_shuffle;
}
else if (this_item == &repeat_mode)
{
old_repeat = global_settings.repeat_mode;
}
break;
case ACTION_EXIT_MENUITEM: /* on exit */
@ -268,35 +258,6 @@ static int playback_callback(int action,
break;
}
#endif /* HAVE_PLAY_FREQ */
if (!(audio_status() & AUDIO_STATUS_PLAY))
break;
/* Playing only */
if (this_item == &shuffle_item)
{
if (old_shuffle == global_settings.playlist_shuffle)
break;
replaygain_update();
if (global_settings.playlist_shuffle)
{
playlist_randomise(NULL, current_tick, true);
}
else
{
playlist_sort(NULL, true);
}
}
else if (this_item == &repeat_mode)
{
if (old_repeat == global_settings.repeat_mode)
break;
audio_flush_and_reload_tracks();
}
break;
}
return action;

31
apps/settings_list.c
View file

@ -622,15 +622,32 @@ static void eq_set_default(void* setting, void* defaultval)
/* perform shuffle/unshuffle of the current playlist based on the boolean provided */
static void shuffle_playlist_callback(bool shuffle)
{
struct playlist_info *playlist = playlist_get_current();
if (playlist->started)
{
if ((audio_status() & AUDIO_STATUS_PLAY) == AUDIO_STATUS_PLAY)
{
replaygain_update();
if (shuffle)
{
playlist_randomise(NULL, current_tick, true);
playlist_randomise(playlist, current_tick, true);
}
else
{
playlist_sort(NULL, true);
playlist_sort(playlist, true);
}
}
}
}
static void repeat_mode_callback(int repeat)
{
if ((audio_status() & AUDIO_STATUS_PLAY) == AUDIO_STATUS_PLAY)
{
audio_flush_and_reload_tracks();
}
(void)repeat;
}
#ifdef HAVE_QUICKSCREEN
static void qs_load_from_cfg(void *var, char *value)
@ -912,17 +929,19 @@ const struct settings_list settings[] = {
#endif
/* playback */
OFFON_SETTING(0, playlist_shuffle, LANG_SHUFFLE, false, "shuffle", shuffle_playlist_callback),
OFFON_SETTING(F_CB_ON_SELECT_ONLY_IF_CHANGED, playlist_shuffle, LANG_SHUFFLE,
false, "shuffle", shuffle_playlist_callback),
SYSTEM_SETTING(NVRAM(4), resume_index, -1),
SYSTEM_SETTING(NVRAM(4), resume_crc32, -1),
SYSTEM_SETTING(NVRAM(4), resume_elapsed, -1),
SYSTEM_SETTING(NVRAM(4), resume_offset, -1),
CHOICE_SETTING(0, repeat_mode, LANG_REPEAT, REPEAT_OFF, "repeat",
"off,all,one,shuffle"
CHOICE_SETTING(F_CB_ON_SELECT_ONLY_IF_CHANGED, repeat_mode, LANG_REPEAT,
REPEAT_OFF, "repeat", "off,all,one,shuffle"
#ifdef AB_REPEAT_ENABLE
",ab"
#endif
, NULL,
, repeat_mode_callback,
#ifdef AB_REPEAT_ENABLE
5,
#else

1
apps/settings_list.h
View file

@ -102,6 +102,7 @@ struct table_setting {
#define F_TABLE_SETTING 0x2000
#define F_ALLOW_ARBITRARY_VALS 0x4000
#define F_CB_ON_SELECT_ONLY 0x20000
#define F_CB_ON_SELECT_ONLY_IF_CHANGED (F_CB_ON_SELECT_ONLY|F_TEMPVAR)
/* these use the _isfunc_type type for the function */
/* typedef int (*_isfunc_type)(void); */
#define F_MIN_ISFUNC 0x100000 /* min(above) is function pointer to above type */