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

Additional Single Mode options

Browse source 
In addition to the existing behavior of pausing
after each song, this adds options to pause
after playing current:

Album,
Album Artist,
Artist,
Composer,
Grouping / Work, or
Genre.

Allows you, for example, to only listen to the
remaining movements of a classical work
without having to purge your playlist of any
upcoming songs.

Change-Id: If18f4a5d139320026cc5fcc9adf29dd8e4e028a8
This commit is contained in:
Christian Soffke 2021-11-30 21:02:32 +01:00 • committed by Aidan MacDonald
parent 8060c79775
commit 69d08be083
6 changed files with 76 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

45
apps/playback.c
View file

@ -2367,6 +2367,31 @@ static void audio_on_handle_finished(int hid)
}
}
static inline char* single_mode_get_id3_tag(struct mp3entry *id3)
{
struct mp3entry *valid_id3 = valid_mp3entry(id3);
if (valid_id3 == NULL)
return NULL;
switch (global_settings.single_mode)
{
case SINGLE_MODE_ALBUM:
return valid_id3->album;
case SINGLE_MODE_ALBUM_ARTIST:
return valid_id3->albumartist;
case SINGLE_MODE_ARTIST:
return valid_id3->artist;
case SINGLE_MODE_COMPOSER:
return valid_id3->composer;
case SINGLE_MODE_GROUPING:
return valid_id3->grouping;
case SINGLE_MODE_GENRE:
return valid_id3->genre_string;
}
return NULL;
}
/* Called to make an outstanding track skip the current track and to send the
transition events */
static void audio_finalise_track_change(void)
@ -2422,15 +2447,27 @@ static void audio_finalise_track_change(void)
track_id3 = bufgetid3(info.id3_hid);
}
id3_write(PLAYING_ID3, track_id3);
if (SINGLE_MODE_OFF != global_settings.single_mode && global_settings.party_mode == 0 &&
((skip_pending == TRACK_SKIP_AUTO) || (skip_pending == TRACK_SKIP_AUTO_NEW_PLAYLIST)))
{
bool single_mode_do_pause = true;
if (SINGLE_MODE_TRACK != global_settings.single_mode)
{
char *previous_tag = single_mode_get_id3_tag(id3_get(PLAYING_ID3));
char *new_tag = single_mode_get_id3_tag(track_id3);
single_mode_do_pause = previous_tag == NULL ||
new_tag == NULL ||
strcmp(previous_tag, new_tag) != 0;
}
if (global_settings.single_mode)
if ( ((skip_pending == TRACK_SKIP_AUTO) || (skip_pending == TRACK_SKIP_AUTO_NEW_PLAYLIST))
&& (global_settings.party_mode == 0) )
if (single_mode_do_pause)
{
play_status = PLAY_PAUSED;
pcmbuf_pause(true);
}
}
id3_write(PLAYING_ID3, track_id3);
/* The skip is technically over */
skip_pending = TRACK_SKIP_NONE;