forked from bartvdbraak/blender
Just a few compiler warnings...
This commit is contained in:
parent
220669d1fd
commit
0fe908181e
@ -890,18 +890,23 @@ static void fcm_sound_evaluate (FCurve *fcu, FModifier *fcm, float *cvalue, floa
|
||||
{
|
||||
FMod_Sound *data= (FMod_Sound *)fcm->data;
|
||||
float amplitude;
|
||||
|
||||
AUD_Device* device;
|
||||
SoundHandle* handle;
|
||||
AUD_Sound* limiter;
|
||||
|
||||
AUD_Device *device;
|
||||
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, &litude, 1);
|
||||
AUD_readDevice(device, (sample_t*)&litude, 1);
|
||||
AUD_closeReadDevice(device);
|
||||
|
||||
/* combine the amplitude with existing motion data */
|
||||
|
@ -330,40 +330,44 @@ 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);
|
||||
|
||||
if(data->sound)
|
||||
uiTemplateID(layout, (bContext*)C, &ptr, "sound", NULL, "sound.open", NULL);
|
||||
|
||||
if (data->sound)
|
||||
{
|
||||
if(data->sound->cache)
|
||||
/* only sounds that are cached can be used, so display error if not cached */
|
||||
if (data->sound->cache)
|
||||
{
|
||||
/* blending mode */
|
||||
uiItemR(layout, NULL, 0, &ptr, "modification", 0);
|
||||
|
||||
|
||||
/* split into 2 columns */
|
||||
split= uiLayoutSplit(layout, 0.5f);
|
||||
|
||||
|
||||
/* col 1 */
|
||||
col= uiLayoutColumn(split, 0);
|
||||
uiItemR(col, NULL, 0, &ptr, "strength", 0);
|
||||
|
||||
|
||||
/* col 2 */
|
||||
col= uiLayoutColumn(split, 0);
|
||||
uiItemR(col, NULL, 0, &ptr, "delay", 0);
|
||||
}
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user