summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorMarianne Arnold <pixelma@rockbox.org>2008-01-13 18:27:54 +0000
committerMarianne Arnold <pixelma@rockbox.org>2008-01-13 18:27:54 +0000
commit071c2ac339b4b10610f083b9d0ca253d99d3efb2 (patch)
tree5b20df2b4b9bdd73932587a392de698d90bec086 /apps/plugins
parent0ce6c52db4fb8d52b0015606736d58cb5bb00e07 (diff)
downloadrockbox-071c2ac339b4b10610f083b9d0ca253d99d3efb2.zip
rockbox-071c2ac339b4b10610f083b9d0ca253d99d3efb2.tar.gz
rockbox-071c2ac339b4b10610f083b9d0ca253d99d3efb2.tar.bz2
rockbox-071c2ac339b4b10610f083b9d0ca253d99d3efb2.tar.xz
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
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/SOURCES2
-rw-r--r--apps/plugins/metronome.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 2394d3d..392544d 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 bd99ce2..4b345df 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);
}