Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Announce_status plugin bugfix use artist prior to albumartist
give id3->artist higer precedence than id3->albumartist
Change-Id: I7f57ea274211673c04bf23458735796b03031a15
+16
-5
+16
-5
apps/plugins/announce_status.c
+16
-5
apps/plugins/announce_status.c
···
106
106
unsigned int index;
107
107
int bin_added;
108
108
109
+
bool show_prompt;
110
+
109
111
unsigned char wps_fmt[MAX_ANNOUNCE_WPS+1];
110
112
} gAnnounce;
111
113
···
115
117
{TYPE_INT, 0, 2, { .int_p = &gAnnounce.announce_on }, "Announce", NULL},
116
118
{TYPE_INT, 0, 10, { .int_p = &gAnnounce.grouping }, "Grouping", NULL},
117
119
{TYPE_INT, 0, 10000, { .int_p = &gAnnounce.bin_added }, "Added", NULL},
120
+
{TYPE_BOOL, 0, 1, { .bool_p = &gAnnounce.show_prompt }, "Prompt", NULL},
118
121
{TYPE_STRING, 0, MAX_ANNOUNCE_WPS+1,
119
122
{ .string = (char*)&gAnnounce.wps_fmt }, "Fmt", NULL},
120
123
};
···
153
156
gAnnounce.announce_on = 0;
154
157
gAnnounce.grouping = 0;
155
158
gAnnounce.wps_fmt[0] = '\0';
159
+
gAnnounce.show_prompt = true;
156
160
}
157
161
158
162
static void config_reset_voice(void)
···
189
193
rb->talk_force_shutup();
190
194
rb->sleep(HZ / 2);
191
195
voice_info_group(gAnnounce.wps_fmt, true);
192
-
196
+
rb->splash(HZ, "...");
193
197
//rb->talk_force_enqueue_next();
194
198
}
195
199
···
267
271
announce_add("D2Dd ;");
268
272
break;
269
273
case 2: /*Track*/
270
-
announce_add("TT T1TeT2Tr ;");
274
+
announce_add("TT TA T1TeT2Tr ;");
271
275
break;
272
276
case 3: /*Playlist*/
273
277
announce_add("P1PC P2PN ;");
···
525
529
rb->splash(HZ, ID2P(LANG_HOLD_FOR_SETTINGS));
526
530
}
527
531
528
-
if (rb->mixer_channel_status(PCM_MIXER_CHAN_PLAYBACK) != CHANNEL_PLAYING)
532
+
if (gAnnounce.show_prompt)
529
533
{
530
-
rb->talk_id(LANG_HOLD_FOR_SETTINGS, false);
534
+
if (rb->mixer_channel_status(PCM_MIXER_CHAN_PLAYBACK) != CHANNEL_PLAYING)
535
+
{
536
+
rb->talk_id(LANG_HOLD_FOR_SETTINGS, false);
537
+
}
538
+
rb->splash(HZ, ID2P(LANG_HOLD_FOR_SETTINGS));
531
539
}
532
-
rb->splash(HZ, ID2P(LANG_HOLD_FOR_SETTINGS));
533
540
534
541
rb->button_clear_queue();
535
542
if (rb->button_get_w_tmo(HZ) > BUTTON_NONE)
···
733
740
else if (current_char == 'T' && id3->title)
734
741
{
735
742
rb->talk_spell(id3->title, true);
743
+
}
744
+
else if (current_char == 'A' && id3->artist)
745
+
{
746
+
rb->talk_spell(id3->artist, true);
736
747
}
737
748
else if (current_char == 'A' && id3->albumartist)
738
749
{