added cross dissolve transitions (but they're uneditable)

This commit is contained in:
itsmattkc
2018-07-03 06:45:32 +01:00
parent 0ae230ac29
commit 5a60e2d2c6
16 changed files with 123 additions and 34 deletions
+5 -5
View File
@@ -17,7 +17,7 @@ EffectControls::EffectControls(QWidget *parent) :
{
ui->setupUi(this);
init_effects();
clear_effects();
clear_effects(false);
}
EffectControls::~EffectControls()
@@ -62,7 +62,7 @@ void EffectControls::show_menu(bool video) {
effects_menu.exec(QCursor::pos());
}
void EffectControls::clear_effects() {
void EffectControls::clear_effects(bool clear_cache) {
// clear existing clips
QVBoxLayout* video_layout = static_cast<QVBoxLayout*>(ui->video_effect_area->layout());
QVBoxLayout* audio_layout = static_cast<QVBoxLayout*>(ui->audio_effect_area->layout());
@@ -77,7 +77,7 @@ void EffectControls::clear_effects() {
}
ui->vcontainer->setVisible(false);
ui->acontainer->setVisible(false);
selected_clips.clear();
if (clear_cache) selected_clips.clear();
}
void EffectControls::deselect_all_effects(QWidget* sender) {
@@ -137,12 +137,12 @@ void EffectControls::delete_clips() {
}
void EffectControls::reload_clips() {
clear_effects();
clear_effects(false);
load_effects();
}
void EffectControls::set_clips(QVector<Clip*>& clips) {
clear_effects();
clear_effects(true);
// replace clip vector
selected_clips = clips;
+1 -1
View File
@@ -19,7 +19,7 @@ public:
~EffectControls();
// void set_clip(Clip* c);
void set_clips(QVector<Clip*>& clips);
void clear_effects();
void clear_effects(bool clear_cache);
void delete_clips();
bool is_focused();
+2
View File
@@ -210,6 +210,8 @@ void Project::delete_selected_media() {
items.removeAt(i);
i--;
remove = true;
} else if (confirm.clickedButton() == abort_button) {
break;
}
}
}
+3 -3
View File
@@ -213,7 +213,7 @@ bool Timeline::focused() {
void Timeline::undo() {
// qDebug() << "[INFO] Undo/redo was so buggy, it's been disabled. Sorry for any inconvenience";
if (sequence != NULL) {
panel_effect_controls->clear_effects();
panel_effect_controls->clear_effects(true);
sequence->undo();
redraw_all_clips(false);
}
@@ -222,7 +222,7 @@ void Timeline::undo() {
void Timeline::redo() {
// qDebug() << "[INFO] Undo/redo was so buggy, it's been disabled. Sorry for any inconvenience";
if (sequence != NULL) {
panel_effect_controls->clear_effects();
panel_effect_controls->clear_effects(true);
sequence->redo();
redraw_all_clips(false);
}
@@ -270,7 +270,7 @@ void Timeline::select_all() {
void Timeline::delete_selection(bool ripple_delete) {
if (selections.size() > 0) {
panel_effect_controls->clear_effects();
panel_effect_controls->clear_effects(true);
long ripple_point = selections.at(0).in;
long ripple_length = selections.at(0).out - selections.at(0).in;