first commit of big refactor

project/clip.cpp

@@ -277,11 +277,13 @@ int Clip::getWidth() {
 		const FootageStream* ms = media->to_footage()->get_stream_from_file_index(track < 0, media_stream);
 		if (ms != nullptr) return ms->video_width;
 		if (sequence != nullptr) return sequence->width;
+        break;
 	}
 	case MEDIA_TYPE_SEQUENCE:
 	{
 		Sequence* s = media->to_sequence();
 		return s->width;
+        break;
 	}
 	}
 	return 0;

project/clip.h

@@ -7,9 +7,6 @@
 
 #include "marker.h"
 
-#define SKIP_TYPE_DISCARD 0
-#define SKIP_TYPE_SEEK 1
-
 class Cacher;
 class Effect;
 class Transition;

project/effect.cpp

@@ -76,7 +76,7 @@ Effect* create_effect(Clip* c, const EffectMeta* em) {
 		return new Effect(c, em);
 	} else {
 		qCritical() << "Invalid effect data";
-		QMessageBox::critical(mainWindow,
+        QMessageBox::critical(Olive::MainWindow,
 							  QCoreApplication::translate("Effect", "Invalid effect"),
 							  QCoreApplication::translate("Effect", "No candidate for effect '%1'. This effect may be corrupt. Try reinstalling it or Olive.").arg(em->name));
 	}
@@ -375,7 +375,7 @@ void Effect::field_changed() {
 
 void Effect::show_context_menu(const QPoint& pos) {
 	if (meta->type == EFFECT_TYPE_EFFECT) {
-		QMenu menu(mainWindow);
+        QMenu menu(Olive::MainWindow);
 
 		int index = get_index_in_clip();
 
@@ -438,7 +438,7 @@ void Effect::move_down() {
 
 void Effect::save_to_file() {
 	// save effect settings to file
-	QString file = QFileDialog::getSaveFileName(mainWindow,
+    QString file = QFileDialog::getSaveFileName(Olive::MainWindow,
 												tr("Save Effect Settings"),
 												QString(),
 												tr("Effect XML Settings %1").arg("(*.xml)"));
@@ -458,7 +458,7 @@ void Effect::save_to_file() {
 
 			file_handle.close();
 		} else {
-			QMessageBox::critical(mainWindow,
+            QMessageBox::critical(Olive::MainWindow,
 								  tr("Save Settings Failed"),
 								  tr("Failed to open \"%1\" for writing.").arg(file),
 								  QMessageBox::Ok);
@@ -468,7 +468,7 @@ void Effect::save_to_file() {
 
 void Effect::load_from_file() {
 	// load effect settings from file
-	QString file = QFileDialog::getOpenFileName(mainWindow,
+    QString file = QFileDialog::getOpenFileName(Olive::MainWindow,
 												tr("Load Effect Settings"),
 												QString(),
 												tr("Effect XML Settings %1").arg("(*.xml)"));
@@ -484,7 +484,7 @@ void Effect::load_from_file() {
 
 			update_ui(false);
 		} else {
-			QMessageBox::critical(mainWindow,
+            QMessageBox::critical(Olive::MainWindow,
 								  tr("Load Settings Failed"),
 								  tr("Failed to open \"%1\" for reading.").arg(file),
 								  QMessageBox::Ok);
@@ -693,7 +693,7 @@ void Effect::load_from_string(const QByteArray &s) {
 						// pass off to standard loading function
 						load(stream);
 					} else {
-						QMessageBox::critical(mainWindow,
+                        QMessageBox::critical(Olive::MainWindow,
 											  tr("Load Settings Failed"),
 											  tr("This settings file doesn't match this effect."),
 											  QMessageBox::Ok);

project/effectfield.h

@@ -1,13 +1,15 @@
 #ifndef EFFECTFIELD_H
 #define EFFECTFIELD_H
 
-#define EFFECT_FIELD_DOUBLE 0
-#define EFFECT_FIELD_COLOR 1
-#define EFFECT_FIELD_STRING 2
-#define EFFECT_FIELD_BOOL 3
-#define EFFECT_FIELD_COMBO 4
-#define EFFECT_FIELD_FONT 5
-#define EFFECT_FIELD_FILE 6
+enum EffectFieldType {
+    EFFECT_FIELD_DOUBLE,
+    EFFECT_FIELD_COLOR,
+    EFFECT_FIELD_STRING,
+    EFFECT_FIELD_BOOL,
+    EFFECT_FIELD_COMBO,
+    EFFECT_FIELD_FONT,
+    EFFECT_FIELD_FILE
+};
 
 #include <QObject>
 #include <QVariant>

project/effectgizmo.h

@@ -1,9 +1,11 @@
 #ifndef EFFECTGIZMO_H
 #define EFFECTGIZMO_H
 
-#define GIZMO_TYPE_DOT 0
-#define GIZMO_TYPE_POLY 1
-#define GIZMO_TYPE_TARGET 2
+enum GizmoType {
+    GIZMO_TYPE_DOT,
+    GIZMO_TYPE_POLY,
+    GIZMO_TYPE_TARGET
+};
 
 #define GIZMO_DOT_SIZE 2.5
 #define GIZMO_TARGET_SIZE 5.0

project/effectrow.cpp

@@ -101,7 +101,7 @@ void EffectRow::goto_previous_key() {
 		EffectField* f = field(i);
 		for (int j=0;j<f->keyframes.size();j++) {
 			long comp = f->keyframes.at(j).time - c->clip_in + c->timeline_in;
-			if (comp < sequence->playhead) {
+			if (comp < Olive::ActiveSequence->playhead) {
 				key = qMax(comp, key);
 			}
 		}
@@ -117,7 +117,7 @@ void EffectRow::toggle_key() {
 		EffectField* f = field(j);
 		for (int i=0;i<f->keyframes.size();i++) {
 			long comp = c->timeline_in - c->clip_in + f->keyframes.at(i).time;
-			if (comp == sequence->playhead) {
+			if (comp == Olive::ActiveSequence->playhead) {
 				key_fields.append(f);
 				key_field_index.append(i);
 			}
@@ -144,7 +144,7 @@ void EffectRow::goto_next_key() {
 		EffectField* f = field(i);
 		for (int j=0;j<f->keyframes.size();j++) {
 			long comp = f->keyframes.at(j).time - c->clip_in + c->timeline_in;
-			if (comp > sequence->playhead) {
+			if (comp > Olive::ActiveSequence->playhead) {
 				key = qMin(comp, key);
 			}
 		}
@@ -174,7 +174,7 @@ void EffectRow::add_widget(QWidget* w) {
 }
 
 void EffectRow::set_keyframe_now(ComboAction* ca) {
-	long time = sequence->playhead-parent_effect->parent_clip->timeline_in+parent_effect->parent_clip->clip_in;
+	long time = Olive::ActiveSequence->playhead-parent_effect->parent_clip->timeline_in+parent_effect->parent_clip->clip_in;
 
 	if (!just_made_unsafe_keyframe) {
 		EffectKeyframe key;

project/marker.cpp

@@ -39,7 +39,7 @@ void set_marker_internal(Sequence* seq, const QVector<int>& clips) {
 
 	// if (config.set_name_with_marker) is false (set above), ask for a marker name
 	if (!add_marker) {
-		QInputDialog d(mainWindow);
+        QInputDialog d(Olive::MainWindow);
 		d.setWindowTitle(QCoreApplication::translate("Marker", "Set Marker"));
 		d.setLabelText(clips.size() > 0
 					   ? QCoreApplication::translate("Marker", "Set clip marker name:")

project/media.h

@@ -6,9 +6,11 @@
 
 #include "project/marker.h"
 
-#define MEDIA_TYPE_FOOTAGE 0
-#define MEDIA_TYPE_SEQUENCE 1
-#define MEDIA_TYPE_FOLDER 2
+enum MediaType {
+    MEDIA_TYPE_FOOTAGE,
+    MEDIA_TYPE_SEQUENCE,
+    MEDIA_TYPE_FOLDER
+};
 
 struct Footage;
 class MediaThrobber;

project/projectelements.h

@@ -0,0 +1,15 @@
+#ifndef PROJECTELEMENTS_H
+#define PROJECTELEMENTS_H
+
+// includes elements the user can use in a project
+#include "media.h"
+#include "footage.h"
+#include "sequence.h"
+
+// includes elements the user can use in a sequence
+#include "clip.h"
+#include "transition.h"
+#include "marker.h"
+#include "effect.h"
+
+#endif // PROJECTELEMENTS_H

project/sequence.cpp

@@ -111,4 +111,4 @@ void Sequence::getTrackLimits(int* video_tracks, int* audio_tracks) {
 }
 
 // static variable for the currently active sequence
-Sequence* sequence = nullptr;
+Sequence* Olive::ActiveSequence = nullptr;

project/sequence.h

@@ -41,6 +41,8 @@ struct Sequence {
 };
 
 // static variable for the currently active sequence
-extern Sequence* sequence;
+namespace Olive {
+    extern Sequence* ActiveSequence;
+}
 
 #endif // SEQUENCE_H

project/sourcescommon.cpp

@@ -13,6 +13,7 @@
 #include "io/config.h"
 #include "dialogs/proxydialog.h"
 #include "ui/viewerwidget.h"
+#include "ui/menuhelper.h"
 #include "io/proxygenerator.h"
 #include "mainwindow.h"
 
@@ -61,7 +62,7 @@ void SourcesCommon::show_context_menu(QWidget* parent, const QModelIndexList& it
 	QObject::connect(import_action, SIGNAL(triggered(bool)), project_parent, SLOT(import_dialog()));
 
 	QMenu* new_menu = menu.addMenu(tr("New"));
-	mainWindow->make_new_menu(new_menu);
+    Olive::MenuHelper.make_new_menu(new_menu);
 
 	QMenu* view_menu = menu.addMenu(tr("View"));
 
@@ -356,7 +357,7 @@ void SourcesCommon::item_renamed(Media* item) {
 
 void SourcesCommon::open_create_proxy_dialog() {
 	// open the proxy dialog and send it a list of currently selected footage
-	ProxyDialog pd(mainWindow, cached_selected_footage);
+    ProxyDialog pd(Olive::MainWindow, cached_selected_footage);
 	pd.exec();
 }
 
@@ -368,7 +369,7 @@ void SourcesCommon::clear_proxies_from_selected() {
 
 		if (f->proxy && !f->proxy_path.isEmpty()) {
 			if (QFileInfo::exists(f->proxy_path)) {
-				if (QMessageBox::question(mainWindow,
+                if (QMessageBox::question(Olive::MainWindow,
 									  tr("Delete proxy"),
 									  tr("Would you like to delete the proxy file \"%1\" as well?").arg(f->proxy_path),
 										  QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
@@ -381,9 +382,9 @@ void SourcesCommon::clear_proxies_from_selected() {
 		f->proxy_path.clear();
 	}
 
-	if (sequence != nullptr) {
+	if (Olive::ActiveSequence != nullptr) {
 		// close all clips so we can delete any proxies requested to be deleted
-		closeActiveClips(sequence);
+		closeActiveClips(Olive::ActiveSequence);
 	}
 
 	// delete proxies requested to be deleted
@@ -391,10 +392,10 @@ void SourcesCommon::clear_proxies_from_selected() {
 		QFile::remove(delete_list.at(i));
 	}
 
-	if (sequence != nullptr) {
+	if (Olive::ActiveSequence != nullptr) {
 		// update viewer (will re-open active clips with original media)
 		panel_sequence_viewer->viewer_widget->frame_update();
 	}
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }

project/transition.cpp

@@ -75,7 +75,7 @@ Transition* get_transition_from_meta(Clip* c, Clip* s, const EffectMeta* em) {
 		}
 	} else {
 		qCritical() << "Invalid transition data";
-        QMessageBox::critical(mainWindow,
+        QMessageBox::critical(Olive::MainWindow,
                               QCoreApplication::translate("transition", "Invalid transition"),
                               QCoreApplication::translate("transition", "No candidate for transition '%1'. This transition may be corrupt. Try reinstalling it or Olive.").arg(em->name)
                         );

project/undo.cpp

@@ -73,7 +73,7 @@ MoveClipAction::MoveClipAction(Clip *c, long iin, long iout, long iclip_in, int
 	new_clip_in(iclip_in),
 	new_track(itrack),
 	relative(irelative),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void MoveClipAction::undo() {
@@ -89,7 +89,7 @@ void MoveClipAction::undo() {
 		clip->track = old_track;
 	}
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void MoveClipAction::redo() {
@@ -105,7 +105,7 @@ void MoveClipAction::redo() {
 		clip->track = new_track;
 	}
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 DeleteClipAction::DeleteClipAction(Sequence* s, int clip) :
@@ -113,7 +113,7 @@ DeleteClipAction::DeleteClipAction(Sequence* s, int clip) :
 	index(clip),
 	opening_transition(-1),
 	closing_transition(-1),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 DeleteClipAction::~DeleteClipAction() {
@@ -144,7 +144,7 @@ void DeleteClipAction::undo() {
 
 	ref = nullptr;
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void DeleteClipAction::redo() {
@@ -184,7 +184,7 @@ void DeleteClipAction::redo() {
 		}
 	}
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 ChangeSequenceAction::ChangeSequenceAction(Sequence* s) :
@@ -196,7 +196,7 @@ void ChangeSequenceAction::undo() {
 }
 
 void ChangeSequenceAction::redo() {
-	old_sequence = sequence;
+	old_sequence = Olive::ActiveSequence;
 	set_sequence(new_sequence);
 }
 
@@ -205,7 +205,7 @@ SetTimelineInOutCommand::SetTimelineInOutCommand(Sequence *s, bool enabled, long
 	new_enabled(enabled),
 	new_in(in),
 	new_out(out),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetTimelineInOutCommand::undo() {
@@ -221,7 +221,7 @@ void SetTimelineInOutCommand::undo() {
 		m->out = old_out;
 	}
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetTimelineInOutCommand::redo() {
@@ -241,7 +241,7 @@ void SetTimelineInOutCommand::redo() {
 		m->out = new_out;
 	}
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 AddEffectCommand::AddEffectCommand(Clip* c, Effect* e, const EffectMeta *m, int insert_pos) :
@@ -250,7 +250,7 @@ AddEffectCommand::AddEffectCommand(Clip* c, Effect* e, const EffectMeta *m, int
 	ref(e),
 	pos(insert_pos),
 	done(false),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 AddEffectCommand::~AddEffectCommand() {
@@ -265,7 +265,7 @@ void AddEffectCommand::undo() {
 		clip->effects.removeAt(pos);
 	}
 	done = false;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void AddEffectCommand::redo() {
@@ -278,7 +278,7 @@ void AddEffectCommand::redo() {
 		clip->effects.insert(pos, ref);
 	}
 	done = true;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 AddTransitionCommand::AddTransitionCommand(Clip* c, Clip *s, Transition* copy, const EffectMeta *itransition, int itype, int ilength) :
@@ -288,7 +288,7 @@ AddTransitionCommand::AddTransitionCommand(Clip* c, Clip *s, Transition* copy, c
 	transition(itransition),
 	type(itype),
 	length(ilength),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void AddTransitionCommand::undo() {
@@ -303,7 +303,7 @@ void AddTransitionCommand::undo() {
 		if (secondary != nullptr) secondary->opening_transition = old_stransition;
 	}
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void AddTransitionCommand::redo() {
@@ -328,27 +328,27 @@ void AddTransitionCommand::redo() {
 			clip->get_closing_transition()->set_length(length);
 		}
 	}
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 ModifyTransitionCommand::ModifyTransitionCommand(Clip* c, int itype, long ilength) :
 	clip(c),
 	type(itype),
 	new_length(ilength),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void ModifyTransitionCommand::undo() {
 	Transition* t = (type == TA_OPENING_TRANSITION) ? clip->get_opening_transition() : clip->get_closing_transition();
 	t->set_length(old_length);
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void ModifyTransitionCommand::redo() {
 	Transition* t = (type == TA_OPENING_TRANSITION) ? clip->get_opening_transition() : clip->get_closing_transition();
 	old_length = t->get_true_length();
 	t->set_length(new_length);
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 DeleteTransitionCommand::DeleteTransitionCommand(Sequence* s, int transition_index) :
@@ -357,7 +357,7 @@ DeleteTransitionCommand::DeleteTransitionCommand(Sequence* s, int transition_ind
 	transition(nullptr),
 	otc(nullptr),
 	ctc(nullptr),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 DeleteTransitionCommand::~DeleteTransitionCommand() {
@@ -371,7 +371,7 @@ void DeleteTransitionCommand::undo() {
 	if (ctc != nullptr) ctc->closing_transition = index;
 
 	transition = nullptr;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void DeleteTransitionCommand::redo() {
@@ -392,14 +392,14 @@ void DeleteTransitionCommand::redo() {
 	transition = seq->transitions.at(index);
 	seq->transitions[index] = nullptr;
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 NewSequenceCommand::NewSequenceCommand(Media *s, Media* iparent) :
 	seq(s),
 	parent(iparent),
 	done(false),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {
 	if (parent == nullptr) parent = project_model.get_root();
 }
@@ -412,21 +412,21 @@ void NewSequenceCommand::undo() {
 	project_model.removeChild(parent, seq);
 
 	done = false;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void NewSequenceCommand::redo() {
 	project_model.appendChild(parent, seq);
 
 	done = true;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 AddMediaCommand::AddMediaCommand(Media* iitem, Media *iparent) :
 	item(iitem),
 	parent(iparent),
 	done(false),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 AddMediaCommand::~AddMediaCommand() {
@@ -438,20 +438,20 @@ AddMediaCommand::~AddMediaCommand() {
 void AddMediaCommand::undo() {
 	project_model.removeChild(parent, item);
 	done = false;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void AddMediaCommand::redo() {
 	project_model.appendChild(parent, item);
 
 	done = true;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 DeleteMediaCommand::DeleteMediaCommand(Media* i) :
 	item(i),
 	parent(i->parentItem()),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 DeleteMediaCommand::~DeleteMediaCommand() {
@@ -463,21 +463,21 @@ DeleteMediaCommand::~DeleteMediaCommand() {
 void DeleteMediaCommand::undo() {
 	project_model.appendChild(parent, item);
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 	done = false;
 }
 
 void DeleteMediaCommand::redo() {
 	project_model.removeChild(parent, item);
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 	done = true;
 }
 
 AddClipCommand::AddClipCommand(Sequence* s, QVector<Clip*>& add) :
 	seq(s),
 	clips(add),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 AddClipCommand::~AddClipCommand() {
@@ -498,7 +498,7 @@ void AddClipCommand::undo() {
 		if (c->open) close_clip(c, true);
 		seq->clips.removeLast();
 	}
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void AddClipCommand::redo() {
@@ -525,10 +525,10 @@ void AddClipCommand::redo() {
 			}
 		}
 	}
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
-LinkCommand::LinkCommand() : link(true), old_project_changed(mainWindow->isWindowModified()) {}
+LinkCommand::LinkCommand() : link(true), old_project_changed(Olive::MainWindow->isWindowModified()) {}
 
 void LinkCommand::undo() {
 	for (int i=0;i<clips.size();i++) {
@@ -539,7 +539,7 @@ void LinkCommand::undo() {
 			c->linked = old_links.at(i);
 		}
 	}
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void LinkCommand::redo() {
@@ -558,30 +558,30 @@ void LinkCommand::redo() {
 			c->linked.clear();
 		}
 	}
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
-CheckboxCommand::CheckboxCommand(QCheckBox* b) : box(b), checked(box->isChecked()), done(true), old_project_changed(mainWindow->isWindowModified()) {}
+CheckboxCommand::CheckboxCommand(QCheckBox* b) : box(b), checked(box->isChecked()), done(true), old_project_changed(Olive::MainWindow->isWindowModified()) {}
 
 CheckboxCommand::~CheckboxCommand() {}
 
 void CheckboxCommand::undo() {
 	box->setChecked(!checked);
 	done = false;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void CheckboxCommand::redo() {
 	if (!done) {
 		box->setChecked(checked);
 	}
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 ReplaceMediaCommand::ReplaceMediaCommand(Media* i, QString s) :
 	item(i),
 	new_filename(s),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {
 	old_filename = item->to_footage()->url;
 }
@@ -610,20 +610,20 @@ void ReplaceMediaCommand::replace(QString& filename) {
 void ReplaceMediaCommand::undo() {
 	replace(old_filename);
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void ReplaceMediaCommand::redo() {
 	replace(new_filename);
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 ReplaceClipMediaCommand::ReplaceClipMediaCommand(Media *a, Media *b, bool e) :
 	old_media(a),
 	new_media(b),
 	preserve_clip_ins(e),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void ReplaceClipMediaCommand::replace(bool undo) {
@@ -660,17 +660,17 @@ void ReplaceClipMediaCommand::replace(bool undo) {
 void ReplaceClipMediaCommand::undo() {
 	replace(true);
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void ReplaceClipMediaCommand::redo() {
 	replace(false);
 
 	update_ui(true);
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
-EffectDeleteCommand::EffectDeleteCommand() : done(false), old_project_changed(mainWindow->isWindowModified()) {}
+EffectDeleteCommand::EffectDeleteCommand() : done(false), old_project_changed(Olive::MainWindow->isWindowModified()) {}
 
 EffectDeleteCommand::~EffectDeleteCommand() {
 	if (done) {
@@ -687,7 +687,7 @@ void EffectDeleteCommand::undo() {
 	}
 	panel_effect_controls->reload_clips();
 	done = false;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void EffectDeleteCommand::redo() {
@@ -702,16 +702,16 @@ void EffectDeleteCommand::redo() {
 	}
 	panel_effect_controls->reload_clips();
 	done = true;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
-MediaMove::MediaMove() : old_project_changed(mainWindow->isWindowModified()) {}
+MediaMove::MediaMove() : old_project_changed(Olive::MainWindow->isWindowModified()) {}
 
 void MediaMove::undo() {
 	for (int i=0;i<items.size();i++) {
 		project_model.moveChild(items.at(i), froms.at(i));
 	}
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void MediaMove::redo() {
@@ -722,47 +722,47 @@ void MediaMove::redo() {
 		froms[i] = parent;
 		project_model.moveChild(items.at(i), to);
 	}
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 MediaRename::MediaRename(Media* iitem, QString ito) :
 	item(iitem),
 	from(iitem->get_name()),
 	to(ito),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void MediaRename::undo() {
 	item->set_name(from);
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void MediaRename::redo() {
 	item->set_name(to);
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 KeyframeDelete::KeyframeDelete(EffectField *ifield, int iindex) :
 	field(ifield),
 	index(iindex),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void KeyframeDelete::undo() {
 	field->keyframes.insert(index, deleted_key);
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void KeyframeDelete::redo() {
 	deleted_key = field->keyframes.at(index);
 	field->keyframes.removeAt(index);
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 EffectFieldUndo::EffectFieldUndo(EffectField* f) :
 	field(f),
 	done(true),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {
 	old_val = field->get_previous_data();
 	new_val = field->get_current_data();
@@ -771,18 +771,18 @@ EffectFieldUndo::EffectFieldUndo(EffectField* f) :
 void EffectFieldUndo::undo() {
 	field->set_current_data(old_val);
 	done = false;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void EffectFieldUndo::redo() {
 	if (!done) {
 		field->set_current_data(new_val);
 	}
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 SetAutoscaleAction::SetAutoscaleAction() :
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetAutoscaleAction::undo() {
@@ -790,7 +790,7 @@ void SetAutoscaleAction::undo() {
 		clips.at(i)->autoscale = !clips.at(i)->autoscale;
 	}
 	panel_sequence_viewer->viewer_widget->frame_update();
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetAutoscaleAction::redo() {
@@ -798,14 +798,14 @@ void SetAutoscaleAction::redo() {
 		clips.at(i)->autoscale = !clips.at(i)->autoscale;
 	}
 	panel_sequence_viewer->viewer_widget->frame_update();
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 AddMarkerAction::AddMarkerAction(QVector<Marker>* m, long t, QString n) :
 	active_array(m),
 	time(t),
 	name(n),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void AddMarkerAction::undo() {
@@ -815,7 +815,7 @@ void AddMarkerAction::undo() {
 		active_array[0][index].name = old_name;
 	}
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void AddMarkerAction::redo() {
@@ -838,37 +838,37 @@ void AddMarkerAction::redo() {
 		active_array[0][index].name = name;
 	}
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 MoveMarkerAction::MoveMarkerAction(Marker* m, long o, long n) :
 	marker(m),
 	old_time(o),
 	new_time(n),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void MoveMarkerAction::undo() {
 	marker->frame = old_time;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void MoveMarkerAction::redo() {
 	marker->frame = new_time;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 DeleteMarkerAction::DeleteMarkerAction(QVector<Marker> *m) :
 	active_array(m),
 	sorted(false),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void DeleteMarkerAction::undo() {
 	for (int i=markers.size()-1;i>=0;i--) {
 		active_array->insert(markers.at(i), copies.at(i));
 	}
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void DeleteMarkerAction::redo() {
@@ -885,55 +885,55 @@ void DeleteMarkerAction::redo() {
 		active_array->removeAt(markers.at(i));
 	}
 	sorted = true;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 SetSpeedAction::SetSpeedAction(Clip* c, double speed) :
 	clip(c),
 	old_speed(c->speed),
 	new_speed(speed),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetSpeedAction::undo() {
 	clip->speed = old_speed;
 	clip->recalculateMaxLength();
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetSpeedAction::redo() {
 	clip->speed = new_speed;
 	clip->recalculateMaxLength();
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 SetBool::SetBool(bool* b, bool setting) :
 	boolean(b),
 	old_setting(*b),
 	new_setting(setting),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetBool::undo() {
 	*boolean = old_setting;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetBool::redo() {
 	*boolean = new_setting;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 SetSelectionsCommand::SetSelectionsCommand(Sequence* s) :
 	seq(s),
 	done(true),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetSelectionsCommand::undo() {
 	seq->selections = old_data;
 	done = false;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetSelectionsCommand::redo() {
@@ -941,30 +941,30 @@ void SetSelectionsCommand::redo() {
 		seq->selections = new_data;
 		done = true;
 	}
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 SetEnableCommand::SetEnableCommand(Clip* c, bool enable) :
 	clip(c),
 	old_val(c->enabled),
 	new_val(enable),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetEnableCommand::undo() {
 	clip->enabled = old_val;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetEnableCommand::redo() {
 	clip->enabled = new_val;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 EditSequenceCommand::EditSequenceCommand(Media* i, Sequence *s) :
 	item(i),
 	seq(s),
-	old_project_changed(mainWindow->isWindowModified()),
+    old_project_changed(Olive::MainWindow->isWindowModified()),
 	old_name(s->name),
 	old_width(s->width),
 	old_height(s->height),
@@ -982,7 +982,7 @@ void EditSequenceCommand::undo() {
 	seq->audio_layout = old_audio_layout;
 	update();
 
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void EditSequenceCommand::redo() {
@@ -994,7 +994,7 @@ void EditSequenceCommand::redo() {
 	seq->audio_layout = audio_layout;
 	update();
 
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 void EditSequenceCommand::update() {
@@ -1005,7 +1005,7 @@ void EditSequenceCommand::update() {
 		if (seq->clips.at(i) != nullptr) seq->clips.at(i)->refresh();
 	}
 
-	if (sequence == seq) {
+	if (Olive::ActiveSequence == seq) {
 		set_sequence(seq);
 	}
 }
@@ -1014,34 +1014,34 @@ SetInt::SetInt(int* pointer, int new_value) :
 	p(pointer),
 	oldval(*pointer),
 	newval(new_value),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetInt::undo() {
 	*p = oldval;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetInt::redo() {
 	*p = newval;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 SetString::SetString(QString* pointer, QString new_value) :
 	p(pointer),
 	oldval(*pointer),
 	newval(new_value),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetString::undo() {
 	*p = oldval;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetString::redo() {
 	*p = newval;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 void CloseAllClipsCommand::undo() {
@@ -1049,7 +1049,7 @@ void CloseAllClipsCommand::undo() {
 }
 
 void CloseAllClipsCommand::redo() {
-	closeActiveClips(sequence);
+	closeActiveClips(Olive::ActiveSequence);
 }
 
 UpdateFootageTooltip::UpdateFootageTooltip(Media *i) :
@@ -1065,22 +1065,22 @@ void UpdateFootageTooltip::redo() {
 }
 
 MoveEffectCommand::MoveEffectCommand() :
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void MoveEffectCommand::undo() {
 	clip->effects.move(to, from);
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void MoveEffectCommand::redo() {
 	clip->effects.move(from, to);
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 RemoveClipsFromClipboard::RemoveClipsFromClipboard(int index) :
 	pos(index),
-	old_project_changed(mainWindow->isWindowModified()),
+    old_project_changed(Olive::MainWindow->isWindowModified()),
 	done(false)
 {}
 
@@ -1102,7 +1102,7 @@ void RemoveClipsFromClipboard::redo() {
 }
 
 RenameClipCommand::RenameClipCommand() :
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void RenameClipCommand::undo() {
@@ -1122,18 +1122,18 @@ void RenameClipCommand::redo() {
 SetPointer::SetPointer(void **pointer, void *data) :
 	p(pointer),
 	new_data(data),
-	old_changed(mainWindow->isWindowModified())
+    old_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetPointer::undo() {
 	*p = old_data;
-	mainWindow->setWindowModified(old_changed);
+    Olive::MainWindow->setWindowModified(old_changed);
 }
 
 void SetPointer::redo() {
 	old_data = *p;
 	*p = new_data;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 void ReloadEffectsCommand::undo() {
@@ -1175,17 +1175,17 @@ SetDouble::SetDouble(double* pointer, double old_value, double new_value) :
 	p(pointer),
 	oldval(old_value),
 	newval(new_value),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetDouble::undo() {
 	*p = oldval;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetDouble::redo() {
 	*p = newval;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 SetQVariant::SetQVariant(QVariant *itarget, const QVariant &iold, const QVariant &inew) :
@@ -1206,17 +1206,17 @@ SetLong::SetLong(long *pointer, long old_value, long new_value) :
 	p(pointer),
 	oldval(old_value),
 	newval(new_value),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void SetLong::undo() {
 	*p = oldval;
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 }
 
 void SetLong::redo() {
 	*p = newval;
-	mainWindow->setWindowModified(true);
+    Olive::MainWindow->setWindowModified(true);
 }
 
 KeyframeFieldSet::KeyframeFieldSet(EffectField *ifield, int ii) :
@@ -1224,19 +1224,19 @@ KeyframeFieldSet::KeyframeFieldSet(EffectField *ifield, int ii) :
 	index(ii),
 	key(ifield->keyframes.at(ii)),
 	done(true),
-	old_project_changed(mainWindow->isWindowModified())
+    old_project_changed(Olive::MainWindow->isWindowModified())
 {}
 
 void KeyframeFieldSet::undo() {
 	field->keyframes.removeAt(index);
-	mainWindow->setWindowModified(old_project_changed);
+    Olive::MainWindow->setWindowModified(old_project_changed);
 	done = false;
 }
 
 void KeyframeFieldSet::redo() {
 	if (!done) {
 		field->keyframes.insert(index, key);
-		mainWindow->setWindowModified(true);
+        Olive::MainWindow->setWindowModified(true);
 	}
 	done = true;
 }