replaced mediathrobber with mediaiconservice

project/footage.h

@@ -40,7 +40,6 @@ enum VideoInterlacingMode {
 class Sequence;
 class Clip;
 class PreviewGenerator;
-class MediaThrobber;
 
 struct FootageStream {
 	int file_index;

project/media.cpp

@@ -61,8 +61,7 @@ QString get_channel_layout_name(int channels, uint64_t layout) {
 }
 
 Media::Media(Media* iparent) :
-	parent(iparent),
-	throbber(nullptr),
+    parent(iparent),
 	root(false),
 	type(-1)
 {}
@@ -71,7 +70,6 @@ Media::~Media() {
     for (int i=0;i<children.size();i++) {
         delete children.at(i);
     }
-	delete throbber;
 }
 
 FootagePtr Media::to_footage() {

project/media.h

@@ -39,8 +39,6 @@ using SequencePtr = std::shared_ptr<Sequence>;
 
 using VoidPtr = std::shared_ptr<void>;
 
-class MediaThrobber;
-
 class Media
 {
 public:
@@ -58,7 +56,6 @@ public:
     int get_type();
     const QString& get_name();
     void set_name(const QString& n);
-    MediaThrobber* throbber;
 
 	double get_frame_rate(int stream = -1);
 	int get_sampling_rate(int stream = -1);

project/projectmodel.cpp

@@ -26,6 +26,8 @@
 #include "project/media.h"
 #include "debug.h"
 
+ProjectModel olive::project_model;
+
 ProjectModel::ProjectModel(QObject *parent) : QAbstractItemModel(parent), root_item(nullptr) {
 	make_root();
 }

project/projectmodel.h

@@ -60,4 +60,8 @@ private:
     Media* root_item;
 };
 
+namespace olive {
+    extern ProjectModel project_model;
+}
+
 #endif // PROJECTMODEL_H

project/undo.cpp

@@ -357,7 +357,7 @@ NewSequenceCommand::NewSequenceCommand(Media *s, Media* iparent) {
     parent = iparent;
     done = false;
 
-	if (parent == nullptr) parent = project_model.get_root();
+	if (parent == nullptr) parent = olive::project_model.get_root();
 }
 
 NewSequenceCommand::~NewSequenceCommand() {
@@ -365,13 +365,13 @@ NewSequenceCommand::~NewSequenceCommand() {
 }
 
 void NewSequenceCommand::doUndo() {
-	project_model.removeChild(parent, seq);
+	olive::project_model.removeChild(parent, seq);
 
     done = false;
 }
 
 void NewSequenceCommand::doRedo() {
-	project_model.appendChild(parent, seq);
+	olive::project_model.appendChild(parent, seq);
 
     done = true;
 }
@@ -389,13 +389,13 @@ AddMediaCommand::~AddMediaCommand() {
 }
 
 void AddMediaCommand::doUndo() {
-	project_model.removeChild(parent, item);
+	olive::project_model.removeChild(parent, item);
 	done = false;
     
 }
 
 void AddMediaCommand::doRedo() {
-	project_model.appendChild(parent, item);
+	olive::project_model.appendChild(parent, item);
 
 	done = true;
 }
@@ -412,14 +412,14 @@ DeleteMediaCommand::~DeleteMediaCommand() {
 }
 
 void DeleteMediaCommand::doUndo() {
-	project_model.appendChild(parent, item);
+	olive::project_model.appendChild(parent, item);
 
     
 	done = false;
 }
 
 void DeleteMediaCommand::doRedo() {
-	project_model.removeChild(parent, item);
+	olive::project_model.removeChild(parent, item);
 
 	done = true;
 }
@@ -641,18 +641,18 @@ MediaMove::MediaMove() {}
 
 void MediaMove::doUndo() {
 	for (int i=0;i<items.size();i++) {
-		project_model.moveChild(items.at(i), froms.at(i));
+		olive::project_model.moveChild(items.at(i), froms.at(i));
 	}
     
 }
 
 void MediaMove::doRedo() {
-	if (to == nullptr) to = project_model.get_root();
+	if (to == nullptr) to = olive::project_model.get_root();
 	froms.resize(items.size());
 	for (int i=0;i<items.size();i++) {
         Media* parent = items.at(i)->parentItem();
 		froms[i] = parent;
-		project_model.moveChild(items.at(i), to);
+		olive::project_model.moveChild(items.at(i), to);
 	}
 }