Only generate passthrough URLs for RoboRIO (#1624)

Otherwise accidentally, a race could occur between coprocessors and rio.

Java was done in both old and new locations as it's a race.
This commit is contained in:
Thad House
2019-04-27 20:35:23 -07:00
committed by Peter Johnson
parent d3affb16bc
commit bdc822fad8
5 changed files with 47 additions and 22 deletions

View File

@@ -132,7 +132,9 @@ std::vector<std::string> CameraServer::Impl::GetSourceStreamValues(
auto values = cs::GetHttpCameraUrls(source, &status);
for (auto& value : values) value = "mjpg:" + value;
#ifdef __FRC_ROBORIO__
// Look to see if we have a passthrough server for this source
// Only do this on the roboRIO
for (const auto& i : m_sinks) {
CS_Sink sink = i.second.GetHandle();
CS_Source sinkSource = cs::GetSinkSource(sink, &status);
@@ -144,6 +146,7 @@ std::vector<std::string> CameraServer::Impl::GetSourceStreamValues(
break;
}
}
#endif
// Set table value
return values;