Revert "derive clips, tracks, and sequences from the same base"

This reverts commit 1b9a963eeb.
This commit is contained in:
itsmattkc
2019-04-14 12:47:19 +10:00
parent 1b9a963eeb
commit de69558ee5
26 changed files with 108 additions and 284 deletions
+8 -13
View File
@@ -50,19 +50,14 @@ Transition::Transition(Clip *c) :
length_field->SetDisplayType(LabelSlider::FrameNumber);
if (parent_clip != nullptr) {
length_field->SetFrameRate(GetParentClip()->track()->sequence() == nullptr ?
GetParentClip()->cached_frame_rate() : GetParentClip()->SequenceFrameRate());
length_field->SetFrameRate(parent_clip->track()->sequence() == nullptr ?
parent_clip->cached_frame_rate() : parent_clip->track()->sequence()->frame_rate);
}
connect(length_field, SIGNAL(Changed()), this, SLOT(UpdateMaximumLength()));
}
Clip *Transition::GetParentClip()
{
return static_cast<Clip*>(parent_clip);
}
NodePtr Transition::copy(TimelineObject *c) {
NodePtr Transition::copy(Clip *c) {
NodePtr node = Node::copy(c);
static_cast<Transition*>(node.get())->set_length(get_true_length());
@@ -91,8 +86,8 @@ int Transition::get_length() {
}
Clip* Transition::get_opened_clip() {
if (GetParentClip()->opening_transition.get() == this) {
return GetParentClip();
if (parent_clip->opening_transition.get() == this) {
return parent_clip;
} else if (secondary_clip != nullptr && secondary_clip->opening_transition.get() == this) {
return secondary_clip;
}
@@ -100,8 +95,8 @@ Clip* Transition::get_opened_clip() {
}
Clip* Transition::get_closed_clip() {
if (GetParentClip()->closing_transition.get() == this) {
return GetParentClip();
if (parent_clip->closing_transition.get() == this) {
return parent_clip;
} else if (secondary_clip != nullptr && secondary_clip->closing_transition.get() == this) {
return secondary_clip;
}
@@ -136,7 +131,7 @@ TransitionPtr Transition::CreateFromMeta(Clip* c, Clip* s) {
void Transition::UpdateMaximumLength()
{
// Get the maximum area this transition can occupy on the clip
long maximum_length = GetMaximumEmptySpaceOnClip(GetParentClip());
long maximum_length = GetMaximumEmptySpaceOnClip(parent_clip);
// If this clip is a shared transition, get the maximum area this can occupy on the other clip too
if (secondary_clip != nullptr) {