summaryrefslogtreecommitdiff
path: root/firmware/mpeg.c
diff options
context:
space:
mode:
authorJörg Hohensohn <hohensoh@rockbox.org>2004-03-19 22:15:53 +0000
committerJörg Hohensohn <hohensoh@rockbox.org>2004-03-19 22:15:53 +0000
commitfa97f161abc45bfd5db86bceb8803d2661e65447 (patch)
tree1e06ac8c47bd9165e46e85235f059372ddad2b90 /firmware/mpeg.c
parent239b70fad38be55075dd14ea8e3c0f6f54a1f35b (diff)
downloadrockbox-fa97f161abc45bfd5db86bceb8803d2661e65447.tar.gz
rockbox-fa97f161abc45bfd5db86bceb8803d2661e65447.zip
Third step of the voice-UI: numerical settings are spoken (composed at runtime), needs new voicefont at the new location ".rockbox/langs/english.voice"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4414 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r--firmware/mpeg.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index fcb0d54bb7..ff545f03d0 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -30,7 +30,6 @@
30#include "mp3data.h" 30#include "mp3data.h"
31#include "buffer.h" 31#include "buffer.h"
32#include "mp3_playback.h" 32#include "mp3_playback.h"
33#include "talk.h"
34#ifndef SIMULATOR 33#ifndef SIMULATOR
35#include "i2c.h" 34#include "i2c.h"
36#include "mas.h" 35#include "mas.h"
@@ -2135,7 +2134,6 @@ void mpeg_record(char *filename)
2135 recording_filename[MAX_PATH - 1] = 0; 2134 recording_filename[MAX_PATH - 1] = 0;
2136 2135
2137 disable_xing_header = false; 2136 disable_xing_header = false;
2138 talk_buffer_steal(); /* we use the mp3 buffer, need to tell */
2139 queue_post(&mpeg_queue, MPEG_RECORD, NULL); 2137 queue_post(&mpeg_queue, MPEG_RECORD, NULL);
2140} 2138}
2141 2139
@@ -2150,7 +2148,6 @@ static void start_prerecording(void)
2150 prerecord_timeout = current_tick + HZ; 2148 prerecord_timeout = current_tick + HZ;
2151 memset(prerecord_buffer, 0, sizeof(prerecord_buffer)); 2149 memset(prerecord_buffer, 0, sizeof(prerecord_buffer));
2152 reset_mp3_buffer(); 2150 reset_mp3_buffer();
2153 talk_buffer_steal(); /* we use the mp3 buffer, need to tell */
2154 2151
2155 is_prerecording = true; 2152 is_prerecording = true;
2156 2153
@@ -2407,7 +2404,6 @@ void mpeg_play(int offset)
2407#else 2404#else
2408 is_playing = true; 2405 is_playing = true;
2409 2406
2410 talk_buffer_steal(); /* we use the mp3 buffer, need to tell */
2411 queue_post(&mpeg_queue, MPEG_PLAY, (void*)offset); 2407 queue_post(&mpeg_queue, MPEG_PLAY, (void*)offset);
2412#endif /* #ifdef SIMULATOR */ 2408#endif /* #ifdef SIMULATOR */
2413 2409