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

fixed track size issue

Browse Source
This commit is contained in:
itsmattkc
2019-05-09 01:54:14 +10:00
parent 2905dce3d9
commit 7c66c3bf4b
7 changed files with 128 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/timeline.cpp
+1 -1
View File
@@ -343,7 +343,7 @@ void Timeline::nest() {
ca->append(new DeleteClipAction(c));
// copy to new
Track* track = s->GetTrackList(c->type()).at(c->track()->Index());
Track* track = s->TrackAt(c->type(), 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);
panels/viewer.cpp
+2 -2
View File
@@ -746,7 +746,7 @@ void Viewer::set_media(Media* m) {
new_sequence->set_frame_rate(video_stream.video_frame_rate * footage->speed);
}
Track* first_track = new_sequence->GetTrackList(olive::kTypeVideo).first();
Track* first_track = new_sequence->FirstTrack(olive::kTypeVideo);
ClipPtr c = std::make_shared<Clip>(first_track);
c->set_media(media, video_stream.file_index);
@@ -769,7 +769,7 @@ void Viewer::set_media(Media* m) {
const FootageStream& audio_stream = footage->audio_tracks.at(0);
new_sequence->set_audio_frequency(audio_stream.audio_frequency);
Track* track = new_sequence->GetTrackList(olive::kTypeAudio).first();
Track* track = new_sequence->FirstTrack(olive::kTypeAudio);
ClipPtr c = std::make_shared<Clip>(track);
c->set_media(media, audio_stream.file_index);
c->set_timeline_in(0);