Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-28 08:20:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

make many-channel support work properly in winamp, add support in audacious

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@219 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
halleyscometsw 2008-06-12 00:06:35 +00:00
parent 6ca9d1fed6
commit fb7b381c69
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unix/main.c
View File

@ -85,7 +85,7 @@ SIMPLE_INPUT_PLUGIN(vgmstream,vgmstream_iplist);
void* vgmstream_play_loop(InputPlayback *playback) void* vgmstream_play_loop(InputPlayback *playback)
{ {
int16_t buffer[576*2]; int16_t buffer[576*vgmstream->channels];
long l; long l;
gint seek_needed_samples; gint seek_needed_samples;
gint samples_to_do; gint samples_to_do;
@ -271,7 +271,7 @@ void vgmstream_play(InputPlayback *context)
char title[260]; char title[260];
// this is now called in a new thread context // this is now called in a new thread context
vgmstream = init_vgmstream_from_STREAMFILE(open_vfs(context->filename)); vgmstream = init_vgmstream_from_STREAMFILE(open_vfs(context->filename));
if (!vgmstream || vgmstream->channels <= 0 || vgmstream->channels > 2) if (!vgmstream || vgmstream->channels <= 0)
{ {
CLOSE_STREAM(); CLOSE_STREAM();
return; return;

9
winamp/in_vgmstream.c
View File

@ -392,15 +392,18 @@ void eq_set(int on, char data[10], int preamp) {}
/* the decode thread */ /* the decode thread */
DWORD WINAPI __stdcall decode(void *arg) { DWORD WINAPI __stdcall decode(void *arg) {
/* channel count shouldn't change during decode */
int max_buffer_samples = sizeof(sample_buffer)/sizeof(sample_buffer[0])/2/vgmstream->channels;
while (!decode_abort) { while (!decode_abort) {
int samples_to_do; int samples_to_do;
int l; int l;
if (decode_pos_samples+576>stream_length_samples && (!loop_forever || !vgmstream->loop_flag)) if (decode_pos_samples+max_buffer_samples>stream_length_samples && (!loop_forever || !vgmstream->loop_flag))
samples_to_do=stream_length_samples-decode_pos_samples; samples_to_do=stream_length_samples-decode_pos_samples;
else else
samples_to_do=576; samples_to_do=max_buffer_samples;
/* play 'till the end of this seek, or note if we're done seeking */ /* play 'till the end of this seek, or note if we're done seeking */
if (seek_needed_samples != -1) { if (seek_needed_samples != -1) {
@ -416,7 +419,7 @@ DWORD WINAPI __stdcall decode(void *arg) {
if (decode_pos_samples < seek_needed_samples) { if (decode_pos_samples < seek_needed_samples) {
samples_to_do=seek_needed_samples-decode_pos_samples; samples_to_do=seek_needed_samples-decode_pos_samples;
if (samples_to_do>576) samples_to_do=576; if (samples_to_do>max_buffer_samples) samples_to_do=max_buffer_samples;
} else } else
seek_needed_samples = -1; seek_needed_samples = -1;