merged with master

timeline/mediaimportdata.cpp

@@ -0,0 +1,17 @@
+#include "mediaimportdata.h"
+
+olive::timeline::MediaImportData::MediaImportData(Media *media, olive::timeline::MediaImportType import_type) :
+  media_(media),
+  import_type_(import_type)
+{
+}
+
+Media *olive::timeline::MediaImportData::media() const
+{
+  return media_;
+}
+
+olive::timeline::MediaImportType olive::timeline::MediaImportData::type() const
+{
+  return import_type_;
+}

timeline/mediaimportdata.h

@@ -0,0 +1,29 @@
+#ifndef MEDIAIMPORTDATA_H
+#define MEDIAIMPORTDATA_H
+
+#include "project/media.h"
+
+namespace olive {
+namespace timeline {
+
+enum MediaImportType {
+  kImportVideoOnly,
+  kImportAudioOnly,
+  kImportBoth
+};
+
+class MediaImportData {
+public:
+  MediaImportData(Media* media = nullptr, MediaImportType import_type = kImportBoth);
+  Media* media() const;
+  MediaImportType type() const;
+private:
+  Media* media_;
+  MediaImportType import_type_;
+};
+
+}
+}
+
+
+#endif // MEDIAIMPORTDATA_H