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

More code cleanups

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5980 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2005-02-16 16:06:06 +00:00
parent 594b690af2
commit a9b7109b67
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/plugins/a52towav.c
View file

@ -175,7 +175,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
/* This function sets up the buffers and reads the file into RAM */ /* This function sets up the buffers and reads the file into RAM */
if (local_init(file,&file_info)) { if (local_init(file,"/ac3test.wav",&file_info)) {
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
@ -190,6 +190,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
/* The main decoding loop */ /* The main decoding loop */
file_info.start_tick=*(rb->current_tick); file_info.start_tick=*(rb->current_tick);
rb->button_clear_queue();
while (file_info.curpos < file_info.filesize) { while (file_info.curpos < file_info.filesize) {
if ((file_info.curpos+BUFFER_SIZE) < file_info.filesize) { if ((file_info.curpos+BUFFER_SIZE) < file_info.filesize) {

17
apps/plugins/xxx2wav.h
View file

@ -55,7 +55,7 @@ void* malloc(size_t size) {
x=&mallocbuf[mem_ptr]; x=&mallocbuf[mem_ptr];
mem_ptr+=size+(size%4); // Keep memory 32-bit aligned (if it was already?) mem_ptr+=size+(size%4); // Keep memory 32-bit aligned (if it was already?)
rb->snprintf(s,30,"Memory used: %d\r",mem_ptr); rb->snprintf(s,30,"Memory used: %d",mem_ptr);
rb->lcd_putsxy(0,80,s); rb->lcd_putsxy(0,80,s);
rb->lcd_update(); rb->lcd_update();
return(x); return(x);
@ -111,11 +111,11 @@ void display_status(file_info_struct* file_info) {
unsigned long long speed; unsigned long long speed;
unsigned long xspeed; unsigned long xspeed;
rb->snprintf(s,32,"Bytes read: %d\r",file_info->curpos); rb->snprintf(s,32,"Bytes read: %d",file_info->curpos);
rb->lcd_putsxy(0,0,s); rb->lcd_putsxy(0,0,s);
rb->snprintf(s,32,"Samples Decoded: %d\r",file_info->current_sample); rb->snprintf(s,32,"Samples Decoded: %d",file_info->current_sample);
rb->lcd_putsxy(0,20,s); rb->lcd_putsxy(0,20,s);
rb->snprintf(s,32,"Frames Decoded: %d\r",file_info->frames_decoded); rb->snprintf(s,32,"Frames Decoded: %d",file_info->frames_decoded);
rb->lcd_putsxy(0,40,s); rb->lcd_putsxy(0,40,s);
ticks_taken=*(rb->current_tick)-file_info->start_tick; ticks_taken=*(rb->current_tick)-file_info->start_tick;
@ -154,7 +154,7 @@ static unsigned char wav_header[44]={'R','I','F','F', // 0 - ChunkID
}; };
int local_init(char* file, file_info_struct* file_info) { int local_init(char* infilename, char* outfilename, file_info_struct* file_info) {
char s[32]; char s[32];
int i,n,bytesleft; int i,n,bytesleft;
@ -163,14 +163,15 @@ int local_init(char* file, file_info_struct* file_info) {
mallocbuf=mp3buf; mallocbuf=mp3buf;
filebuf=&mp3buf[MALLOC_BUFSIZE]; filebuf=&mp3buf[MALLOC_BUFSIZE];
rb->snprintf(s,32,"mp3 bufsize: %d\r",bufsize); rb->snprintf(s,32,"mp3 bufsize: %d",bufsize);
rb->lcd_putsxy(0,100,s); rb->lcd_putsxy(0,100,s);
rb->lcd_update(); rb->lcd_update();
file_info->infile=rb->open(file,O_RDONLY); file_info->infile=rb->open(infilename,O_RDONLY);
file_info->outfile=rb->creat("/ac3test.wav",O_WRONLY); file_info->outfile=rb->creat(outfilename,O_WRONLY);
rb->write(file_info->outfile,wav_header,sizeof(wav_header)); rb->write(file_info->outfile,wav_header,sizeof(wav_header));
file_info->curpos=0; file_info->curpos=0;
file_info->current_sample=0;
file_info->frames_decoded=0; file_info->frames_decoded=0;
file_info->filesize=rb->filesize(file_info->infile); file_info->filesize=rb->filesize(file_info->infile);