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

Fix for [#27349] Sequencer: Meta Strips plays unavailable audio

Browse Source 
Hopefully at least... Sequencer code is like <insert name of random ancient language that nobody knows anymore here>.
This commit is contained in:
Joerg Mueller 2012-02-13 17:31:33 +00:00
parent 840ffba82c
commit 2f516f46da
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source/blender/blenkernel/intern/sequencer.c
View File

@ -523,6 +523,31 @@ void build_seqar_cb(ListBase *seqbase, Sequence ***seqar, int *totseq,
} }
static void seq_update_sound_bounds_recursive(Scene *scene, Sequence *metaseq)
{
Sequence *seq;
/* for sound we go over full meta tree to update bounds of the sound strips,
since sound is played outside of evaluating the imbufs, */
for(seq=metaseq->seqbase.first; seq; seq=seq->next) {
if(seq->type == SEQ_META) {
seq_update_sound_bounds_recursive(scene, seq);
}
else if(ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
if(seq->scene_sound) {
int startofs = seq->startofs;
int endofs = seq->endofs;
if(seq->startofs + seq->start < metaseq->start + metaseq->startofs)
startofs = metaseq->start + metaseq->startofs - seq->start;
if(seq->start + seq->len - seq->endofs > metaseq->start + metaseq->len - metaseq->endofs)
endofs = seq->start + seq->len - metaseq->start - metaseq->len + metaseq->endofs;
sound_move_scene_sound(scene, seq->scene_sound, seq->start + startofs, seq->start+seq->len - endofs, startofs);
}
}
}
}
void calc_sequence_disp(Scene *scene, Sequence *seq) void calc_sequence_disp(Scene *scene, Sequence *seq)
{ {
if(seq->startofs && seq->startstill) seq->startstill= 0; if(seq->startofs && seq->startstill) seq->startstill= 0;
@ -539,32 +564,11 @@ void calc_sequence_disp(Scene *scene, Sequence *seq)
seq->handsize= (float)((seq->enddisp-seq->startdisp)/25); seq->handsize= (float)((seq->enddisp-seq->startdisp)/25);
} }
seq_update_sound_bounds(scene, seq); if(ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
} seq_update_sound_bounds(scene, seq);
}
static void seq_update_sound_bounds_recursive(Scene *scene, Sequence *metaseq) else if(seq->type == SEQ_META)
{ seq_update_sound_bounds_recursive(scene, seq);
Sequence *seq;
/* for sound we go over full meta tree to update bounds of the sound strips,
since sound is played outside of evaluating the imbufs, */
for(seq=metaseq->seqbase.first; seq; seq=seq->next) {
if(seq->type == SEQ_META) {
seq_update_sound_bounds_recursive(scene, seq);
}
else if(ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
if(seq->scene_sound) {
int startofs = seq->startofs;
int endofs = seq->endofs;
if(seq->startofs + seq->start < metaseq->start + metaseq->startofs)
startofs = metaseq->start + metaseq->startofs - seq->start;
if(seq->start + seq->len - seq->endofs > metaseq->start + metaseq->len - metaseq->endofs)
endofs = seq->start + seq->len - metaseq->start - metaseq->len + metaseq->endofs;
sound_move_scene_sound(scene, seq->scene_sound, seq->start + startofs, seq->start+seq->len - endofs, startofs);
}
}
}
} }
void calc_sequence(Scene *scene, Sequence *seq) void calc_sequence(Scene *scene, Sequence *seq)
@ -3228,7 +3232,7 @@ void seq_update_sound_bounds_all(Scene *scene)
void seq_update_sound_bounds(Scene* scene, Sequence *seq) void seq_update_sound_bounds(Scene* scene, Sequence *seq)
{ {
sound_move_scene_sound_defaults(scene, seq); sound_move_scene_sound_defaults(scene, seq);
/* mute is set in seq_update_muting_recursive */ /* mute is set in seq_update_muting_recursive */
} }