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

some timeline refactoring, preparing for rewrites

Browse Source
This commit is contained in:
itsmattkc
2021-01-09 11:41:33 +11:00
parent 3337be07e5
commit 8f729203fc
62 changed files with 638 additions and 1180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/view/timelineview.cpp
+4 -4
View File
@@ -209,7 +209,7 @@ void TimelineView::drawBackground(QPainter *painter, const QRectF &rect)
int line_y = 0;
foreach (TrackOutput* track, connected_track_list_->GetTracks()) {
foreach (Track* track, connected_track_list_->GetTracks()) {
line_y += track->GetTrackHeightInPixels();
// One px gap between tracks
@@ -322,7 +322,7 @@ void TimelineView::SceneRectUpdateEvent(QRectF &rect)
}
}
Timeline::TrackType TimelineView::ConnectedTrackType()
Track::Type TimelineView::ConnectedTrackType()
{
if (connected_track_list_) {
return connected_track_list_->type();
@@ -331,7 +331,7 @@ Timeline::TrackType TimelineView::ConnectedTrackType()
return Timeline::kTrackTypeNone;
}
Stream::Type TimelineView::TrackTypeToStreamType(Timeline::TrackType track_type)
Stream::Type TimelineView::TrackTypeToStreamType(Track::Type track_type)
{
switch (track_type) {
case Timeline::kTrackTypeNone:
@@ -417,7 +417,7 @@ int TimelineView::GetTrackY(int track_index) const
int TimelineView::GetTrackHeight(int track_index) const
{
if (!connected_track_list_ || track_index >= connected_track_list_->GetTrackCount()) {
return TrackOutput::GetDefaultTrackHeightInPixels();
return Track::GetDefaultTrackHeightInPixels();
}
return connected_track_list_->GetTrackAt(track_index)->GetTrackHeightInPixels();