diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-03-26 13:35:41 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-03-26 13:35:41 +0300 |
commit | 828c85a1bf6045dc76d1197635a4b71d897206c3 (patch) | |
tree | 5c297f307a2139425e8cb4824ccf898994ecfd71 /source/blender/editors/space_sequencer | |
parent | d97b97460ca9a28027041e5666dbfeb3a5295155 (diff) |
sound module: Append functions with BKE (makes it easier to make them
out from local functions)
Diffstat (limited to 'source/blender/editors/space_sequencer')
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 38a01bcd78c..329e6db4cd0 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -287,7 +287,7 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op) BLI_strncpy(seq->name + 2, sce_seq->id.name + 2, sizeof(seq->name) - 2); BKE_sequence_base_unique_name_recursive(&ed->seqbase, seq); - seq->scene_sound = sound_scene_add_scene_sound(scene, seq, start_frame, start_frame + seq->len, 0); + seq->scene_sound = BKE_sound_scene_add_scene_sound(scene, seq, start_frame, start_frame + seq->len, 0); BKE_sequence_calc_disp(scene, seq); BKE_sequencer_sort(scene); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index dc37b764f65..b45d4277f35 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -3165,7 +3165,7 @@ static void seq_copy_del_sound(Scene *scene, Sequence *seq) } } else if (seq->scene_sound) { - sound_remove_scene_sound(scene, seq->scene_sound); + BKE_sound_remove_scene_sound(scene, seq->scene_sound); seq->scene_sound = NULL; } } @@ -3322,10 +3322,10 @@ static int sequencer_swap_data_exec(bContext *C, wmOperator *op) } if (seq_act->scene_sound) - sound_remove_scene_sound(scene, seq_act->scene_sound); + BKE_sound_remove_scene_sound(scene, seq_act->scene_sound); if (seq_other->scene_sound) - sound_remove_scene_sound(scene, seq_other->scene_sound); + BKE_sound_remove_scene_sound(scene, seq_other->scene_sound); seq_act->scene_sound = NULL; seq_other->scene_sound = NULL; @@ -3333,8 +3333,8 @@ static int sequencer_swap_data_exec(bContext *C, wmOperator *op) BKE_sequence_calc(scene, seq_act); BKE_sequence_calc(scene, seq_other); - if (seq_act->sound) sound_add_scene_sound_defaults(scene, seq_act); - if (seq_other->sound) sound_add_scene_sound_defaults(scene, seq_other); + if (seq_act->sound) BKE_sound_add_scene_sound_defaults(scene, seq_act); + if (seq_other->sound) BKE_sound_add_scene_sound_defaults(scene, seq_other); WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); diff --git a/source/blender/editors/space_sequencer/sequencer_preview.c b/source/blender/editors/space_sequencer/sequencer_preview.c index c8834d394f5..3f908dc7096 100644 --- a/source/blender/editors/space_sequencer/sequencer_preview.c +++ b/source/blender/editors/space_sequencer/sequencer_preview.c @@ -85,7 +85,7 @@ static void preview_startjob(void *data, short *stop, short *do_update, float *p PreviewJobAudio *preview_next; bSound *sound = previewjb->sound; - sound_read_waveform(sound, stop); + BKE_sound_read_waveform(sound, stop); if (*stop || G.is_break) { BLI_mutex_lock(pj->mutex); |