don't use shared ptrs on streams

This commit is contained in:
itsmattkc
2020-12-16 13:46:19 +11:00
parent e12013e2fb
commit 6cb6407bd8
47 changed files with 192 additions and 212 deletions
+7 -7
View File
@@ -40,14 +40,14 @@ QVector<Node::CategoryID> MediaInput::Category() const
return {kCategoryInput};
}
StreamPtr MediaInput::stream()
Stream *MediaInput::stream() const
{
return footage_input_->get_standard_value().value<StreamPtr>();
return Node::ValueToPtr<Stream>(footage_input_->get_standard_value());
}
void MediaInput::SetStream(StreamPtr s)
void MediaInput::SetStream(Stream* s)
{
footage_input_->set_standard_value(QVariant::fromValue(s));
footage_input_->set_standard_value(Node::PtrToValue(s));
}
bool MediaInput::IsMedia() const
@@ -76,20 +76,20 @@ NodeValueTable MediaInput::Value(NodeValueDatabase &value) const
void MediaInput::FootageChanged()
{
StreamPtr new_footage = footage_input_->get_standard_value().value<StreamPtr>();
Stream* new_footage = footage_input_->get_standard_value().value<Stream*>();
if (new_footage == connected_footage_) {
return;
}
if (connected_footage_) {
disconnect(connected_footage_.get(), &Stream::ParametersChanged, this, &MediaInput::FootageParametersChanged);
disconnect(connected_footage_, &Stream::ParametersChanged, this, &MediaInput::FootageParametersChanged);
}
connected_footage_ = new_footage;
if (connected_footage_) {
connect(connected_footage_.get(), &Stream::ParametersChanged, this, &MediaInput::FootageParametersChanged);
connect(connected_footage_, &Stream::ParametersChanged, this, &MediaInput::FootageParametersChanged);
}
}
+3 -3
View File
@@ -58,8 +58,8 @@ public:
virtual QVector<CategoryID> Category() const override;
StreamPtr stream();
void SetStream(StreamPtr s);
Stream* stream() const;
void SetStream(Stream *s);
virtual bool IsMedia() const override;
@@ -70,7 +70,7 @@ public:
protected:
NodeInput* footage_input_;
StreamPtr connected_footage_;
Stream* connected_footage_;
private slots:
void FootageChanged();