small comp fixes

OpenHD · Feb 29, 2024 · 2693ed5 · 2693ed5
1 parent 43f2565
commit 2693ed5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,7 +122,7 @@ target_link_libraries(QOpenHDApp
 )
 
 include(lib/h264/h264.cmake)
-include(app/videostreaming/avcodec/avcodec_video.cmake)
+#include(app/videostreaming/avcodec/avcodec_video.cmake)
 include(app/videostreaming/android/videostreamingandroid.cmake)
 
 #include(GNUInstallDirs)

diff --git a/app/telemetry/connection/tcp_connection.cpp b/app/telemetry/connection/tcp_connection.cpp
@@ -206,9 +206,9 @@ void TCPConnection::receive_until_stopped()
     // Enough for MTU 1500 bytes.
     auto buffer=std::make_unique<std::vector<uint8_t>>();
     buffer->resize(1500);
-    struct timeval tv;
-    tv.tv_sec = 3;
-    tv.tv_usec = 0;
+    //struct timeval tv;
+    //tv.tv_sec = 3;
+    //tv.tv_usec = 0;
     //setsockopt(m_socket_fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
     while (m_keep_receiving) {
         const auto elapsed_last_message=QOpenHDMavlinkHelper::getTimeMilliseconds()-m_last_data_ms;

diff --git a/app/telemetry/models/markermodel.cpp b/app/telemetry/models/markermodel.cpp
@@ -1,7 +1,5 @@
 #include <QThread>
 // #include <QtConcurrent>
-#include <QFutureWatcher>
-#include <QFuture>
 
 #include "markermodel.h"
 
@@ -43,13 +41,9 @@ int Traffic::distance() const{
 }
 
 
-static MarkerModel* _instance = nullptr;
-
 MarkerModel* MarkerModel::instance() {
-    if (_instance == nullptr) {
-        _instance = new MarkerModel();
-    }
-    return _instance;
+    static MarkerModel m_instance{};
+    return &m_instance;
 }
 
 MarkerModel::MarkerModel(QObject *parent): QAbstractListModel(parent){