Remove all conditional compile checks in vidstream

OpenHD · Oct 31, 2019 · 583f274 · 583f274
1 parent dd7937f
commit 583f274
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/inc/openhdvideostream.h b/inc/openhdvideostream.h
@@ -3,11 +3,9 @@
 
 #include <QObject>
 
-#if defined(ENABLE_VIDEO)
 #include "../src/VideoStreaming/VideoStreaming.h"
 #include "../src/VideoStreaming/VideoSurface.h"
 #include "../src/VideoStreaming/VideoReceiver.h"
-#endif
 
 class OpenHDVideoStream : public QObject
 {
@@ -17,18 +15,14 @@ class OpenHDVideoStream : public QObject
     OpenHDVideoStream(QObject *parent = nullptr);
     virtual ~OpenHDVideoStream();
 
-#if defined(ENABLE_VIDEO)
     Q_PROPERTY(VideoReceiver* videoReceiver READ getVideoReceiver NOTIFY videoReceiverChanged)
     VideoReceiver* getVideoReceiver() { return &m_receiver; }
-#endif
 
     Q_PROPERTY(QString uri MEMBER m_uri WRITE setUri NOTIFY uriChanged)
     void setUri(QString uri);
 
 signals:
-#if defined(ENABLE_VIDEO)
     void videoReceiverChanged(VideoReceiver* videoReceiver);
-#endif
     void uriChanged(QString uri);
 
 public slots:
@@ -41,9 +35,7 @@ public slots:
     void _stop();
     QString m_uri;
 
-#if defined(ENABLE_VIDEO)
     VideoReceiver m_receiver;
-#endif
 };
 
 #endif // OpenHDVideoStream_H
diff --git a/src/openhdvideostream.cpp b/src/openhdvideostream.cpp
@@ -19,39 +19,29 @@ void OpenHDVideoStream::init() {
 }
 
 void OpenHDVideoStream::_start() {
-#if defined(ENABLE_VIDEO)
     qDebug() << "OpenHDVideoStream::_start()";
     if (!m_receiver.running()) {
         m_receiver.start();
     }
-#endif
 }
 
 void OpenHDVideoStream::startVideo() {
-#if defined(ENABLE_VIDEO)
     QFuture<void> future = QtConcurrent::run(this, &OpenHDVideoStream::_start);
-#endif
 }
 
 void OpenHDVideoStream::_stop() {
-#if defined(ENABLE_VIDEO)
     qDebug() << "OpenHDVideoStream::_stop()";
     if (m_receiver.running()) {
         m_receiver.stop();
     }
-#endif
 }
 
 void OpenHDVideoStream::stopVideo() {
-#if defined(ENABLE_VIDEO)
     QFuture<void> future = QtConcurrent::run(this, &OpenHDVideoStream::_stop);
-#endif
 }
 
 void OpenHDVideoStream::setUri(QString uri) {
     m_uri = uri;
     emit uriChanged(m_uri);
-    #if defined(ENABLE_VIDEO)
     m_receiver.setUri(m_uri);
-    #endif
 }