diff --git a/examples/enum_usb/enum_usb.cpp b/examples/enum_usb/enum_usb.cpp index bd00a28f81..52d85e4dc8 100644 --- a/examples/enum_usb/enum_usb.cpp +++ b/examples/enum_usb/enum_usb.cpp @@ -15,7 +15,7 @@ int main() { llvm::outs() << "Properties:\n"; for (const auto& prop : camera.EnumerateProperties()) { llvm::outs() << " " << prop.GetName() << ": "; - switch (prop.type()) { + switch (prop.GetType()) { case cs::VideoProperty::kBoolean: llvm::outs() << "value=" << prop.Get() << " default=" << prop.GetDefault(); diff --git a/include/cscore_oo.h b/include/cscore_oo.h index 9109c52b32..c14b44a95b 100644 --- a/include/cscore_oo.h +++ b/include/cscore_oo.h @@ -41,7 +41,7 @@ class VideoProperty { std::string GetName() const; - Type type() const { return m_type; } + Type GetType() const { return m_type; } explicit operator bool() const { return m_type != kNone; } diff --git a/java/src/edu/wpi/cscore/VideoProperty.java b/java/src/edu/wpi/cscore/VideoProperty.java index 1b9ede3760..40533fa9b7 100644 --- a/java/src/edu/wpi/cscore/VideoProperty.java +++ b/java/src/edu/wpi/cscore/VideoProperty.java @@ -26,7 +26,7 @@ public class VideoProperty { return CameraServerJNI.getPropertyName(m_handle); } - public Type type() { + public Type getType() { return m_type; }