summaryrefslogtreecommitdiff
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
parent0ce6c52db4fb8d52b0015606736d58cb5bb00e07 (diff)
downloadrockbox-071c2ac339b4b10610f083b9d0ca253d99d3efb2.tar.gz
rockbox-071c2ac339b4b10610f083b9d0ca253d99d3efb2.zip
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
-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 2394d3dfbc..392544dbbf 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -29,7 +29,7 @@ jpeg.c
29 29
30#ifndef OLYMPUS_MROBE_500 30#ifndef OLYMPUS_MROBE_500
31 31
32#if CONFIG_CODEC == SWCODEC 32#if (CONFIG_CODEC == SWCODEC) || !defined(SIMULATOR)
33metronome.c 33metronome.c
34#endif 34#endif
35 35
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;
113 113
114void callback(unsigned char** start, size_t* size){ 114void callback(unsigned char** start, size_t* size){
115 (void)start; /* unused parameter, avoid warning */ 115 (void)start; /* unused parameter, avoid warning */
116 *size = NULL; /* end of data */ 116 *size = 0; /* end of data */
117 sound_active = false; 117 sound_active = false;
118 rb->led(0); 118 rb->led(0);
119} 119}