deleted FileRecorder from master

shortstheory · May 22, 2020 · f177490 · f177490
1 parent e620a06
commit f177490
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 133 deletions.
diff --git a/meson.build b/meson.build
@@ -7,6 +7,6 @@ gst_rtsp_dep = dependency('gstreamer-rtsp-1.0')
 gst_rtsp_server_dep = dependency('gstreamer-rtsp-server-1.0')
 thread_dep = dependency('threads')
 
-common_deps = ['src/Common/PipelineManager.cpp', 'src/Common/QoSEstimator.cpp', 'src/Common/FileRecorder.cpp']
+common_deps = ['src/Common/PipelineManager.cpp', 'src/Common/QoSEstimator.cpp']
 rtsp_src = ['src/RTSPStreamServer/stream_server.cpp', 'src/RTSPStreamServer/IPCMessageHandler.cpp', 'src/RTSPStreamServer/RTSPAdaptiveStreaming.cpp', 'src/RTSPStreamServer/RTSPStreamServer.cpp']
 executable('stream_server', sources: [rtsp_src, common_deps], dependencies: [gst_dep, gst_rtp_dep, gst_rtsp_dep, gst_rtsp_server_dep, thread_dep], cpp_args : '-Werror', install : true)
diff --git a/src/Common/Common.h b/src/Common/Common.h
@@ -6,6 +6,5 @@
 #include "QoSEstimator.h"
 #include "PipelineManager.h"
 #include "Constants.h"
-#include "FileRecorder.h"
 
 #endif
diff --git a/src/Common/FileRecorder.cpp b/src/Common/FileRecorder.cpp
diff --git a/src/Common/FileRecorder.h b/src/Common/FileRecorder.h
diff --git a/src/Common/PipelineManager.cpp b/src/Common/PipelineManager.cpp
@@ -5,7 +5,7 @@
 #include <linux/v4l2-controls.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-
+#include <iostream>
 #include "PipelineManager.h"
 
 PipelineManager::PipelineManager(string _device, int quality, CameraType type) : network_state(NetworkState::STEADY), successive_transmissions(0),

diff --git a/src/Common/PipelineManager.h b/src/Common/PipelineManager.h
@@ -15,7 +15,6 @@
 #include "QoSEstimator.h"
 #include "DeviceDatatypes.h"
 #include "Constants.h"
-#include "FileRecorder.h"
 
 using namespace std;
 

diff --git a/src/RTSPStreamServer/RTSPStreamServer.cpp b/src/RTSPStreamServer/RTSPStreamServer.cpp
@@ -1,5 +1,4 @@
 #include <sys/ioctl.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <linux/videodev2.h>