notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

load sounds late

Browse source
This commit is contained in:
Albert Cahalan 2005-01-20 17:52:09 +00:00
parent 61cbc0b2b6
commit c33de5a989
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tuxpaint.c
View file

@ -6749,6 +6749,17 @@ static void get_stamp_thumb(stamp_type *sd)
SDL_Surface *wrongmirror = NULL; SDL_Surface *wrongmirror = NULL;
int need_mirror = 0; int need_mirror = 0;
#ifndef NOSOUND
// good time to load the sound
if(!sd->no_sound && !sd->ssnd && use_sound)
{
// damn thing wants a .png extension; give it one
memcpy(buf+len, ".png", 5);
sd->ssnd = loadsound(buf);
sd->no_sound = !sd->ssnd;
}
#endif
// first see if we can re-use an existing thumbnail // first see if we can re-use an existing thumbnail
if(sd->thumbnail) if(sd->thumbnail)
{ {
@ -6928,9 +6939,6 @@ static void loadstamp_callback(const char *restrict const dir, unsigned dirlen,
if(stamp_data[num_stamps]->full_norm || stamp_data[num_stamps]->full_mirr) if(stamp_data[num_stamps]->full_norm || stamp_data[num_stamps]->full_mirr)
{ {
// we have a stamp; finalize it // we have a stamp; finalize it
#ifndef NOSOUND
stamp_data[num_stamps]->ssnd = use_sound ? loadsound(fname) : NULL;
#endif
loadstamp_finisher(num_stamps); loadstamp_finisher(num_stamps);
num_stamps++; num_stamps++;
} }