Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

cscore: Use Twine instead of StringRef in API (#1244)

Browse Source
This commit is contained in:
Peter Johnson
2018-07-29 12:53:41 -07:00
committed by GitHub
parent 97a8f8f47b
commit 195e101816
35 changed files with 365 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cscore/src/main/native/cpp/SourceImpl.cpp
View File

@@ -21,7 +21,7 @@ using namespace cs;
static constexpr size_t kMaxImagesAvail = 32;
SourceImpl::SourceImpl(wpi::StringRef name) : m_name{name} {
SourceImpl::SourceImpl(const wpi::Twine& name) : m_name{name.str()} {
m_frame = Frame{*this, wpi::StringRef{}, 0};
}
@@ -38,9 +38,9 @@ SourceImpl::~SourceImpl() {
// Everything else can clean up itself.
}
void SourceImpl::SetDescription(wpi::StringRef description) {
void SourceImpl::SetDescription(const wpi::Twine& description) {
std::lock_guard<wpi::mutex> lock(m_mutex);
m_description = description;
m_description = description.str();
}
wpi::StringRef SourceImpl::GetDescription(
@@ -229,7 +229,7 @@ void SourceImpl::PutFrame(std::unique_ptr<Image> image, Frame::Time time) {
m_frameCv.notify_all();
}
void SourceImpl::PutError(wpi::StringRef msg, Frame::Time time) {
void SourceImpl::PutError(const wpi::Twine& msg, Frame::Time time) {
// Update frame
{
std::lock_guard<wpi::mutex> lock{m_frameMutex};
@@ -249,11 +249,11 @@ void SourceImpl::NotifyPropertyCreated(int propIndex, PropertyImpl& prop) {
if (prop.propKind == CS_PROP_ENUM)
notifier.NotifySourceProperty(*this, CS_SOURCE_PROPERTY_CHOICES_UPDATED,
prop.name, propIndex, prop.propKind,
prop.value, wpi::StringRef{});
prop.value, wpi::Twine{});
}
void SourceImpl::UpdatePropertyValue(int property, bool setString, int value,
wpi::StringRef valueStr) {
const wpi::Twine& valueStr) {
auto prop = GetProperty(property);
if (!prop) return;