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

merged effects into node structure

Browse Source
This commit is contained in:
itsmattkc
2019-04-12 21:50:52 +10:00
parent 4e4d2b1881
commit b21745f694
127 changed files with 1674 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
timeline/timelinefunctions.cpp
+4 -4
View File
@@ -119,7 +119,7 @@ QVector<Ghost> olive::timeline::CreateGhostsFromMedia(Sequence *seq,
|| import_data.type() == olive::timeline::kImportBoth) {
for (int j=0;j<m->audio_tracks.size();j++) {
if (m->audio_tracks.at(j).enabled) {
g.track = seq->GetTrackList(Track::kTypeAudio)->TrackAt(j);
g.track = seq->GetTrackList(olive::kTypeAudio)->TrackAt(j);
g.media_stream = m->audio_tracks.at(j).file_index;
ghosts.append(g);
}
@@ -130,7 +130,7 @@ QVector<Ghost> olive::timeline::CreateGhostsFromMedia(Sequence *seq,
|| import_data.type() == olive::timeline::kImportBoth) {
for (int j=0;j<m->video_tracks.size();j++) {
if (m->video_tracks.at(j).enabled) {
g.track = seq->GetTrackList(Track::kTypeVideo)->TrackAt(j);
g.track = seq->GetTrackList(olive::kTypeVideo)->TrackAt(j);
g.media_stream = m->video_tracks.at(j).file_index;
ghosts.append(g);
}
@@ -146,13 +146,13 @@ QVector<Ghost> olive::timeline::CreateGhostsFromMedia(Sequence *seq,
if (import_data.type() == olive::timeline::kImportVideoOnly
|| import_data.type() == olive::timeline::kImportBoth) {
g.track = seq->GetTrackList(Track::kTypeVideo)->First();
g.track = seq->GetTrackList(olive::kTypeVideo)->First();
ghosts.append(g);
}
if (import_data.type() == olive::timeline::kImportAudioOnly
|| import_data.type() == olive::timeline::kImportBoth) {
g.track = seq->GetTrackList(Track::kTypeAudio)->First();
g.track = seq->GetTrackList(olive::kTypeAudio)->First();
ghosts.append(g);
}