Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

CameraServer: Always update addresses when updating stream values. (#496)

Browse Source 
This should prevent (as currently happens) occassionally getting just the
mDNS address in the stream value.
This commit is contained in:
Peter Johnson
2017-05-06 21:31:45 -07:00
committed by GitHub
parent 2ee8ba9361
commit 04486c6472
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/athena/src/CameraServer.cpp
View File

@@ -412,12 +412,10 @@ CameraServer::CameraServer()
}
case cs::VideoEvent::kSinkSourceChanged:
case cs::VideoEvent::kSinkCreated:
case cs::VideoEvent::kSinkDestroyed: {
UpdateStreamValues();
break;
}
case cs::VideoEvent::kSinkDestroyed:
case cs::VideoEvent::kNetworkInterfacesChanged: {
m_addresses = cs::GetNetworkInterfaces();
UpdateStreamValues();
break;
}
default:

6
wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
View File

@@ -436,12 +436,10 @@ public class CameraServer {
}
case kSinkSourceChanged:
case kSinkCreated:
case kSinkDestroyed: {
updateStreamValues();
break;
}
case kSinkDestroyed:
case kNetworkInterfacesChanged: {
m_addresses = CameraServerJNI.getNetworkInterfaces();
updateStreamValues();
break;
}
default: