Use QSharedPointer for GstEnginePipeline
This commit is contained in:
@@ -62,7 +62,6 @@
|
|||||||
#include "gstbufferconsumer.h"
|
#include "gstbufferconsumer.h"
|
||||||
|
|
||||||
using namespace Qt::Literals::StringLiterals;
|
using namespace Qt::Literals::StringLiterals;
|
||||||
using std::make_shared;
|
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
# pragma clang diagnostic push
|
# pragma clang diagnostic push
|
||||||
@@ -897,7 +896,7 @@ void GstEngine::StopTimers() {
|
|||||||
|
|
||||||
GstEnginePipelinePtr GstEngine::CreatePipeline() {
|
GstEnginePipelinePtr GstEngine::CreatePipeline() {
|
||||||
|
|
||||||
GstEnginePipelinePtr pipeline = make_shared<GstEnginePipeline>();
|
GstEnginePipelinePtr pipeline = GstEnginePipelinePtr(new GstEnginePipeline);
|
||||||
pipeline->set_output_device(output_, device_);
|
pipeline->set_output_device(output_, device_);
|
||||||
pipeline->set_exclusive_mode(exclusive_mode_);
|
pipeline->set_exclusive_mode(exclusive_mode_);
|
||||||
pipeline->set_volume_enabled(volume_control_);
|
pipeline->set_volume_enabled(volume_control_);
|
||||||
|
|||||||
@@ -41,6 +41,7 @@
|
|||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
#include <QSharedPointer>
|
||||||
|
|
||||||
#include "includes/shared_ptr.h"
|
#include "includes/shared_ptr.h"
|
||||||
#include "includes/mutex_protected.h"
|
#include "includes/mutex_protected.h"
|
||||||
@@ -374,6 +375,6 @@ class GstEnginePipeline : public QObject {
|
|||||||
mutex_protected<int> set_state_async_in_progress_;
|
mutex_protected<int> set_state_async_in_progress_;
|
||||||
};
|
};
|
||||||
|
|
||||||
using GstEnginePipelinePtr = SharedPtr<GstEnginePipeline>;
|
using GstEnginePipelinePtr = QSharedPointer<GstEnginePipeline>;
|
||||||
|
|
||||||
#endif // GSTENGINEPIPELINE_H
|
#endif // GSTENGINEPIPELINE_H
|
||||||
|
|||||||
Reference in New Issue
Block a user