Merge branch into develop
This commit is contained in:
commit
d505b3b647
|
@ -265,6 +265,12 @@ class MYNTEYE_API Device {
|
|||
* Get the latest data of stream.
|
||||
*/
|
||||
device::StreamData GetStreamData(const Stream &stream);
|
||||
|
||||
/**
|
||||
* @deprecated Replaced by GetStreamData(const Stream &stream)
|
||||
*/
|
||||
device::StreamData GetLatestStreamData(const Stream &stream);
|
||||
|
||||
/**
|
||||
* Get the datas of stream.
|
||||
* @note default cache 4 datas at most.
|
||||
|
|
|
@ -454,6 +454,10 @@ device::StreamData Device::GetStreamData(const Stream &stream) {
|
|||
return streams_->GetLatestStreamData(stream);
|
||||
}
|
||||
|
||||
device::StreamData Device::GetLatestStreamData(const Stream &stream) {
|
||||
GetStreamData(stream);
|
||||
}
|
||||
|
||||
std::vector<device::StreamData> Device::GetStreamDatas(const Stream &stream) {
|
||||
CHECK(video_streaming_);
|
||||
CHECK_NOTNULL(streams_);
|
||||
|
|
Loading…
Reference in New Issue
Block a user