diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-10-14 11:12:20 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-10-14 11:12:20 +0000 |
commit | 9558c4956d3d603c4d132af88633767810f3ba62 (patch) | |
tree | b0d739f6246a7175de106562a2c755724f977cbe /apps/mpeg.c | |
parent | 91b9c6139b3447d7c0f4f2924ef73a9dc323703b (diff) | |
download | rockbox-9558c4956d3d603c4d132af88633767810f3ba62.tar.gz rockbox-9558c4956d3d603c4d132af88633767810f3ba62.zip |
Moved pcm_record from firmware to apps. Cleaned up some. Now all code using struct mp3entry is in apps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18807 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/mpeg.c')
-rw-r--r-- | apps/mpeg.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/apps/mpeg.c b/apps/mpeg.c index 2c65e46060..b570f41b28 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -2432,6 +2432,15 @@ void audio_set_recording_options(struct audio_recording_options *options) | |||
2432 | 2432 | ||
2433 | DEBUGF("mas_writemem(MAS_BANK_D0, ENCODER_CONTROL, %x)\n", shadow_encoder_control); | 2433 | DEBUGF("mas_writemem(MAS_BANK_D0, ENCODER_CONTROL, %x)\n", shadow_encoder_control); |
2434 | 2434 | ||
2435 | #if CONFIG_TUNER & S1A0903X01 | ||
2436 | /* Store the (unpitched) MAS PLL frequency. Used for avoiding FM | ||
2437 | interference with the Samsung tuner. */ | ||
2438 | if (rec_frequency_index) | ||
2439 | mas_store_pllfreq(24576000); | ||
2440 | else | ||
2441 | mas_store_pllfreq(22579000); | ||
2442 | #endif | ||
2443 | |||
2435 | shadow_soft_mute = options->rec_editable?4:0; | 2444 | shadow_soft_mute = options->rec_editable?4:0; |
2436 | mas_writemem(MAS_BANK_D0, MAS_D0_SOFT_MUTE, &shadow_soft_mute,1); | 2445 | mas_writemem(MAS_BANK_D0, MAS_D0_SOFT_MUTE, &shadow_soft_mute,1); |
2437 | 2446 | ||
@@ -2484,22 +2493,6 @@ void audio_set_recording_gain(int left, int right, int type) | |||
2484 | mas_codec_writereg(0x0, shadow_codec_reg0); | 2493 | mas_codec_writereg(0x0, shadow_codec_reg0); |
2485 | } | 2494 | } |
2486 | 2495 | ||
2487 | #if CONFIG_TUNER & S1A0903X01 | ||
2488 | /* Get the (unpitched) MAS PLL frequency, for avoiding FM interference with the | ||
2489 | * Samsung tuner. Zero means unknown. Currently handles recording from analog | ||
2490 | * input only. */ | ||
2491 | int mpeg_get_mas_pllfreq(void) | ||
2492 | { | ||
2493 | if (mpeg_mode != MPEG_ENCODER) | ||
2494 | return 0; | ||
2495 | |||
2496 | if (rec_frequency_index == 0) /* 44.1 kHz / 22.05 kHz */ | ||
2497 | return 22579000; | ||
2498 | else | ||
2499 | return 24576000; | ||
2500 | } | ||
2501 | #endif /* CONFIG_TUNER & S1A0903X01 */ | ||
2502 | |||
2503 | /* try to make some kind of beep, also in recording mode */ | 2496 | /* try to make some kind of beep, also in recording mode */ |
2504 | void audio_beep(int duration) | 2497 | void audio_beep(int duration) |
2505 | { | 2498 | { |