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

add fading for audacious

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@215 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
halleyscometsw 2008-06-09 02:52:39 +00:00
parent 6f251f270e
commit 0ff17b590b
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
unix/main.c
View File

@ -27,11 +27,13 @@ extern InputPlugin vgmstream_iplug;
static volatile long decode_seek; static volatile long decode_seek;
static GThread *decode_thread; static GThread *decode_thread;
static gint stream_length_samples; static gint stream_length_samples;
static gint fade_length_samples;
SETTINGS settings; SETTINGS settings;
static gint decode_pos_samples = 0; static gint decode_pos_samples = 0;
static VGMSTREAM *vgmstream = NULL; static VGMSTREAM *vgmstream = NULL;
static gchar strPlaying[260]; static gchar strPlaying[260];
static InputPlugin *vgmstream_iplist[] = { &vgmstream_iplug, NULL }; static InputPlugin *vgmstream_iplist[] = { &vgmstream_iplug, NULL };
static gint loop_forever = 0;
/* /*
static gint get_ms_position() static gint get_ms_position()
@ -157,9 +159,27 @@ void* vgmstream_play_loop(InputPlayback *playback)
} }
else else
{ {
// ok we read stuff , pass it on // ok we read stuff
render_vgmstream(buffer,samples_to_do,vgmstream); render_vgmstream(buffer,samples_to_do,vgmstream);
/* TODO fading */
// fade!
if (vgmstream->loop_flag && fade_length_samples > 0 && !loop_forever) {
int samples_into_fade = decode_pos_samples - (stream_length_samples - fade_length_samples);
if (samples_into_fade + samples_to_do > 0) {
int j,k;
for (j=0;j<samples_to_do;j++,samples_into_fade++) {
if (samples_into_fade > 0) {
double fadedness = (double)(fade_length_samples-samples_into_fade)/fade_length_samples;
for (k=0;k<vgmstream->channels;k++) {
buffer[j*vgmstream->channels+k] =
(short)(buffer[j*vgmstream->channels+k]*fadedness);
}
}
}
}
}
// pass it on
playback->pass_audio(playback,FMT_S16_LE,vgmstream->channels , l , buffer , &playback->playing ); playback->pass_audio(playback,FMT_S16_LE,vgmstream->channels , l , buffer , &playback->playing );
decode_pos_samples += samples_to_do; decode_pos_samples += samples_to_do;
@ -267,6 +287,12 @@ void vgmstream_play(InputPlayback *context)
strcpy(strPlaying,context->filename); strcpy(strPlaying,context->filename);
// set the info // set the info
stream_length_samples = get_vgmstream_play_samples(settings.loopcount,settings.fadeseconds,settings.fadedelayseconds,vgmstream); stream_length_samples = get_vgmstream_play_samples(settings.loopcount,settings.fadeseconds,settings.fadedelayseconds,vgmstream);
if (vgmstream->loop_flag)
{
fade_length_samples = settings.fadeseconds * vgmstream->sample_rate;
} else {
fade_length_samples = -1;
}
gint ms = (stream_length_samples * 1000LL) / vgmstream->sample_rate; gint ms = (stream_length_samples * 1000LL) / vgmstream->sample_rate;
gint rate = vgmstream->sample_rate * 2 * vgmstream->channels; gint rate = vgmstream->sample_rate * 2 * vgmstream->channels;
context->set_params(context,get_title(context->filename,title,sizeof(title)), context->set_params(context,get_title(context->filename,title,sizeof(title)),