devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix errors and warnings.

Browse source 
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
This commit is contained in:
Thomas Martitz 2011-08-14 15:37:05 +00:00
parent 7695b0403f
commit 8a701e5488
7 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/mpeg.c
View file

@ -2126,9 +2126,8 @@ void audio_init_playback(void)
/**************************************************************************** /****************************************************************************
* Recording functions * Recording functions
***************************************************************************/ ***************************************************************************/
void audio_init_recording(unsigned int buffer_offset) void audio_init_recording(void)
{ {
buffer_offset = buffer_offset;
init_recording_done = false; init_recording_done = false;
queue_post(&mpeg_queue, MPEG_INIT_RECORDING, 0); queue_post(&mpeg_queue, MPEG_INIT_RECORDING, 0);
@ -2648,7 +2647,7 @@ void audio_set_recording_gain(int left, int right, int type)
(void)right; (void)right;
(void)type; (void)type;
} }
void audio_init_recording(unsigned int buffer_offset) void audio_init_recording(void)
{ {
/* a dummy */ /* a dummy */
(void)buffer_offset; (void)buffer_offset;

2
apps/radio/radio.c
View file

@ -397,7 +397,7 @@ void radio_screen(void)
#if CONFIG_CODEC != SWCODEC #if CONFIG_CODEC != SWCODEC
rec_create_directory(); rec_create_directory();
audio_init_recording(talk_get_bufsize()); audio_init_recording();
sound_settings_apply(); sound_settings_apply();
/* Yes, we use the D/A for monitoring */ /* Yes, we use the D/A for monitoring */

3
apps/recorder/pcm_record.c
View file

@ -392,12 +392,11 @@ void pcm_rec_init(void)
/** /**
* Initializes recording - call before calling any other recording function * Initializes recording - call before calling any other recording function
*/ */
void audio_init_recording(unsigned int buffer_offset) void audio_init_recording(void)
{ {
logf("audio_init_recording"); logf("audio_init_recording");
queue_send(&pcmrec_queue, PCMREC_INIT, 0); queue_send(&pcmrec_queue, PCMREC_INIT, 0);
logf("audio_init_recording done"); logf("audio_init_recording done");
(void)buffer_offset;
} /* audio_init_recording */ } /* audio_init_recording */
/** /**

4
apps/recorder/recording.c
View file

@ -1112,7 +1112,7 @@ bool recording_screen(bool no_source)
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
audio_close_recording(); audio_close_recording();
#endif #endif
audio_init_recording(0); audio_init_recording();
sound_set_volume(global_settings.volume); sound_set_volume(global_settings.volume);
#if CONFIG_RTC == 0 #if CONFIG_RTC == 0
@ -1213,7 +1213,7 @@ bool recording_screen(bool no_source)
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
audio_close_recording(); audio_close_recording();
audio_init_recording(0); audio_init_recording();
#endif #endif
rec_init_recording_options(&rec_options); rec_init_recording_options(&rec_options);

5
apps/talk.c
View file

@ -41,6 +41,7 @@
#include "logf.h" #include "logf.h"
#include "bitswap.h" #include "bitswap.h"
#include "structec.h" #include "structec.h"
#include "plugin.h" /* plugin_get_buffer() */
#include "debug.h" #include "debug.h"
@ -290,7 +291,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
}; };
union voicebuf voicebuf; union voicebuf voicebuf;
int load_size, alloc_size; size_t load_size, alloc_size;
int got_size; int got_size;
#ifndef TALK_PARTIAL_LOAD #ifndef TALK_PARTIAL_LOAD
size_t file_size; size_t file_size;
@ -396,7 +397,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
#ifdef TALK_PARTIAL_LOAD #ifdef TALK_PARTIAL_LOAD
alloc_size += silence_len + QUEUE_SIZE; alloc_size += silence_len + QUEUE_SIZE;
#endif #endif
if ((size_t)alloc_size > bufsize) if (alloc_size > bufsize)
goto load_err; goto load_err;
return; return;

7
firmware/buffer.c
View file

@ -31,7 +31,7 @@
/* defined in linker script */ /* defined in linker script */
#if (CONFIG_PLATFORM & PLATFORM_NATIVE) #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
#if defined(IPOD_VIDEO) #if defined(IPOD_VIDEO) && !defined(BOOTLOADER)
extern unsigned char *audiobufend_lds[]; extern unsigned char *audiobufend_lds[];
unsigned char *audiobufend; unsigned char *audiobufend;
#else /* !IPOD_VIDEO */ #else /* !IPOD_VIDEO */
@ -68,8 +68,8 @@ void buffer_init(void)
{ {
/* 32-bit aligned */ /* 32-bit aligned */
audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3); audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3);
#if defined(IPOD_VIDEO) #if defined(IPOD_VIDEO) && !defined(BOOTLOADER) && !defined(SIMULATOR)
audiobufend=(unsigned char *)audiobufend_lds; audiobufend=(unsigned char *)audiobufend_lds;
if(MEMORYSIZE==64 && probed_ramsize!=64) if(MEMORYSIZE==64 && probed_ramsize!=64)
{ {
@ -92,7 +92,6 @@ static volatile int lock;
* Note that this does not modify the buffer position (buffer_release_buffer() * Note that this does not modify the buffer position (buffer_release_buffer()
* does), so call this if you want to aquire temporary memory * does), so call this if you want to aquire temporary memory
**/ **/
#define _ALIGN (sizeof(char*))
void *buffer_get_buffer(size_t *size) void *buffer_get_buffer(size_t *size)
{ {
if (lock) if (lock)

2
firmware/export/audio.h
View file

@ -193,7 +193,7 @@ struct audio_recording_options
}; };
/* audio recording functions */ /* audio recording functions */
void audio_init_recording(unsigned int buffer_offset); void audio_init_recording(void);
void audio_close_recording(void); void audio_close_recording(void);
void audio_record(const char *filename); void audio_record(const char *filename);
void audio_stop_recording(void); void audio_stop_recording(void);