diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 15:37:05 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 15:37:05 +0000 |
commit | 8a701e5488989944f120f0c37848de24fbeff455 (patch) | |
tree | 291b05e4bddad26c92668192edddd4ba4be310dd | |
parent | 7695b0403f772dd773ba25151bd8b97a7d16537e (diff) | |
download | rockbox-8a701e5488989944f120f0c37848de24fbeff455.tar.gz rockbox-8a701e5488989944f120f0c37848de24fbeff455.zip |
Fix errors and warnings.
The buffer_offset paramter of audio_init_recording() is removed as it
was unused in both implementations.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30310 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/mpeg.c | 5 | ||||
-rw-r--r-- | apps/radio/radio.c | 2 | ||||
-rw-r--r-- | apps/recorder/pcm_record.c | 3 | ||||
-rw-r--r-- | apps/recorder/recording.c | 4 | ||||
-rw-r--r-- | apps/talk.c | 5 | ||||
-rw-r--r-- | firmware/buffer.c | 7 | ||||
-rw-r--r-- | firmware/export/audio.h | 2 |
7 files changed, 13 insertions, 15 deletions
diff --git a/apps/mpeg.c b/apps/mpeg.c index a0182ad8d2..5e2816f633 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -2126,9 +2126,8 @@ void audio_init_playback(void) | |||
2126 | /**************************************************************************** | 2126 | /**************************************************************************** |
2127 | * Recording functions | 2127 | * Recording functions |
2128 | ***************************************************************************/ | 2128 | ***************************************************************************/ |
2129 | void audio_init_recording(unsigned int buffer_offset) | 2129 | void audio_init_recording(void) |
2130 | { | 2130 | { |
2131 | buffer_offset = buffer_offset; | ||
2132 | init_recording_done = false; | 2131 | init_recording_done = false; |
2133 | queue_post(&mpeg_queue, MPEG_INIT_RECORDING, 0); | 2132 | queue_post(&mpeg_queue, MPEG_INIT_RECORDING, 0); |
2134 | 2133 | ||
@@ -2648,7 +2647,7 @@ void audio_set_recording_gain(int left, int right, int type) | |||
2648 | (void)right; | 2647 | (void)right; |
2649 | (void)type; | 2648 | (void)type; |
2650 | } | 2649 | } |
2651 | void audio_init_recording(unsigned int buffer_offset) | 2650 | void audio_init_recording(void) |
2652 | { | 2651 | { |
2653 | /* a dummy */ | 2652 | /* a dummy */ |
2654 | (void)buffer_offset; | 2653 | (void)buffer_offset; |
diff --git a/apps/radio/radio.c b/apps/radio/radio.c index d687948c94..1a77709f9c 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c | |||
@@ -397,7 +397,7 @@ void radio_screen(void) | |||
397 | 397 | ||
398 | #if CONFIG_CODEC != SWCODEC | 398 | #if CONFIG_CODEC != SWCODEC |
399 | rec_create_directory(); | 399 | rec_create_directory(); |
400 | audio_init_recording(talk_get_bufsize()); | 400 | audio_init_recording(); |
401 | 401 | ||
402 | sound_settings_apply(); | 402 | sound_settings_apply(); |
403 | /* Yes, we use the D/A for monitoring */ | 403 | /* Yes, we use the D/A for monitoring */ |
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c index 407a7e5f49..3b069b6dc8 100644 --- a/apps/recorder/pcm_record.c +++ b/apps/recorder/pcm_record.c | |||
@@ -392,12 +392,11 @@ void pcm_rec_init(void) | |||
392 | /** | 392 | /** |
393 | * Initializes recording - call before calling any other recording function | 393 | * Initializes recording - call before calling any other recording function |
394 | */ | 394 | */ |
395 | void audio_init_recording(unsigned int buffer_offset) | 395 | void audio_init_recording(void) |
396 | { | 396 | { |
397 | logf("audio_init_recording"); | 397 | logf("audio_init_recording"); |
398 | queue_send(&pcmrec_queue, PCMREC_INIT, 0); | 398 | queue_send(&pcmrec_queue, PCMREC_INIT, 0); |
399 | logf("audio_init_recording done"); | 399 | logf("audio_init_recording done"); |
400 | (void)buffer_offset; | ||
401 | } /* audio_init_recording */ | 400 | } /* audio_init_recording */ |
402 | 401 | ||
403 | /** | 402 | /** |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 6faaa6c48c..453b2fc42d 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -1112,7 +1112,7 @@ bool recording_screen(bool no_source) | |||
1112 | #if CONFIG_CODEC == SWCODEC | 1112 | #if CONFIG_CODEC == SWCODEC |
1113 | audio_close_recording(); | 1113 | audio_close_recording(); |
1114 | #endif | 1114 | #endif |
1115 | audio_init_recording(0); | 1115 | audio_init_recording(); |
1116 | sound_set_volume(global_settings.volume); | 1116 | sound_set_volume(global_settings.volume); |
1117 | 1117 | ||
1118 | #if CONFIG_RTC == 0 | 1118 | #if CONFIG_RTC == 0 |
@@ -1213,7 +1213,7 @@ bool recording_screen(bool no_source) | |||
1213 | 1213 | ||
1214 | #if CONFIG_CODEC == SWCODEC | 1214 | #if CONFIG_CODEC == SWCODEC |
1215 | audio_close_recording(); | 1215 | audio_close_recording(); |
1216 | audio_init_recording(0); | 1216 | audio_init_recording(); |
1217 | #endif | 1217 | #endif |
1218 | 1218 | ||
1219 | rec_init_recording_options(&rec_options); | 1219 | rec_init_recording_options(&rec_options); |
diff --git a/apps/talk.c b/apps/talk.c index 9fd6fb06ec..0211bcc1f8 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include "logf.h" | 41 | #include "logf.h" |
42 | #include "bitswap.h" | 42 | #include "bitswap.h" |
43 | #include "structec.h" | 43 | #include "structec.h" |
44 | #include "plugin.h" /* plugin_get_buffer() */ | ||
44 | #include "debug.h" | 45 | #include "debug.h" |
45 | 46 | ||
46 | 47 | ||
@@ -290,7 +291,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize) | |||
290 | }; | 291 | }; |
291 | union voicebuf voicebuf; | 292 | union voicebuf voicebuf; |
292 | 293 | ||
293 | int load_size, alloc_size; | 294 | size_t load_size, alloc_size; |
294 | int got_size; | 295 | int got_size; |
295 | #ifndef TALK_PARTIAL_LOAD | 296 | #ifndef TALK_PARTIAL_LOAD |
296 | size_t file_size; | 297 | size_t file_size; |
@@ -396,7 +397,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize) | |||
396 | #ifdef TALK_PARTIAL_LOAD | 397 | #ifdef TALK_PARTIAL_LOAD |
397 | alloc_size += silence_len + QUEUE_SIZE; | 398 | alloc_size += silence_len + QUEUE_SIZE; |
398 | #endif | 399 | #endif |
399 | if ((size_t)alloc_size > bufsize) | 400 | if (alloc_size > bufsize) |
400 | goto load_err; | 401 | goto load_err; |
401 | return; | 402 | return; |
402 | 403 | ||
diff --git a/firmware/buffer.c b/firmware/buffer.c index 2168087bd9..e0496fe149 100644 --- a/firmware/buffer.c +++ b/firmware/buffer.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /* defined in linker script */ | 32 | /* defined in linker script */ |
33 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 33 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
34 | #if defined(IPOD_VIDEO) | 34 | #if defined(IPOD_VIDEO) && !defined(BOOTLOADER) |
35 | extern unsigned char *audiobufend_lds[]; | 35 | extern unsigned char *audiobufend_lds[]; |
36 | unsigned char *audiobufend; | 36 | unsigned char *audiobufend; |
37 | #else /* !IPOD_VIDEO */ | 37 | #else /* !IPOD_VIDEO */ |
@@ -68,8 +68,8 @@ void buffer_init(void) | |||
68 | { | 68 | { |
69 | /* 32-bit aligned */ | 69 | /* 32-bit aligned */ |
70 | audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3); | 70 | audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3); |
71 | 71 | ||
72 | #if defined(IPOD_VIDEO) | 72 | #if defined(IPOD_VIDEO) && !defined(BOOTLOADER) && !defined(SIMULATOR) |
73 | audiobufend=(unsigned char *)audiobufend_lds; | 73 | audiobufend=(unsigned char *)audiobufend_lds; |
74 | if(MEMORYSIZE==64 && probed_ramsize!=64) | 74 | if(MEMORYSIZE==64 && probed_ramsize!=64) |
75 | { | 75 | { |
@@ -92,7 +92,6 @@ static volatile int lock; | |||
92 | * Note that this does not modify the buffer position (buffer_release_buffer() | 92 | * Note that this does not modify the buffer position (buffer_release_buffer() |
93 | * does), so call this if you want to aquire temporary memory | 93 | * does), so call this if you want to aquire temporary memory |
94 | **/ | 94 | **/ |
95 | #define _ALIGN (sizeof(char*)) | ||
96 | void *buffer_get_buffer(size_t *size) | 95 | void *buffer_get_buffer(size_t *size) |
97 | { | 96 | { |
98 | if (lock) | 97 | if (lock) |
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index 6757bf143b..2835d8f4c4 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h | |||
@@ -193,7 +193,7 @@ struct audio_recording_options | |||
193 | }; | 193 | }; |
194 | 194 | ||
195 | /* audio recording functions */ | 195 | /* audio recording functions */ |
196 | void audio_init_recording(unsigned int buffer_offset); | 196 | void audio_init_recording(void); |
197 | void audio_close_recording(void); | 197 | void audio_close_recording(void); |
198 | void audio_record(const char *filename); | 198 | void audio_record(const char *filename); |
199 | void audio_stop_recording(void); | 199 | void audio_stop_recording(void); |