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

massive rewrite of project data system

Browse Source
This commit is contained in:
itsmattkc
2018-12-13 14:29:09 +11:00
parent 6c3197aac6
commit ac1cb9d14f
44 changed files with 2562 additions and 2158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+5 -8
View File
@@ -3,11 +3,12 @@
#include "io/config.h"
#include "io/path.h"
#include "io/media.h"
#include "project/footage.h"
#include "project/sequence.h"
#include "project/clip.h"
#include "project/undo.h"
#include "project/media.h"
#include "ui/sourcetable.h"
#include "ui/viewerwidget.h"
@@ -222,9 +223,6 @@ MainWindow::MainWindow(QWidget *parent) :
}
MainWindow::~MainWindow() {
panel_sequence_viewer->viewer_widget->delete_function();
panel_footage_viewer->viewer_widget->delete_function();
set_sequence(NULL);
QString data_dir = get_data_path();
@@ -977,12 +975,11 @@ void MainWindow::on_actionNest_triggered() {
}
// add sequence to project
panel_project->new_sequence(ca, s, false, NULL);
Media* m = panel_project->new_sequence(ca, s, false, NULL);
// add nested sequence to active sequence
QVector<void*> media_list = {s};
QVector<int> type_list = {MEDIA_TYPE_SEQUENCE};
panel_timeline->create_ghosts_from_media(sequence, earliest_point, media_list, type_list);
QVector<Media*> media_list = {m};
panel_timeline->create_ghosts_from_media(sequence, earliest_point, media_list);
panel_timeline->add_clips_from_ghosts(ca, sequence);
undo_stack.push(ca);