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

removed tracklist layer

Browse Source
This commit is contained in:
itsmattkc
2019-05-08 19:32:31 +10:00
parent 9a13776b2c
commit 5f0debb7ec
15 changed files with 234 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/timeline.cpp
+7 -6
View File
@@ -223,8 +223,8 @@ void Timeline::SetSequence(SequencePtr sequence)
sequence_ = sequence;
update_sequence();
video_area->SetTrackList(sequence_.get(), olive::kTypeVideo);
audio_area->SetTrackList(sequence_.get(), olive::kTypeAudio);
video_area->SetTrackType(sequence_.get(), olive::kTypeVideo);
audio_area->SetTrackType(sequence_.get(), olive::kTypeAudio);
repaint_timeline();
emit SequenceChanged(sequence_);
@@ -343,7 +343,7 @@ void Timeline::nest() {
ca->append(new DeleteClipAction(c));
// copy to new
Track* track = s->GetTrackList(c->type())->TrackAt(c->track()->Index());
Track* track = s->GetTrackList(c->type()).at(c->track()->Index());
ClipPtr copy = selected_clips.at(i)->copy(track);
copy->set_timeline_in(copy->timeline_in() - earliest_point);
copy->set_timeline_out(copy->timeline_out() - earliest_point);
@@ -782,9 +782,10 @@ QVector<Track *> Timeline::GetTracksInRectangle(int global_top, int global_botto
int rect_bottom = qMax(relative_tl.y(), relative_br.y());
// determine which clips are in this rectangular selection
TrackList* track_list = area->track_list();
for (int j=0;j<track_list->TrackCount();j++) {
Track* track = track_list->TrackAt(j);
QVector<Track*> area_tracks = sequence_->GetTrackList(area->track_type());
for (int j=0;j<area_tracks.size();j++) {
Track* track = area_tracks.at(j);
int track_top = area->view()->getScreenPointFromTrack(track);
int track_bottom = track_top + track->height();