oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjusted tracklist class for new node value structure

Browse Source 
We use references to the node directly rather than references supplied by the
object. This should be more robust anyway and will fit better in the new node
structure.
This commit is contained in:
itsmattkc
2019-12-04 20:14:49 +11:00
parent 6e49eaef9e
commit bae448fc32
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/timeline/tracklist.cpp
+11 -6
View File
@@ -34,7 +34,7 @@ TrackList::TrackList(TimelineOutput* parent, const enum TrackType &type, NodeInp
TrackOutput *TrackList::attached_track()
{
return Node::ValueToPtr<TrackOutput>(track_input_->get_realtime_value_of_connected_output());
return dynamic_cast<TrackOutput*>(track_input_->get_connected_node());
}
void TrackList::AttachTrack(TrackOutput *track)
@@ -180,7 +180,10 @@ void TrackList::TrackConnectionRemoved(NodeEdgePtr edge)
return;
}
DetachTrack(Node::ValueToPtr<TrackOutput>(edge->output()->get_realtime_value()));
TrackOutput* track = dynamic_cast<TrackOutput*>(edge->output()->parentNode());
if (track)
DetachTrack(track);
}
void TrackList::TrackEdgeAdded(NodeEdgePtr edge)
@@ -190,9 +193,10 @@ void TrackList::TrackEdgeAdded(NodeEdgePtr edge)
// If this edge pertains to the track's track input, all the tracks just added need attaching
if (edge->input() == track->track_input()) {
TrackOutput* added_track = Node::ValueToPtr<TrackOutput>(edge->output()->get_realtime_value());
TrackOutput* added_track = dynamic_cast<TrackOutput*>(edge->output()->parentNode());
AttachTrack(added_track);
if (added_track)
AttachTrack(added_track);
}
}
@@ -203,9 +207,10 @@ void TrackList::TrackEdgeRemoved(NodeEdgePtr edge)
// If this edge pertains to the track's track input, all the tracks just added need attaching
if (edge->input() == track->track_input()) {
TrackOutput* added_track = Node::ValueToPtr<TrackOutput>(edge->output()->get_realtime_value());
TrackOutput* added_track = dynamic_cast<TrackOutput*>(edge->output()->parentNode());
DetachTrack(added_track);
if (added_track)
DetachTrack(added_track);
}
}