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

Recording: Change some encoder code the operation of which was apparantly unclear. It seems clearer now anyway. No functional changes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19255 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-11-28 07:23:13 +00:00
parent 8fb25b7c3e
commit 546d0dd4e6
4 changed files with 63 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/codecs/aiff_enc.c
View file

@ -199,26 +199,31 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data)
ICODE_ATTR;
STATICIRAM void enc_events_callback(enum enc_events event, void *data)
{
if (event == ENC_WRITE_CHUNK)
switch (event)
{
case ENC_WRITE_CHUNK:
if (on_write_chunk((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_START_FILE)
{
break;
case ENC_START_FILE:
if (on_start_file((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_END_FILE)
{
break;
case ENC_END_FILE:
if (on_end_file((struct enc_file_event_data *)data))
return;
}
else
{
break;
default:
return;
}
/* Something failed above. Signal error back to core. */
((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
} /* enc_events_callback */

32
apps/codecs/mp3_enc.c
View file

@ -2469,7 +2469,7 @@ static void on_rec_new_stream(struct enc_buffer_event_data *data)
else if (data->flags & CHUNKF_PRERECORD)
{
/* nothing to add and we cannot change prerecorded data */
}
}
else if (data->flags & CHUNKF_START_FILE)
{
/* starting fresh ... be sure to flush encoder first */
@ -2490,31 +2490,35 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data)
ICODE_ATTR;
STATICIRAM void enc_events_callback(enum enc_events event, void *data)
{
if (event == ENC_WRITE_CHUNK)
switch (event)
{
case ENC_WRITE_CHUNK:
if (on_write_chunk((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_START_FILE)
{
break;
case ENC_START_FILE:
if (on_start_file((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_END_FILE)
{
break;
case ENC_END_FILE:
if (on_end_file((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_REC_NEW_STREAM)
{
break;
case ENC_REC_NEW_STREAM:
on_rec_new_stream((struct enc_buffer_event_data *)data);
return;
}
else
{
default:
return;
}
/* Something failed above. Signal error back to core. */
((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
} /* enc_events_callback */

25
apps/codecs/wav_enc.c
View file

@ -188,26 +188,31 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data)
ICODE_ATTR;
STATICIRAM void enc_events_callback(enum enc_events event, void *data)
{
if (event == ENC_WRITE_CHUNK)
switch (event)
{
case ENC_WRITE_CHUNK:
if (on_write_chunk((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_START_FILE)
{
break;
case ENC_START_FILE:
if (on_start_file((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_END_FILE)
{
break;
case ENC_END_FILE:
if (on_end_file((struct enc_file_event_data *)data))
return;
}
else
{
break;
default:
return;
}
/* Something failed above. Signal error back to core. */
((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
} /* enc_events_callback */

25
apps/codecs/wavpack_enc.c
View file

@ -313,27 +313,32 @@ STATICIRAM void enc_events_callback(enum enc_events event, void *data)
ICODE_ATTR;
STATICIRAM void enc_events_callback(enum enc_events event, void *data)
{
if (event == ENC_WRITE_CHUNK)
switch (event)
{
case ENC_WRITE_CHUNK:
if (on_write_chunk((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_START_FILE)
{
break;
case ENC_START_FILE:
/* write metadata header and RIFF header */
if (on_start_file((struct enc_file_event_data *)data))
return;
}
else if (event == ENC_END_FILE)
{
break;
case ENC_END_FILE:
if (on_end_file((struct enc_file_event_data *)data))
return;
}
else
{
break;
default:
return;
}
/* Something failed above. Signal error back to core. */
((struct enc_file_event_data *)data)->chunk->flags |= CHUNKF_ERROR;
} /* enc_events_callback */