From 5032044c80f4d48ceed5fc153eb310497c8b2e50 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Thu, 30 Jan 2020 15:39:08 +0200
Subject: [PATCH] Add GUI data stream option
---
applications/gui/src/src_window.cpp | 4 +++-
components/streams/src/receiver.cpp | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/applications/gui/src/src_window.cpp b/applications/gui/src/src_window.cpp
index fbb38e1d9..21165e6e1 100644
--- a/applications/gui/src/src_window.cpp
+++ b/applications/gui/src/src_window.cpp
@@ -246,7 +246,9 @@ void SourceWindow::_updateCameras(const vector<string> &netcams) {
for (int i=0; i<strms.size(); ++i) {
auto *stream = strms[i];
- stream_->add(stream);
+ bool isspecial = (stream->get<std::string>("uri") == screen_->root()->value("data_stream",std::string("")));
+ if (isspecial) LOG(INFO) << "Adding special stream";
+ stream_->add(stream, (isspecial) ? 1 : 0);
LOG(INFO) << "Add Stream: " << stream->value("uri", std::string("NONE"));
diff --git a/components/streams/src/receiver.cpp b/components/streams/src/receiver.cpp
index 161188e9c..9a2adf7f4 100644
--- a/components/streams/src/receiver.cpp
+++ b/components/streams/src/receiver.cpp
@@ -310,7 +310,7 @@ void Receiver::setStream(ftl::stream::Stream *s) {
//LOG(INFO) << "PACKET: " << spkt.timestamp << ", " << (int)spkt.channel << ", " << (int)pkt.codec << ", " << (int)pkt.definition;
// TODO: Allow for multiple framesets
- if (spkt.frameSetID() > 0) LOG(INFO) << "Frameset " << spkt.frameSetID() << " received";
+ if (spkt.frameSetID() > 0) LOG(INFO) << "Frameset " << spkt.frameSetID() << " received: " << (int)spkt.channel;
if (spkt.frameSetID() > 0) return;
// Too many frames, so ignore.
--
GitLab