From c898bfc555d31bc7fc7d148e722446b159592660 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Tue, 21 Jul 2020 18:42:35 +0300
Subject: [PATCH] Notes on needed fixes
---
components/streams/src/feed.cpp | 2 ++
components/streams/src/netstream.cpp | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/components/streams/src/feed.cpp b/components/streams/src/feed.cpp
index 77e183c86..7e43eab80 100644
--- a/components/streams/src/feed.cpp
+++ b/components/streams/src/feed.cpp
@@ -396,6 +396,8 @@ ftl::operators::Graph* Feed::_addPipeline(uint32_t fsid) {
}
void Feed::_createPipeline(uint32_t fsid) {
+ // FIXME: Must not recreate if already exists
+
LOG(INFO) << "Creating pipeline";
auto *p = _addPipeline(fsid);
diff --git a/components/streams/src/netstream.cpp b/components/streams/src/netstream.cpp
index 44ae5c804..fba498e1b 100644
--- a/components/streams/src/netstream.cpp
+++ b/components/streams/src/netstream.cpp
@@ -137,7 +137,6 @@ bool Net::post(const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet
bool Net::begin() {
if (active_) return true;
if (!get<string>("uri")) return false;
- active_ = true;
uri_ = *get<string>("uri");
@@ -264,6 +263,8 @@ bool Net::begin() {
peer_ = *p;
tally_ = 30*kTallyScale;
for (size_t i=0; i<reqtally_.size(); ++i) reqtally_[i] = 0;
+
+ active_ = true;
// Initially send a colour request just to create the connection
_sendRequest(Channel::Colour, kAllFramesets, kAllFrames, 30, 0);
--
GitLab