diff --git a/components/streams/src/netstream.cpp b/components/streams/src/netstream.cpp index aa0dc042b61b0460f5e1f1a3c2ab0ff6c61c8044..105152c140813dcb0ae2432bc259281f4ce640d2 100644 --- a/components/streams/src/netstream.cpp +++ b/components/streams/src/netstream.cpp @@ -163,6 +163,7 @@ bool Net::begin() { last_frame_ = spkt.timestamp; if (size() > 0) { + // TODO: For all framesets auto sel = selected(0); // A change in channel selections, so send those requests now @@ -170,10 +171,8 @@ bool Net::begin() { auto changed = sel - last_selected_; last_selected_ = sel; - if (size() > 0) { - for (auto c : changed) { - _sendRequest(c, kAllFramesets, kAllFrames, 30, 0); - } + for (auto c : changed) { + _sendRequest(c, kAllFramesets, kAllFrames, 30, 0); } } } @@ -185,7 +184,6 @@ bool Net::begin() { const auto &sel = selected(0); for (auto c : sel) { - LOG(INFO) << "DO I SEND REQ"; _sendRequest(c, kAllFramesets, kAllFrames, 30, 0); } } diff --git a/components/streams/src/stream.cpp b/components/streams/src/stream.cpp index a4a273ce4e73b9a66c63794eeb1ce77144f36447..28538ba85869cb48f5d1fe51827a1b8016d90fbd 100644 --- a/components/streams/src/stream.cpp +++ b/components/streams/src/stream.cpp @@ -25,11 +25,11 @@ std::unordered_set<ftl::codecs::Channel> operator-(const std::unordered_set<ftl: } bool operator!=(const std::unordered_set<ftl::codecs::Channel> &a, const std::unordered_set<ftl::codecs::Channel> &b) { - if (a.size() != b.size()) return false; + if (a.size() != b.size()) return true; for (auto &i : a) { - if (b.find(i) == b.end()) return false; + if (b.find(i) == b.end()) return true; } - return true; + return false; } const std::unordered_set<ftl::codecs::Channel> &Stream::available(int fs) const {