summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2021-03-05 12:20:57 -0500
committerWilliam Wilgus <me.theuser@yahoo.com>2021-03-05 17:37:57 +0000
commit0c958d2b4ad24549260a51f3fb0eac2fd7748270 (patch)
treed64862b5d1a186321417c0fc65faff1ae19e701b /apps
parent83111eeeced7039226eac8dc5866e3783d6eb08a (diff)
downloadrockbox-0c958d2b4ad24549260a51f3fb0eac2fd7748270.tar.gz
rockbox-0c958d2b4ad24549260a51f3fb0eac2fd7748270.tar.bz2
rockbox-0c958d2b4ad24549260a51f3fb0eac2fd7748270.zip
announce_status trackchange bugfix
!Properly remove callback! don't play voice prompt at startup if something is actively playing Change-Id: I237d09c1496bc2bed8433dcdaa1469f3d0f2cb10
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/announce_status.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/apps/plugins/announce_status.c b/apps/plugins/announce_status.c
index 9df6fef7bc..f9f656da86 100644
--- a/apps/plugins/announce_status.c
+++ b/apps/plugins/announce_status.c
@@ -141,7 +141,8 @@ static void playback_event_callback(unsigned short id, void *data)
{
(void)id;
(void)data;
- rb->queue_post(&gThread.queue, EV_TRACKCHANGE, 0);
+ if (gThread.id > 0)
+ rb->queue_post(&gThread.queue, EV_TRACKCHANGE, 0);
}
/****************** config functions *****************/
@@ -458,11 +459,11 @@ void thread_create(void)
{
rb->splash(HZ*2, "Out of memory");
gThread.exiting = true;
+ rb->remove_event(PLAYBACK_EVENT_TRACK_CHANGE, playback_event_callback);
gThread.id = UINT_MAX;
return;
}
-
/* put the thread's queue in the bcast list */
rb->queue_init(&gThread.queue, true);
@@ -480,6 +481,8 @@ void thread_quit(void)
if (!gThread.exiting) {
rb->queue_post(&gThread.queue, EV_EXIT, 0);
rb->thread_wait(gThread.id);
+ /* we don't want any more events */
+ rb->remove_event(PLAYBACK_EVENT_TRACK_CHANGE, playback_event_callback);
/* remove the thread's queue from the broadcast list */
rb->queue_delete(&gThread.queue);
gThread.exiting = true;
@@ -511,7 +514,6 @@ int plugin_main(const void* parameter)
gAnnounce.index = 0;
gAnnounce.timeout = 0;
-
rb->splash(HZ / 2, "Announce Status");
if (configfile_load(CFG_FILE, config, gCfg_sz, CFG_VER) < 0)
@@ -520,17 +522,13 @@ int plugin_main(const void* parameter)
config_set_defaults();
configfile_save(CFG_FILE, config, gCfg_sz, CFG_VER);
- if (rb->mixer_channel_status(PCM_MIXER_CHAN_PLAYBACK) == CHANNEL_PLAYING)
- {
- while (rb->mixer_channel_get_bytes_waiting(PCM_MIXER_CHAN_PLAYBACK) > 0)
- rb->sleep(HZ / 10);
- }
-
- rb->talk_id(LANG_HOLD_FOR_SETTINGS, false);
-
rb->splash(HZ, ID2P(LANG_HOLD_FOR_SETTINGS));
}
+ if (rb->mixer_channel_status(PCM_MIXER_CHAN_PLAYBACK) != CHANNEL_PLAYING)
+ {
+ rb->talk_id(LANG_HOLD_FOR_SETTINGS, false);
+ }
rb->splash(HZ, ID2P(LANG_HOLD_FOR_SETTINGS));
rb->button_clear_queue();
@@ -567,6 +565,7 @@ int plugin_main(const void* parameter)
rb->add_event(PLAYBACK_EVENT_TRACK_CHANGE, playback_event_callback);
thread_create();
+
return 0;
}
@@ -578,8 +577,6 @@ enum plugin_status plugin_start(const void* parameter)
{
/* now go ahead and have fun! */
int ret = plugin_main(parameter);
-
- rb->remove_event(PLAYBACK_EVENT_START_PLAYBACK, playback_event_callback);
return (ret==0) ? PLUGIN_OK : PLUGIN_ERROR;
}