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

file/folder restructuring

Browse Source
This commit is contained in:
itsmattkc
2019-03-13 16:55:49 +11:00
parent d84b5a7f1d
commit 1cd5dabc07
228 changed files with 1269 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/effectcontrols.cpp
+24 -8
View File
@@ -33,24 +33,24 @@
#include <QApplication>
#include "panels/panels.h"
#include "project/effect.h"
#include "project/clip.h"
#include "project/transition.h"
#include "effects/effect.h"
#include "effects/transition.h"
#include "timeline/clip.h"
#include "ui/collapsiblewidget.h"
#include "project/sequence.h"
#include "project/undo.h"
#include "timeline/sequence.h"
#include "undo/undo.h"
#include "panels/project.h"
#include "panels/timeline.h"
#include "panels/viewer.h"
#include "panels/grapheditor.h"
#include "ui/viewerwidget.h"
#include "ui/menuhelper.h"
#include "io/clipboard.h"
#include "io/config.h"
#include "project/clipboard.h"
#include "global/config.h"
#include "ui/timelineheader.h"
#include "ui/keyframeview.h"
#include "ui/resizablescrollbar.h"
#include "debug.h"
#include "global/debug.h"
EffectControls::EffectControls(QWidget *parent) :
Panel(parent),
@@ -130,6 +130,22 @@ void EffectControls::menu_select(QAction* q) {
}
void EffectControls::update_keyframes() {
for (int i=0;i<open_effects_.size();i++) {
EffectUI* ui = open_effects_.at(i);
Effect* effect = ui->GetEffect();
for (int j=0;j<effect->row_count();j++) {
EffectRow* row = effect->row(j);
for (int k=0;k<row->FieldCount();k++) {
EffectField* field = row->Field(k);
field->UpdateWidgetValue(ui->Widget(j, k), field->Now());
}
}
}
headers->update_zoom(zoom);
keyframeView->update();
}
panels/grapheditor.cpp
+11 -11
View File
@@ -30,13 +30,13 @@
#include "ui/timelinetools.h"
#include "ui/labelslider.h"
#include "ui/graphview.h"
#include "project/effect.h"
#include "project/effectfields.h"
#include "project/effectrow.h"
#include "project/clip.h"
#include "effects/effect.h"
#include "effects/effectfields.h"
#include "effects/effectrow.h"
#include "timeline/clip.h"
#include "rendering/renderfunctions.h"
#include "panels.h"
#include "debug.h"
#include "global/debug.h"
GraphEditor::GraphEditor(QWidget* parent) : Panel(parent), row(nullptr) {
resize(720, 480);
@@ -144,10 +144,10 @@ void GraphEditor::update_panel() {
for (int i=0;i<row->FieldCount();i++) {
EffectField* field = row->Field(i);
if (field->type() == EffectField::EFFECT_FIELD_DOUBLE) {
slider_proxies.at(slider_index)->set_value(
row->Field(i)->GetValueAt(playhead_to_clip_seconds(field->GetParentRow()->GetParentEffect()->parent_clip,
olive::ActiveSequence->playhead)).toDouble(),
false
slider_proxies.at(slider_index)->SetValue(
row->Field(i)->GetValueAt(
playhead_to_clip_seconds(field->GetParentRow()->GetParentEffect()->parent_clip,
olive::ActiveSequence->playhead)).toDouble()
);
slider_index++;
}
@@ -192,7 +192,7 @@ void GraphEditor::set_row(EffectRow *r) {
value_layout->addWidget(slider_button);
LabelSlider* slider = new LabelSlider();
slider->set_color(get_curve_color(i, r->FieldCount()).name());
slider->SetColor(get_curve_color(i, r->FieldCount()).name());
connect(slider, SIGNAL(valueChanged()), this, SLOT(passthrough_slider_value()));
slider_proxies.append(slider);
value_layout->addWidget(slider);
@@ -250,7 +250,7 @@ void GraphEditor::set_key_button_enabled(bool e, int type) {
void GraphEditor::passthrough_slider_value() {
for (int i=0;i<slider_proxies.size();i++) {
if (slider_proxies.at(i) == sender()) {
slider_proxy_sources.at(i)->set_value(slider_proxies.at(i)->value(), true);
slider_proxy_sources.at(i)->SetValue(slider_proxies.at(i)->value());
}
}
}
panels/grapheditor.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include "ui/timelineheader.h"
#include "ui/labelslider.h"
#include "ui/keyframenavigator.h"
#include "project/effectrow.h"
#include "effects/effectrow.h"
class GraphEditor : public Panel {
Q_OBJECT
panels/panels.cpp
+6 -63
View File
@@ -20,13 +20,12 @@
#include "panels.h"
#include "project/sequence.h"
#include "project/clip.h"
#include "project/transition.h"
#include "io/config.h"
#include "project/effectloaders.h"
#include "debug.h"
#include "timeline/sequence.h"
#include "timeline/clip.h"
#include "effects/transition.h"
#include "global/config.h"
#include "effects/effectloaders.h"
#include "global/debug.h"
#include <QScrollBar>
#include <QCoreApplication>
@@ -43,62 +42,6 @@ void update_effect_controls() {
int mode = kTransitionNone;
if (olive::ActiveSequence != nullptr) {
/*
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
Clip* clip = olive::ActiveSequence->clips.at(i).get();
if (clip != nullptr) {
for (int j=0;j<olive::ActiveSequence->selections.size();j++) {
const Selection& s = olive::ActiveSequence->selections.at(j);
bool add = true;
if (clip->timeline_in() >= s.in && clip->timeline_out() <= s.out && clip->track() == s.track) {
mode = kTransitionNone;
} else if (selection_contains_transition(s, clip, kTransitionOpening)) {
mode = kTransitionOpening;
} else if (selection_contains_transition(s, clip, kTransitionClosing)) {
mode = kTransitionClosing;
} else {
add = false;
}
if (add) {
if (clip->track() < 0 && vclip == -1) {
vclip = i;
} else if (clip->track() >= 0 && aclip == -1) {
aclip = i;
} else {
vclip = -2;
aclip = -2;
multiple = true;
multiple = true;
break;
}
}
}
}
}
if (!multiple) {
// check if aclip is linked to vclip
if (vclip >= 0) selected_clips.append(vclip);
if (aclip >= 0) selected_clips.append(aclip);
if (vclip >= 0 && aclip >= 0) {
bool found = false;
ClipPtr vclip_ref = olive::ActiveSequence->clips.at(vclip);
for (int i=0;i<vclip_ref->linked.size();i++) {
if (vclip_ref->linked.at(i) == aclip) {
found = true;
break;
}
}
if (!found) {
// only display multiple clips if they're linked
selected_clips.clear();
multiple = true;
}
}
}
*/
selected_clips = olive::ActiveSequence->SelectedClips();
// TODO handle selecting transitions
panels/project.cpp
+7 -8
View File
@@ -20,21 +20,20 @@
#include "project.h"
#include "oliveglobal.h"
#include "global/global.h"
#include "panels.h"
#include "rendering/renderfunctions.h"
#include "io/previewgenerator.h"
#include "project/undo.h"
#include "mainwindow.h"
#include "io/config.h"
#include "project/previewgenerator.h"
#include "undo/undo.h"
#include "ui/mainwindow.h"
#include "global/config.h"
#include "rendering/cacher.h"
#include "dialogs/replaceclipmediadialog.h"
#include "panels/effectcontrols.h"
#include "dialogs/newsequencedialog.h"
#include "dialogs/mediapropertiesdialog.h"
#include "dialogs/loaddialog.h"
#include "io/clipboard.h"
#include "project/clipboard.h"
#include "ui/sourcetable.h"
#include "ui/sourceiconview.h"
#include "ui/icons.h"
@@ -42,7 +41,7 @@
#include "ui/mediaiconservice.h"
#include "project/sourcescommon.h"
#include "project/projectfilter.h"
#include "debug.h"
#include "global/debug.h"
#include <QApplication>
#include <QFileDialog>
panels/project.h
+1 -1
View File
@@ -32,10 +32,10 @@
#include "project/projectmodel.h"
#include "project/projectfilter.h"
#include "project/projectelements.h"
#include "project/undo.h"
#include "project/sourcescommon.h"
#include "ui/panel.h"
#include "ui/sourceiconview.h"
#include "undo/undo.h"
#include "ui/sourcetable.h"
panels/timeline.cpp
+5 -7
View File
@@ -20,26 +20,24 @@
#include "timeline.h"
#include "oliveglobal.h"
#include "global/global.h"
#include "panels/panels.h"
#include "project/projectelements.h"
#include "ui/timelinewidget.h"
#include "ui/icons.h"
#include "ui/viewerwidget.h"
#include "rendering/audio.h"
#include "rendering/cacher.h"
#include "rendering/renderfunctions.h"
#include "io/config.h"
#include "io/clipboard.h"
#include "global/config.h"
#include "project/clipboard.h"
#include "ui/timelineheader.h"
#include "ui/resizablescrollbar.h"
#include "ui/audiomonitor.h"
#include "ui/flowlayout.h"
#include "ui/cursors.h"
#include "mainwindow.h"
#include "debug.h"
#include "ui/mainwindow.h"
#include "global/debug.h"
#include <QTime>
#include <QScrollBar>
panels/timeline.h
+3 -3
View File
@@ -27,9 +27,9 @@
#include "ui/timelinewidget.h"
#include "ui/timelinetools.h"
#include "project/selection.h"
#include "project/clip.h"
#include "project/undo.h"
#include "timeline/selection.h"
#include "timeline/clip.h"
#include "undo/undo.h"
#include "ui/timelineheader.h"
#include "ui/resizablescrollbar.h"
#include "ui/audiomonitor.h"
panels/viewer.cpp
+12 -12
View File
@@ -24,13 +24,13 @@
#include "timeline.h"
#include "panels/project.h"
#include "panels/effectcontrols.h"
#include "project/sequence.h"
#include "project/clip.h"
#include "timeline/sequence.h"
#include "timeline/clip.h"
#include "panels/panels.h"
#include "io/config.h"
#include "global/config.h"
#include "project/footage.h"
#include "project/media.h"
#include "project/undo.h"
#include "undo/undo.h"
#include "ui/audiomonitor.h"
#include "rendering/renderfunctions.h"
#include "ui/viewercontainer.h"
@@ -38,8 +38,8 @@
#include "ui/timelineheader.h"
#include "ui/resizablescrollbar.h"
#include "ui/icons.h"
#include "oliveglobal.h"
#include "debug.h"
#include "global/global.h"
#include "global/debug.h"
#define FRAMES_IN_ONE_MINUTE 1798 // 1800 - 2
#define FRAMES_IN_TEN_MINUTES 17978 // (FRAMES_IN_ONE_MINUTE * 10) - 2
@@ -79,10 +79,10 @@ Viewer::Viewer(QWidget *parent) :
set_media(nullptr);
current_timecode_slider->setEnabled(false);
current_timecode_slider->set_minimum_value(0);
current_timecode_slider->set_default_value(qSNaN());
current_timecode_slider->set_value(0, false);
current_timecode_slider->set_display_type(LabelSlider::LABELSLIDER_FRAMENUMBER);
current_timecode_slider->SetMinimum(0);
current_timecode_slider->SetDefault(qSNaN());
current_timecode_slider->SetValue(0);
current_timecode_slider->SetDisplayType(LabelSlider::FrameNumber);
connect(current_timecode_slider, SIGNAL(valueChanged(double)), this, SLOT(update_playhead()));
recording_flasher.setInterval(500);
@@ -479,7 +479,7 @@ bool Viewer::WaitingForPlayWake()
}
void Viewer::update_playhead_timecode(long p) {
current_timecode_slider->set_value(p, false);
current_timecode_slider->SetValue(p);
}
void Viewer::update_end_timecode() {
@@ -884,7 +884,7 @@ void Viewer::set_sequence(bool main, SequencePtr s) {
go_to_end_frame->setEnabled(!null_sequence);
if (!null_sequence) {
current_timecode_slider->set_frame_rate(seq->frame_rate);
current_timecode_slider->SetFrameRate(seq->frame_rate);
playback_updater.setInterval(qFloor(1000 / seq->frame_rate));
panels/viewer.h
+1 -1
View File
@@ -26,7 +26,7 @@
#include <QLabel>
#include <QPushButton>
#include "project/marker.h"
#include "timeline/marker.h"
#include "project/media.h"
#include "ui/panel.h"