diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-01-05 20:42:51 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-01-05 20:42:51 +0000 |
commit | f993365447d8dc5bb28c76a003cecd045c3abaf7 (patch) | |
tree | 19d4a2cfebd7e0f43c85559c2e88114fd4ba3223 /apps | |
parent | 974c2f0d43c1ebc786854f48f15ccaea7803d8f0 (diff) | |
download | rockbox-f993365447d8dc5bb28c76a003cecd045c3abaf7.tar.gz rockbox-f993365447d8dc5bb28c76a003cecd045c3abaf7.zip |
Moved the low-level playback functionality into a new, separate module "mp3_playback". This e.g. allows to export a memory playback API to the plugins, opens the door to games with sound, UI sounds, etc.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4192 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 35 | ||||
-rw-r--r-- | apps/recorder/recording.c | 1 | ||||
-rw-r--r-- | apps/screens.c | 1 | ||||
-rw-r--r-- | apps/settings.c | 1 | ||||
-rw-r--r-- | apps/sound_menu.c | 2 | ||||
-rw-r--r-- | apps/status.c | 2 | ||||
-rw-r--r-- | apps/wps.c | 1 |
7 files changed, 25 insertions, 18 deletions
diff --git a/apps/main.c b/apps/main.c index 04154f54fe..d6be594d07 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "serial.h" | 37 | #include "serial.h" |
38 | #endif | 38 | #endif |
39 | #include "mpeg.h" | 39 | #include "mpeg.h" |
40 | #include "mp3_playback.h" | ||
40 | #include "main_menu.h" | 41 | #include "main_menu.h" |
41 | #include "thread.h" | 42 | #include "thread.h" |
42 | #include "settings.h" | 43 | #include "settings.h" |
@@ -78,14 +79,15 @@ void init(void) | |||
78 | sleep(HZ/2); | 79 | sleep(HZ/2); |
79 | tree_init(); | 80 | tree_init(); |
80 | playlist_init(); | 81 | playlist_init(); |
81 | mpeg_init( global_settings.volume, | 82 | mp3_init( global_settings.volume, |
82 | global_settings.bass, | 83 | global_settings.bass, |
83 | global_settings.treble, | 84 | global_settings.treble, |
84 | global_settings.balance, | 85 | global_settings.balance, |
85 | global_settings.loudness, | 86 | global_settings.loudness, |
86 | global_settings.bass_boost, | 87 | global_settings.bass_boost, |
87 | global_settings.avc, | 88 | global_settings.avc, |
88 | global_settings.channel_config ); | 89 | global_settings.channel_config ); |
90 | mpeg_init(); | ||
89 | while (button_get(false) != 0) | 91 | while (button_get(false) != 0) |
90 | ; /* Empty the keyboard buffer */ | 92 | ; /* Empty the keyboard buffer */ |
91 | } | 93 | } |
@@ -197,14 +199,15 @@ void init(void) | |||
197 | 199 | ||
198 | /* No buffer allocation (see buffer.c) may take place after the call to | 200 | /* No buffer allocation (see buffer.c) may take place after the call to |
199 | mpeg_init() since the mpeg thread takes the rest of the buffer space */ | 201 | mpeg_init() since the mpeg thread takes the rest of the buffer space */ |
200 | mpeg_init( global_settings.volume, | 202 | mp3_init( global_settings.volume, |
201 | global_settings.bass, | 203 | global_settings.bass, |
202 | global_settings.treble, | 204 | global_settings.treble, |
203 | global_settings.balance, | 205 | global_settings.balance, |
204 | global_settings.loudness, | 206 | global_settings.loudness, |
205 | global_settings.bass_boost, | 207 | global_settings.bass_boost, |
206 | global_settings.avc, | 208 | global_settings.avc, |
207 | global_settings.channel_config ); | 209 | global_settings.channel_config ); |
210 | mpeg_init(); | ||
208 | 211 | ||
209 | /* no auto-rolo on startup any more, but I leave it here for reference */ | 212 | /* no auto-rolo on startup any more, but I leave it here for reference */ |
210 | #if 0 | 213 | #if 0 |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index bc26ff8495..c1a5f96ab6 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | #include "mpeg.h" | 28 | #include "mpeg.h" |
29 | #include "mp3_playback.h" | ||
29 | #include "mas.h" | 30 | #include "mas.h" |
30 | #include "button.h" | 31 | #include "button.h" |
31 | #include "kernel.h" | 32 | #include "kernel.h" |
diff --git a/apps/screens.c b/apps/screens.c index 8f7881a916..1b269d93bc 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "icons.h" | 26 | #include "icons.h" |
27 | #include "font.h" | 27 | #include "font.h" |
28 | #include "mpeg.h" | 28 | #include "mpeg.h" |
29 | #include "mp3_playback.h" | ||
29 | #include "usb.h" | 30 | #include "usb.h" |
30 | #include "settings.h" | 31 | #include "settings.h" |
31 | #include "status.h" | 32 | #include "status.h" |
diff --git a/apps/settings.c b/apps/settings.c index 35e75d12ca..b08ed8475d 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "backlight.h" | 31 | #include "backlight.h" |
32 | #include "lcd.h" | 32 | #include "lcd.h" |
33 | #include "mpeg.h" | 33 | #include "mpeg.h" |
34 | #include "mp3_playback.h" | ||
34 | #include "string.h" | 35 | #include "string.h" |
35 | #include "ata.h" | 36 | #include "ata.h" |
36 | #include "fat.h" | 37 | #include "fat.h" |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 557013df8a..11a5581ecb 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "lcd.h" | 23 | #include "lcd.h" |
24 | #include "menu.h" | 24 | #include "menu.h" |
25 | #include "button.h" | 25 | #include "button.h" |
26 | #include "mpeg.h" | 26 | #include "mp3_playback.h" |
27 | #include "settings.h" | 27 | #include "settings.h" |
28 | #include "status.h" | 28 | #include "status.h" |
29 | #include "screens.h" | 29 | #include "screens.h" |
diff --git a/apps/status.c b/apps/status.c index 68d6ac74c1..65eff70e81 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "thread.h" | 24 | #include "thread.h" |
25 | #include "settings.h" | 25 | #include "settings.h" |
26 | #include "status.h" | 26 | #include "status.h" |
27 | #include "mpeg.h" | 27 | #include "mp3_playback.h" |
28 | #include "wps.h" | 28 | #include "wps.h" |
29 | #ifdef HAVE_RTC | 29 | #ifdef HAVE_RTC |
30 | #include "timefuncs.h" | 30 | #include "timefuncs.h" |
diff --git a/apps/wps.c b/apps/wps.c index 10cc0c00fb..9e988d3721 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include "wps.h" | 33 | #include "wps.h" |
34 | #include "wps-display.h" | 34 | #include "wps-display.h" |
35 | #include "mpeg.h" | 35 | #include "mpeg.h" |
36 | #include "mp3_playback.h" | ||
36 | #include "usb.h" | 37 | #include "usb.h" |
37 | #include "status.h" | 38 | #include "status.h" |
38 | #include "main_menu.h" | 39 | #include "main_menu.h" |