diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-05-31 04:13:39 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-05-31 04:13:39 -0400 |
commit | 344b9d09860af193a0a297438432339f4108c574 (patch) | |
tree | 6178600bfbfb140bf20475ce578ff4748fdf4630 /apps/recorder | |
parent | 5857c44017a1641fce7f00da7f16c143daacbaf6 (diff) | |
download | rockbox-344b9d09860af193a0a297438432339f4108c574.tar.gz rockbox-344b9d09860af193a0a297438432339f4108c574.zip |
Some corrections after 5857c44.
Playback needs to receive a couple of settings-related messages even
when not playing.
Put the message reply back where it was when loading an encoder for
recording.
Change-Id: I8cc80f46e42a0afd119991d698510e1ebef38ead
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/pcm_record.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c index a45dcc2d11..3b3211afab 100644 --- a/apps/recorder/pcm_record.c +++ b/apps/recorder/pcm_record.c | |||
@@ -1191,7 +1191,6 @@ static void pcmrec_close(void) | |||
1191 | 1191 | ||
1192 | /* PCMREC_OPTIONS */ | 1192 | /* PCMREC_OPTIONS */ |
1193 | static void pcmrec_set_recording_options( | 1193 | static void pcmrec_set_recording_options( |
1194 | struct event_queue *q, | ||
1195 | struct audio_recording_options *options) | 1194 | struct audio_recording_options *options) |
1196 | { | 1195 | { |
1197 | /* stop everything */ | 1196 | /* stop everything */ |
@@ -1237,9 +1236,10 @@ static void pcmrec_set_recording_options( | |||
1237 | /* apply hardware setting to start monitoring now */ | 1236 | /* apply hardware setting to start monitoring now */ |
1238 | pcm_apply_settings(); | 1237 | pcm_apply_settings(); |
1239 | 1238 | ||
1239 | queue_reply(&audio_queue, 0); /* Release sender */ | ||
1240 | |||
1240 | if (codec_load(-1, enc_config.afmt | CODEC_TYPE_ENCODER)) | 1241 | if (codec_load(-1, enc_config.afmt | CODEC_TYPE_ENCODER)) |
1241 | { | 1242 | { |
1242 | queue_reply(q, true); | ||
1243 | 1243 | ||
1244 | /* run immediately */ | 1244 | /* run immediately */ |
1245 | codec_go(); | 1245 | codec_go(); |
@@ -1487,7 +1487,7 @@ void audio_recording_handler(struct queue_event *ev) | |||
1487 | return; /* no more recording */ | 1487 | return; /* no more recording */ |
1488 | 1488 | ||
1489 | case Q_AUDIO_RECORDING_OPTIONS: | 1489 | case Q_AUDIO_RECORDING_OPTIONS: |
1490 | pcmrec_set_recording_options(&audio_queue, | 1490 | pcmrec_set_recording_options( |
1491 | (struct audio_recording_options *)ev->data); | 1491 | (struct audio_recording_options *)ev->data); |
1492 | break; | 1492 | break; |
1493 | 1493 | ||