diff --git a/Loopback.cpp b/Loopback.cpp index 5098ab9..5e0c7dd 100644 --- a/Loopback.cpp +++ b/Loopback.cpp @@ -178,7 +178,6 @@ std::string Loopback::init(GstCaps *caps) return std::string("Invalid caps"); if (!Loopback::systemLoopbackInitialized()){ - finished_ = true; return std::string("Loopback system shall be initialized first."); } @@ -191,7 +190,6 @@ std::string Loopback::init(GstCaps *caps) if (error != NULL) { std::string msg = std::string("Loopback : Could not construct pipeline ") + description + "\n" + std::string(error->message); g_clear_error (&error); - finished_ = true; return msg; } @@ -237,14 +235,12 @@ std::string Loopback::init(GstCaps *caps) } else { - finished_ = true; return std::string("Loopback : Could not configure source."); } // start recording GstStateChangeReturn ret = gst_element_set_state (pipeline_, GST_STATE_PLAYING); if (ret == GST_STATE_CHANGE_FAILURE) { - finished_ = true; return std::string("Loopback : Could not open ") + Loopback::system_loopback_name; } diff --git a/Recorder.cpp b/Recorder.cpp index 277be01..666af3e 100644 --- a/Recorder.cpp +++ b/Recorder.cpp @@ -58,7 +58,6 @@ std::string PNGRecorder::init(GstCaps *caps) if (error != NULL) { std::string msg = std::string("PNG Capture Could not construct pipeline ") + description + "\n" + std::string(error->message); g_clear_error (&error); - finished_ = true; return msg; } @@ -102,14 +101,12 @@ std::string PNGRecorder::init(GstCaps *caps) } else { - finished_ = true; return std::string("PNG Capture : Failed to configure frame grabber."); } // start pipeline GstStateChangeReturn ret = gst_element_set_state (pipeline_, GST_STATE_PLAYING); if (ret == GST_STATE_CHANGE_FAILURE) { - finished_ = true; return std::string("PNG Capture : Failed to start frame grabber."); } @@ -344,7 +341,6 @@ std::string VideoRecorder::init(GstCaps *caps) if (error != NULL) { std::string msg = std::string("Video Recording : Could not construct pipeline ") + description + "\n" + std::string(error->message); g_clear_error (&error); - finished_ = true; return msg; } @@ -395,14 +391,12 @@ std::string VideoRecorder::init(GstCaps *caps) } else { - finished_ = true; return std::string("Video Recording : Failed to configure frame grabber."); } // start recording GstStateChangeReturn ret = gst_element_set_state (pipeline_, GST_STATE_PLAYING); if (ret == GST_STATE_CHANGE_FAILURE) { - finished_ = true; return std::string("Video Recording : Failed to start frame grabber."); } diff --git a/Streamer.cpp b/Streamer.cpp index 54ce675..08cb3a4 100644 --- a/Streamer.cpp +++ b/Streamer.cpp @@ -322,7 +322,6 @@ std::string VideoStreamer::init(GstCaps *caps) if ( gst_structure_has_field (capstruct, "height")) gst_structure_get_int (capstruct, "height", &h); if ( config_.width != w || config_.height != h) { - finished_ = true; return std::string("Video Streamer cannot start: given frames (") + std::to_string(w) + " x " + std::to_string(h) + ") are incompatible with stream (" + std::to_string(config_.width) + " x " + std::to_string(config_.height) + ")"; } @@ -341,7 +340,6 @@ std::string VideoStreamer::init(GstCaps *caps) if (error != NULL) { std::string msg = std::string("Video Streamer : Could not construct pipeline ") + description + "\n" + std::string(error->message); g_clear_error (&error); - finished_ = true; return msg; } @@ -397,14 +395,12 @@ std::string VideoStreamer::init(GstCaps *caps) } else { - finished_ = true; return std::string("Video Streamer : Failed to configure frame grabber."); } // start recording GstStateChangeReturn ret = gst_element_set_state (pipeline_, GST_STATE_PLAYING); if (ret == GST_STATE_CHANGE_FAILURE) { - finished_ = true; return std::string("Video Streamer : Failed to start frame grabber."); }