summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/mpeg.h2
-rw-r--r--firmware/mpeg.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h
index 75ec710a37..9b7388c544 100644
--- a/firmware/export/mpeg.h
+++ b/firmware/export/mpeg.h
@@ -56,7 +56,7 @@ struct mpeg_debug
56}; 56};
57 57
58void mpeg_init(int volume, int bass, int treble, int balance, 58void mpeg_init(int volume, int bass, int treble, int balance,
59 int loudness, int bass_boost, int avc); 59 int loudness, int bass_boost, int avc, int channel_config);
60void mpeg_play(int offset); 60void mpeg_play(int offset);
61void mpeg_stop(void); 61void mpeg_stop(void);
62void mpeg_pause(void); 62void mpeg_pause(void);
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 5335c3d422..d86b51fbd3 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -2809,10 +2809,12 @@ static void mpeg_thread(void)
2809} 2809}
2810#endif 2810#endif
2811 2811
2812void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int bass_boost, int avc) 2812void mpeg_init(int volume, int bass, int treble, int balance, int loudness,
2813 int bass_boost, int avc, int channel_config)
2813{ 2814{
2814#ifdef SIMULATOR 2815#ifdef SIMULATOR
2815 volume = bass = treble = balance = loudness = bass_boost = avc; 2816 volume = bass = treble = balance = loudness
2817 = bass_boost = avc = channel_config;
2816 create_thread(mpeg_thread, mpeg_stack, 2818 create_thread(mpeg_thread, mpeg_stack,
2817 sizeof(mpeg_stack), mpeg_thread_name); 2819 sizeof(mpeg_stack), mpeg_thread_name);
2818#else 2820#else
@@ -2893,7 +2895,7 @@ void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int
2893 mas_writereg(MAS_REG_KPRESCALE, 0xe9400); 2895 mas_writereg(MAS_REG_KPRESCALE, 0xe9400);
2894 dac_config(0x04); /* DAC on, all else off */ 2896 dac_config(0x04); /* DAC on, all else off */
2895 2897
2896 mpeg_sound_channel_config(MPEG_SOUND_STEREO); 2898 mpeg_sound_channel_config(channel_config);
2897#endif 2899#endif
2898 2900
2899#ifdef HAVE_MAS3587F 2901#ifdef HAVE_MAS3587F
@@ -2910,6 +2912,7 @@ void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int
2910 mpeg_sound_set(SOUND_VOLUME, volume); 2912 mpeg_sound_set(SOUND_VOLUME, volume);
2911 2913
2912#ifdef HAVE_MAS3587F 2914#ifdef HAVE_MAS3587F
2915 mpeg_sound_channel_config(channel_config);
2913 mpeg_sound_set(SOUND_LOUDNESS, loudness); 2916 mpeg_sound_set(SOUND_LOUDNESS, loudness);
2914 mpeg_sound_set(SOUND_SUPERBASS, bass_boost); 2917 mpeg_sound_set(SOUND_SUPERBASS, bass_boost);
2915 mpeg_sound_set(SOUND_AVC, avc); 2918 mpeg_sound_set(SOUND_AVC, avc);