Fix for duplicate stream pointers

components/streams/include/ftl/streams/feed.hpp

@@ -96,7 +96,7 @@ private:
 	std::map<uint32_t, ftl::data::FrameSetPtr> latest_;
 	std::unordered_map<std::string, uint32_t> groups_;
 
-	std::unordered_map<uint32_t, ftl::stream::Stream*> streams_;
+	std::unordered_map<uint32_t, std::list<ftl::stream::Stream*>> streams_;
 	std::unordered_map<uint32_t, ftl::rgbd::Source*> devices_;
 	std::unordered_map<uint32_t, ftl::render::Source*> renderers_;
 	std::unordered_map<uint32_t, ftl::operators::Graph*> pre_pipelines_;
@@ -109,6 +109,7 @@ private:
 	std::vector<Filter*> filters_;
 
 	uint32_t fs_counter_ = 0;
+	uint32_t file_counter_ = 0;
 
 	uint32_t allocateFrameSetId(const std::string &group);
 

components/streams/src/feed.cpp

@@ -233,8 +233,10 @@ Feed::~Feed() {
 
 	interceptor_.reset();
 	stream_.reset();
-	for (auto &s : streams_) {
-		delete s.second;
+	for (auto &ls : streams_) {
+		for (auto *s : ls.second) {
+			delete s;
+		}
 	}
 }
 
@@ -375,7 +377,7 @@ ftl::operators::Graph* Feed::_addPipeline(uint32_t fsid) {
 			(renderers_[fsid], std::string("pipeline"));
 	} else if (streams_.count(fsid)) {
 		pre_pipelines_[fsid] = ftl::config::create<ftl::operators::Graph>
-			(streams_[fsid], std::string("pipeline"));
+			(streams_[fsid].front(), std::string("pipeline"));
 	}
 
 	//pre_pipelines_[fsid] = ftl::config::create<ftl::operators::Graph>
@@ -543,7 +545,7 @@ std::string Feed::getName(const std::string &puri) {
 
 void Feed::add(uint32_t fsid, const std::string &uri, ftl::stream::Stream* stream) {
 	fsid_lookup_[uri] = fsid;
-	streams_[fsid] = stream;
+	streams_[fsid].push_back(stream);
 
 	_createPipeline(fsid);
 
@@ -574,7 +576,7 @@ uint32_t Feed::add(const std::string &path) {
 
 		const int fsid = allocateFrameSetId(group);
 		auto* fstream = ftl::create<ftl::stream::File>
-			(this, std::string("ftlfile-") + std::to_string(fsid));
+			(this, std::string("ftlfile-") + std::to_string(file_counter_++));
 
 		if (scheme == ftl::URI::SCHEME_OTHER) {
 			fstream->set("filename", path);
@@ -604,7 +606,7 @@ uint32_t Feed::add(const std::string &path) {
 		return fsid;
 	}
 	else if (scheme == ftl::URI::SCHEME_DEVICE) {
-		int fsid = allocateFrameSetId(group);
+		int fsid = allocateFrameSetId("");  // TODO: Support groups with devices?
 		fsid_lookup_[uri.getBaseURI()] = fsid; // Manually add mapping
 
 		std::string srcname = std::string("source") + std::to_string(fsid);
@@ -728,7 +730,7 @@ std::string Feed::getURI(uint32_t fsid) {
 }
 
 std::string Feed::getSourceURI(ftl::data::FrameID id) {
-	if (streams_.count(id.frameset())) {
+	/*if (streams_.count(id.frameset())) {
 		auto i = streams_.find(id.frameset());
 		return i->second->getID();
 	} else if (devices_.count(id.frameset())) {
@@ -737,7 +739,7 @@ std::string Feed::getSourceURI(ftl::data::FrameID id) {
 	} else if (renderers_.count(id.frameset())) {
 		auto i = renderers_.find(id.frameset());
 		return i->second->getID();
-	}
+	}*/
 
 	return "";
 }