merge conflict from 3.0.1 to restream stop from recieveR

This commit is contained in:
Dhanya Maliakal
2017-11-30 19:05:47 +01:00
10 changed files with 102 additions and 3 deletions

View File

@ -555,6 +555,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
void setStreamingSourceIP(const char* c);
/*
* Restream stop dummy packet from receiver
* @return OK or FAIL
*/
int restreamStop();
//***callback functions***
/**
* Call back for start acquisition