serialize stream to json

This commit is contained in:
badaix 2016-01-25 23:09:32 +01:00
parent 7bec5b8744
commit 95e4a98fef
11 changed files with 172 additions and 113 deletions

View file

@ -164,7 +164,7 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
{"version", VERSION}
}},
{"clients", jClient},
{"streams", "TODO"}
{"streams", streamManager_->toJson()}
};
}
else if (request.method == "Server.DeleteClient")
@ -342,7 +342,7 @@ void StreamServer::start()
streamManager_.reset(new StreamManager(this, settings_.sampleFormat, settings_.codec, settings_.streamReadMs));
for (auto& streamUri: settings_.pcmStreams)
streamManager_->addStream(streamUri);
logE << "Stream: " << streamManager_->addStream(streamUri)->getUri().toJson() << "\n";
streamManager_->start();