diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-09-17 18:52:31 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-09-17 18:52:31 +0000 |
commit | 9d56f2d2cf8889465fdf95ffefce195a06024f83 (patch) | |
tree | 36efe64d97c5ef76563cbc783e1e02c22742af42 /apps/recorder/radio.c | |
parent | d8f32834d697d32efb7736117190ad9bbf120669 (diff) | |
download | rockbox-9d56f2d2cf8889465fdf95ffefce195a06024f83.tar.gz rockbox-9d56f2d2cf8889465fdf95ffefce195a06024f83.zip |
SWCODEC recording hang fixed. Fixed other trouble spots for codec swapping when playing. Removed call to audio_set_recording_options from fm_recording_settings on SWCODEC (Not proper to do ! My bad.).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10978 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/radio.c')
-rw-r--r-- | apps/recorder/radio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 208e7b67fa..caaba67404 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1635,19 +1635,17 @@ static bool fm_recording_settings(void) | |||
1635 | { | 1635 | { |
1636 | bool ret = recording_menu(true); | 1636 | bool ret = recording_menu(true); |
1637 | 1637 | ||
1638 | #if CONFIG_CODEC != SWCODEC | ||
1638 | if (!ret) | 1639 | if (!ret) |
1639 | { | 1640 | { |
1640 | rec_set_recording_options(global_settings.rec_frequency, | 1641 | rec_set_recording_options(global_settings.rec_frequency, |
1641 | global_settings.rec_quality, | 1642 | global_settings.rec_quality, |
1642 | #if CONFIG_CODEC == SWCODEC | ||
1643 | AUDIO_SRC_FMRADIO, SRCF_FMRADIO_PLAYING, | ||
1644 | #else | ||
1645 | AUDIO_SRC_LINEIN, 0, | 1643 | AUDIO_SRC_LINEIN, 0, |
1646 | #endif | ||
1647 | global_settings.rec_channels, | 1644 | global_settings.rec_channels, |
1648 | global_settings.rec_editable, | 1645 | global_settings.rec_editable, |
1649 | global_settings.rec_prerecord_time); | 1646 | global_settings.rec_prerecord_time); |
1650 | } | 1647 | } |
1648 | #endif | ||
1651 | 1649 | ||
1652 | return ret; | 1650 | return ret; |
1653 | } | 1651 | } |