sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Possible fix for bug #3094 - use normal malloc/free for stuff that gets

Browse Source 
alloced inside SDL threads.
This commit is contained in:
Alexander Ewering 2005-09-30 10:23:28 +00:00
parent 3c3b0c13e3
commit 61e9d7c2d4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/sound.c
View File

@ -36,7 +36,7 @@ void sound_free_sound(bSound *sound)
sound->newpackedfile = NULL;
}
}
if (sound->stream) MEM_freeN(sound->stream);
if (sound->stream) free(sound->stream);
}
void sound_free_sample(bSample *sample)

2
source/blender/src/buttons_scene.c
View File

@ -227,7 +227,7 @@ void do_soundbuts(unsigned short event)
waitcursor(1);
sound = G.main->sound.first;
while (sound) {
MEM_freeN(sound->stream);
free(sound->stream);
sound->stream = 0;
audio_makestream(sound);
sound = (bSound *) sound->id.next;

6
source/blender/src/seqaudio.c
View File

@ -235,7 +235,7 @@ void audio_makestream(bSound *sound)
}
ratio = (float)G.scene->audio.mixrate / (float)sound->sample->rate;
sound->streamlen = (int) ( (float)sound->sample->len * ratio * 2.0/((float)sound->sample->channels) );
sound->stream = MEM_mallocN((int) ((float)sound->streamlen * 1.05), "stream");
sound->stream = malloc((int) ((float)sound->streamlen * 1.05));
if (sound->sample->rate == G.scene->audio.mixrate) {
if (sound->sample->channels == 2) {
memcpy(sound->stream, sound->sample->data, sound->streamlen);
@ -286,7 +286,7 @@ void audio_fill(void *mixdown, Uint8 *sstream, int len)
(seq->startdisp <= CFRA) && ((seq->enddisp) > CFRA))
{
if(seq->ipo && seq->ipo->curve.first) facf = seq->facf0; else facf = 1.0;
cvtbuf = MEM_callocN(len, "cvtbuf");
cvtbuf = malloc(len);
memcpy(cvtbuf, ((Uint8*)sound->stream)+(seq->curpos & (~3)), len);
audio_levels(cvtbuf, len, seq->level, facf, seq->pan);
if (!mixdown) {
@ -294,7 +294,7 @@ void audio_fill(void *mixdown, Uint8 *sstream, int len)
} else {
SDL_MixAudio((Uint8*)mixdown, cvtbuf, len, SDL_MIX_MAXVOLUME);
}
MEM_freeN(cvtbuf);
free(cvtbuf);
}
seq->curpos += len;
}