Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Müller <nexyon@gmail.com>2016-01-09 04:35:30 +0300
committerJörg Müller <nexyon@gmail.com>2016-01-09 04:35:30 +0300
commit85d675963665300d3049b42cc5d70547380557ee (patch)
tree13cbde1ace794c1642b10c016f0caeaca58cff54 /source/blender/blenkernel/intern/sequencer.c
parentf39aa170586e2d713488ad81eaec46893db0f0fe (diff)
Audaspace: Sequencer sound bugfix and mono UI.
- Fixed a bug that the sound when changed in the properties panel was not updated. - Added the option to make a sound mono while adding a sound strip. - Added the option to make a sound mono in the sequencer properties panel. Related bug report: T47140
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 47c7cf6212a..32e7ad7799a 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -4968,7 +4968,7 @@ Mask *BKE_sequencer_mask_get(Scene *scene)
/* api like funcs for adding */
-static void seq_load_apply(Scene *scene, Sequence *seq, SeqLoadInfo *seq_load)
+static void seq_load_apply(Main *bmain, Scene *scene, Sequence *seq, SeqLoadInfo *seq_load)
{
if (seq) {
BLI_strncpy_utf8(seq->name + 2, seq_load->name, sizeof(seq->name) - 2);
@@ -4984,6 +4984,11 @@ static void seq_load_apply(Scene *scene, Sequence *seq, SeqLoadInfo *seq_load)
BKE_sequencer_active_set(scene, seq);
}
+ if (seq_load->flag & SEQ_LOAD_SOUND_MONO) {
+ seq->sound->flags |= SOUND_FLAGS_MONO;
+ BKE_sound_load(bmain, seq->sound);
+ }
+
if (seq_load->flag & SEQ_LOAD_SOUND_CACHE) {
if (seq->sound)
BKE_sound_cache(seq->sound);
@@ -5081,7 +5086,7 @@ Sequence *BKE_sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoad
seq->views_format = seq_load->views_format;
seq->flag |= seq_load->flag & SEQ_USE_VIEWS;
- seq_load_apply(scene, seq, seq_load);
+ seq_load_apply(CTX_data_main(C), scene, seq, seq_load);
return seq;
}
@@ -5147,7 +5152,7 @@ Sequence *BKE_sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoad
/* last active name */
BLI_strncpy(ed->act_sounddir, strip->dir, FILE_MAXDIR);
- seq_load_apply(scene, seq, seq_load);
+ seq_load_apply(bmain, scene, seq, seq_load);
return seq;
}
@@ -5284,7 +5289,7 @@ Sequence *BKE_sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoad
}
/* can be NULL */
- seq_load_apply(scene, seq, seq_load);
+ seq_load_apply(CTX_data_main(C), scene, seq, seq_load);
MEM_freeN(anim_arr);
return seq;