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

Just a few compiler warnings...

Browse Source
This commit is contained in:
Joshua Leung 2009-11-22 12:45:37 +00:00
parent 220669d1fd
commit 0fe908181e
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/fmodifier.c
View File

@ -892,16 +892,21 @@ static void fcm_sound_evaluate (FCurve *fcu, FModifier *fcm, float *cvalue, floa
float amplitude;
AUD_Device *device;
SoundHandle* handle;
AUD_Sound *limiter;
AUD_SoundInfo info;
// XXX fixme - need to get in terms of time instead of frames to be really useful
// evaltime = FRA2TIME(evaltime);
evaltime -= data->delay;
if(evaltime < 0.0f || data->sound == NULL || data->sound->cache == NULL)
/* sound-system cannot cope with negative times/frames */
if (evaltime < 0.0f)
return;
/* must have a sound with a cache so that this can be used */
if (ELEM(NULL, data->sound, data->sound->cache))
return;
/* examine this snippet of the wave, and extract the amplitude from it */
info = AUD_getInfo(data->sound->cache);
info.specs.channels = 1;
info.specs.format = AUD_FORMAT_FLOAT32;
@ -909,7 +914,7 @@ static void fcm_sound_evaluate (FCurve *fcu, FModifier *fcm, float *cvalue, floa
limiter = AUD_limitSound(data->sound->cache, evaltime, evaltime + 1);
AUD_playDevice(device, limiter);
AUD_unload(limiter);
AUD_readDevice(device, &amplitude, 1);
AUD_readDevice(device, (sample_t*)&amplitude, 1);
AUD_closeReadDevice(device);
/* combine the amplitude with existing motion data */

14
source/blender/editors/animation/fmodifier_ui.c
View File

@ -330,18 +330,19 @@ static void draw_modifier__noise(uiLayout *layout, ID *id, FModifier *fcm, short
/* draw settings for sound modifier */
static void draw_modifier__sound(const bContext *C, uiLayout *layout, ID *id, FModifier *fcm, short width)
{
FMod_Sound *data= (FMod_Sound *)fcm->data;
uiLayout *split, *col;
PointerRNA ptr;
FMod_Sound *data= (FMod_Sound *)fcm->data;
/* init the RNA-pointer */
RNA_pointer_create(id, &RNA_FModifierSound, fcm, &ptr);
/* sound */
uiTemplateID(layout, C, &ptr, "sound", NULL, "sound.open", NULL);
uiTemplateID(layout, (bContext*)C, &ptr, "sound", NULL, "sound.open", NULL);
if (data->sound)
{
/* only sounds that are cached can be used, so display error if not cached */
if (data->sound->cache)
{
/* blending mode */
@ -360,10 +361,13 @@ static void draw_modifier__sound(const bContext *C, uiLayout *layout, ID *id, FM
}
else
{
PointerRNA ptr2;
RNA_id_pointer_create(data->sound, &ptr2);
PointerRNA id_ptr;
RNA_id_pointer_create((ID *)data->sound, &id_ptr);
/* error message with a button underneath allowing users to rectify the issue */
uiItemL(layout, "Sound must be cached.", ICON_ERROR);
uiItemR(layout, NULL, 0, &ptr2, "caching", UI_ITEM_R_TOGGLE);
uiItemR(layout, NULL, 0, &id_ptr, "caching", UI_ITEM_R_TOGGLE);
}
}
}