From 071c2ac339b4b10610f083b9d0ca253d99d3efb2 Mon Sep 17 00:00:00 2001 From: Marianne Arnold Date: Sun, 13 Jan 2008 18:27:54 +0000 Subject: [PATCH] Reenable metronome on Archos targets which got lost during the big change to it in last summer and fix a warning (wrong data type). The plugin button action system causes problems with the Ondio controls (tapping and playing conflict, even though there are exceptions defined) and it's only halfway usable, probably this applies to the Player as well but couldn't test. It is still better than nothing and e.g. metronome is not completely controllable on c200 too where it is also enabled. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16079 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/SOURCES | 2 +- apps/plugins/metronome.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 2394d3dfbc..392544dbbf 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -29,7 +29,7 @@ jpeg.c #ifndef OLYMPUS_MROBE_500 -#if CONFIG_CODEC == SWCODEC +#if (CONFIG_CODEC == SWCODEC) || !defined(SIMULATOR) metronome.c #endif diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index bd99ce2ce3..4b345df460 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c @@ -113,7 +113,7 @@ int bpm_step_counter = 0; void callback(unsigned char** start, size_t* size){ (void)start; /* unused parameter, avoid warning */ - *size = NULL; /* end of data */ + *size = 0; /* end of data */ sound_active = false; rb->led(0); }