Skip to content

Commit 1d87946

Browse files
committed
ENH: Update Clarius cast device to 12.2.2
1 parent 077a261 commit 1d87946

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/PlusDataCollection/Clarius/vtkPlusClarius.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ PlusStatus vtkPlusClarius::vtkInternal::ReceiveRawData(int dataSize)
736736

737737
CusReturnFn returnFunction = (CusReturnFn)(&vtkInternal::RawDataWriteFn);
738738
this->AllocateRawData(dataSize);
739-
cusCastReadRawData(&this->RawDataPointer, returnFunction);
739+
castReadRawData(&this->RawDataPointer, returnFunction);
740740
return PLUS_SUCCESS;
741741
}
742742

@@ -857,12 +857,12 @@ vtkPlusClarius::~vtkPlusClarius()
857857

858858
if (this->Connected)
859859
{
860-
cusCastDisconnect(BLOCKINGCALL);
860+
castDisconnect(BLOCKINGCALL);
861861
}
862862

863863
if (this->Internal->Initialized)
864864
{
865-
int destroyed = cusCastDestroy();
865+
int destroyed = castDestroy();
866866
if (destroyed != 0)
867867
{
868868
LOG_ERROR("Error destoying the listener");
@@ -1187,7 +1187,7 @@ PlusStatus vtkPlusClarius::InternalConnect()
11871187
initParams.errorFn = errorCallBackFnPtr;
11881188
initParams.width = this->FrameWidth;
11891189
initParams.height = this->FrameHeight;
1190-
if (cusCastInit(&initParams) < 0)
1190+
if (castInit(&initParams) < 0)
11911191
{
11921192
return PLUS_FAIL;
11931193
}
@@ -1214,7 +1214,7 @@ PlusStatus vtkPlusClarius::InternalConnect()
12141214
try
12151215
{
12161216
CusConnectFn returnFunction = (CusConnectFn)(&vtkInternal::ConnectReturnFn);
1217-
cusCastConnect(ip, this->TcpPort, "research", returnFunction);
1217+
castConnect(ip, this->TcpPort, "research", returnFunction);
12181218

12191219
// Wait for the udp port to be determined.
12201220
int maxConnectionAttempts = 20;
@@ -1249,7 +1249,7 @@ PlusStatus vtkPlusClarius::InternalConnect()
12491249

12501250
if (this->Internal->UdpPort != -1)
12511251
{
1252-
if (cusCastSetOutputSize(this->FrameWidth, this->FrameHeight) < 0)
1252+
if (castSetOutputSize(this->FrameWidth, this->FrameHeight) < 0)
12531253
{
12541254
LOG_DEBUG("Clarius Output size can not be set, falling back to default 640*480");
12551255
this->FrameWidth = DEFAULT_FRAME_WIDTH;
@@ -1287,7 +1287,7 @@ PlusStatus vtkPlusClarius::InternalDisconnect()
12871287
vtkPlusClarius* device = vtkPlusClarius::GetInstance();
12881288
if (device->GetConnected())
12891289
{
1290-
if (cusCastDisconnect(nullptr) < 0)
1290+
if (castDisconnect(nullptr) < 0)
12911291
{
12921292
LOG_ERROR("could not disconnect from scanner");
12931293
return PLUS_FAIL;
@@ -1347,6 +1347,6 @@ PlusStatus vtkPlusClarius::RequestRawData(long long int startTimestamp, long lon
13471347
this->Internal->IsReceivingRawData = true;
13481348

13491349
CusRawRequestFn returnFunction = (CusRawRequestFn)(&vtkInternal::RawDataRequestFn);
1350-
cusCastRequestRawData(startTimestamp, endTimestamp, 0, returnFunction);
1350+
castRequestRawData(startTimestamp, endTimestamp, 0, returnFunction);
13511351
return PLUS_SUCCESS;
13521352
}

0 commit comments

Comments
 (0)