Differential D12048 Diff 42379 source/blender/sequencer/intern/sound.c

Changeset View

Standalone View

	Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Lines

	void SEQ_sound_update_bounds(Scene scene, Sequence seq)			void SEQ_sound_update_bounds(Scene scene, Sequence seq)
	{			{
	if (seq->type == SEQ_TYPE_SCENE) {			if (seq->type == SEQ_TYPE_SCENE) {
	if (seq->scene && seq->scene_sound) {			if (seq->scene && seq->scene_sound) {
	/* We have to take into account start frame of the sequence's scene! */			/* We have to take into account start frame of the sequence's scene! */
	int startofs = seq->startofs + seq->anim_startofs + seq->scene->r.sfra;			int startofs = seq->startofs + seq->anim_startofs + seq->scene->r.sfra;

	BKE_sound_move_scene_sound(scene, seq->scene_sound, seq->startdisp, seq->enddisp, startofs);			BKE_sound_move_scene_sound(scene,
				seq->scene_sound,
				seq->startdisp,
				seq->enddisp,
				startofs,
				seq->sound->offset_time);
	}			}
	}			}
	else {			else {
	BKE_sound_move_scene_sound_defaults(scene, seq);			BKE_sound_move_scene_sound_defaults(scene, seq);
	}			}
	/* mute is set in seq_update_muting_recursive */			/* mute is set in seq_update_muting_recursive */
	}			}

	Show All 22 Lines