don't use shared ptr on projects
Really unnecessary
This commit is contained in:
@@ -60,7 +60,7 @@ bool ProjectLoadTask::Run()
|
||||
} else if (reader.name() == QStringLiteral("url")) {
|
||||
project_saved_url_ = reader.readElementText();
|
||||
} else if (reader.name() == QStringLiteral("project")) {
|
||||
project_ = std::make_shared<Project>();
|
||||
project_ = new Project();
|
||||
|
||||
project_->set_filename(GetFilename());
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ class ProjectLoadBaseTask : public Task
|
||||
public:
|
||||
ProjectLoadBaseTask(const QString& filename);
|
||||
|
||||
ProjectPtr GetLoadedProject() const
|
||||
Project* GetLoadedProject() const
|
||||
{
|
||||
return project_;
|
||||
}
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
}
|
||||
|
||||
protected:
|
||||
ProjectPtr project_;
|
||||
Project* project_;
|
||||
|
||||
MainWindowLayoutInfo layout_info_;
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ bool LoadOTIOTask::Run()
|
||||
return false;
|
||||
}
|
||||
|
||||
project_ = std::make_shared<Project>();
|
||||
project_ = new Project();
|
||||
project_->set_filename(GetFilename());
|
||||
|
||||
std::vector<OTIO::Timeline*> timelines;
|
||||
@@ -165,7 +165,7 @@ bool LoadOTIOTask::Run()
|
||||
if (imported_footage.contains(footage_url)) {
|
||||
probed_item = imported_footage.value(footage_url);
|
||||
} else {
|
||||
probed_item = Decoder::Probe(project_.get(), footage_url, &IsCancelled());
|
||||
probed_item = Decoder::Probe(project_, footage_url, &IsCancelled());
|
||||
imported_footage.insert(footage_url, probed_item);
|
||||
project_->root()->add_child(probed_item);
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
namespace olive {
|
||||
|
||||
ProjectSaveTask::ProjectSaveTask(ProjectPtr project) :
|
||||
ProjectSaveTask::ProjectSaveTask(Project *project) :
|
||||
project_(project)
|
||||
{
|
||||
SetTitle(tr("Saving '%1'").arg(project->filename()));
|
||||
|
||||
@@ -30,9 +30,9 @@ class ProjectSaveTask : public Task
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
ProjectSaveTask(ProjectPtr project);
|
||||
ProjectSaveTask(Project* project);
|
||||
|
||||
ProjectPtr GetProject() const
|
||||
Project* GetProject() const
|
||||
{
|
||||
return project_;
|
||||
}
|
||||
@@ -41,7 +41,7 @@ protected:
|
||||
virtual bool Run() override;
|
||||
|
||||
private:
|
||||
ProjectPtr project_;
|
||||
Project* project_;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
namespace olive {
|
||||
|
||||
SaveOTIOTask::SaveOTIOTask(ProjectPtr project) :
|
||||
SaveOTIOTask::SaveOTIOTask(Project *project) :
|
||||
project_(project)
|
||||
{
|
||||
SetTitle(tr("Exporting project to OpenTimelineIO"));
|
||||
|
||||
@@ -33,7 +33,7 @@ class SaveOTIOTask : public Task
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
SaveOTIOTask(ProjectPtr project);
|
||||
SaveOTIOTask(Project* project);
|
||||
|
||||
protected:
|
||||
virtual bool Run() override;
|
||||
@@ -45,7 +45,7 @@ private:
|
||||
|
||||
bool SerializeTrackList(TrackList* list, opentimelineio::v1_0::Timeline *otio_timeline);
|
||||
|
||||
ProjectPtr project_;
|
||||
Project* project_;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user