CaptureCont Move timeer to a start functiopn

Author: Lord-Grey

include/hyperion/CaptureCont.h

@@ -23,6 +23,14 @@ class CaptureCont : public QObject
 	void setVideoCaptureEnable(bool enable);
 	void setAudioCaptureEnable(bool enable);
 
+	///
+	/// @brief Start Capture Control and its timers
+	///
+	void start();
+
+	///
+	/// @brief Stop Capture Control and its timers
+	///
 	void stop();
 
 private slots:
@@ -82,17 +90,17 @@ private slots:
 	bool _screenCaptureEnabled;
 	int _screenCapturePriority;
 	QString _screenCaptureName;
-	QTimer* _screenCaptureInactiveTimer;
+	QScopedPointer<QTimer, QScopedPointerDeleteLater> _screenCaptureInactiveTimer;
 
 	/// Reflect state of video capture and prio
 	bool _videoCaptureEnabled;
 	int _videoCapturePriority;
 	QString _videoCaptureName;
-	QTimer* _videoInactiveTimer;
+	QScopedPointer<QTimer, QScopedPointerDeleteLater> _videoInactiveTimer;
 
 	/// Reflect state of audio capture and prio
 	bool _audioCaptureEnabled;
 	int _audioCapturePriority;
 	QString _audioCaptureName;
-	QTimer* _audioCaptureInactiveTimer;
+	QScopedPointer<QTimer, QScopedPointerDeleteLater> _audioCaptureInactiveTimer;
 };

libsrc/hyperion/CaptureCont.cpp

@@ -25,32 +25,41 @@ CaptureCont::CaptureCont(Hyperion* hyperion)
 	: _hyperion(hyperion)
 	, _screenCaptureEnabled(false)
 	, _screenCapturePriority(0)
-	, _screenCaptureInactiveTimer(new QTimer(this))
+	, _screenCaptureInactiveTimer(nullptr)
 	, _videoCaptureEnabled(false)
 	, _videoCapturePriority(0)
-	, _videoInactiveTimer(new QTimer(this))
+	, _videoInactiveTimer(nullptr)
 	, _audioCaptureEnabled(false)
 	, _audioCapturePriority(0)
-	, _audioCaptureInactiveTimer(new QTimer(this))
+	, _audioCaptureInactiveTimer(nullptr)
 {
+}
+
+void CaptureCont::start()
+{
+	qDebug() << "CaptureCont::start()...";
+
 	// settings changes
 	connect(_hyperion, &Hyperion::settingsChanged, this, &CaptureCont::handleSettingsUpdate);
 
 	// comp changes
 	connect(_hyperion, &Hyperion::compStateChangeRequest, this, &CaptureCont::handleCompStateChangeRequest);
 
 	// inactive timer screen
-	connect(_screenCaptureInactiveTimer, &QTimer::timeout, this, &CaptureCont::onScreenIsInactive);
+	_screenCaptureInactiveTimer.reset(new QTimer(this));
+	connect(_screenCaptureInactiveTimer.get(), &QTimer::timeout, this, &CaptureCont::onScreenIsInactive);
 	_screenCaptureInactiveTimer->setSingleShot(true);
 	_screenCaptureInactiveTimer->setInterval(DEFAULT_SCREEN_CAPTURE_INACTIVE_TIMEOUT);
 
 	// inactive timer video
-	connect(_videoInactiveTimer, &QTimer::timeout, this, &CaptureCont::onVideoIsInactive);
+	_videoInactiveTimer.reset(new QTimer(this));
+	connect(_videoInactiveTimer.get(), &QTimer::timeout, this, &CaptureCont::onVideoIsInactive);
 	_videoInactiveTimer->setSingleShot(true);
 	_videoInactiveTimer->setInterval(DEFAULT_VIDEO_CAPTURE_INACTIVE_TIMEOUT);
 
 	// inactive timer audio
-	connect(_audioCaptureInactiveTimer, &QTimer::timeout, this, &CaptureCont::onAudioIsInactive);
+	_audioCaptureInactiveTimer.reset(new QTimer(this));
+	connect(_audioCaptureInactiveTimer.get(), &QTimer::timeout, this, &CaptureCont::onAudioIsInactive);
 	_audioCaptureInactiveTimer->setSingleShot(true);
 	_audioCaptureInactiveTimer->setInterval(DEFAULT_AUDIO_CAPTURE_INACTIVE_TIMEOUT);
 
@@ -62,16 +71,18 @@ void CaptureCont::stop()
 {
 	qDebug() << "CaptureCont::stop()...";
 
+	disconnect(_hyperion, &Hyperion::compStateChangeRequest, this, &CaptureCont::handleCompStateChangeRequest);
+	disconnect(_hyperion, &Hyperion::settingsChanged, this, &CaptureCont::handleSettingsUpdate);
+
 	_videoInactiveTimer->stop();
 	_screenCaptureInactiveTimer->stop();
 	_audioCaptureInactiveTimer->stop();
 
-	disconnect(_videoInactiveTimer, &QTimer::timeout, this, &CaptureCont::onVideoIsInactive);
-	disconnect(_screenCaptureInactiveTimer, &QTimer::timeout, this, &CaptureCont::onScreenIsInactive);
-	disconnect(_audioCaptureInactiveTimer, &QTimer::timeout, this, &CaptureCont::onAudioIsInactive);
+	disconnect(_videoInactiveTimer.get(), &QTimer::timeout, this, &CaptureCont::onVideoIsInactive);
+	disconnect(_screenCaptureInactiveTimer.get(), &QTimer::timeout, this, &CaptureCont::onScreenIsInactive);
+	disconnect(_audioCaptureInactiveTimer.get(), &QTimer::timeout, this, &CaptureCont::onAudioIsInactive);
+
 
-	disconnect(_hyperion, &Hyperion::compStateChangeRequest, this, &CaptureCont::handleCompStateChangeRequest);
-	disconnect(_hyperion, &Hyperion::settingsChanged, this, &CaptureCont::handleSettingsUpdate);
 }
 
 CaptureCont::~CaptureCont()

libsrc/hyperion/Hyperion.cpp

@@ -162,6 +162,7 @@ void Hyperion::start()
 
 	// create the Daemon capture interface
 	_captureCont.reset(new CaptureCont(this));
+	_captureCont->start();
 
 	// link global signals with the corresponding slots
 	connect(GlobalSignals::getInstance(), &GlobalSignals::registerGlobalInput, this, &Hyperion::registerInput);