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

Remove support for multiple channels.

Browse Source
This commit is contained in:
Peter Johnson
2016-09-18 14:14:35 -07:00
parent b78592d622
commit 9bb37d5df0
18 changed files with 36 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/HTTPSinkImpl.cpp
View File

@@ -321,11 +321,11 @@ void HTTPSinkImpl::SendStream(wpi::raw_socket_ostream& os) {
.count();
header.clear();
oss << "Content-Type: image/jpeg\r\n"
<< "Content-Length: " << frame.size(m_sourceChannel) << "\r\n"
<< "Content-Length: " << frame.size() << "\r\n"
<< "X-Timestamp: " << timestamp << "\r\n"
<< "\r\n";
os << oss.str();
os << frame.data(m_sourceChannel);
os << frame.data();
os << "\r\n--" BOUNDARY "\r\n";
// os.flush();
}
@@ -454,19 +454,6 @@ CS_Sink CreateHTTPSink(llvm::StringRef name, llvm::StringRef listenAddress,
return Sinks::GetInstance().Allocate(SinkData::kHTTP, sink);
}
void SetSinkSourceChannel(CS_Sink sink, int channel, CS_Status* status) {
auto data = Sinks::GetInstance().Get(sink);
if (!data) {
*status = CS_INVALID_HANDLE;
return;
}
if (data->type != SinkData::kHTTP) {
*status = CS_WRONG_HANDLE_SUBTYPE;
return;
}
static_cast<HTTPSinkImpl*>(data->sink.get())->SetSourceChannel(channel);
}
} // namespace cs
extern "C" {
@@ -476,8 +463,4 @@ CS_Sink CS_CreateHTTPSink(const char* name, const char* listenAddress, int port,
return cs::CreateHTTPSink(name, listenAddress, port, status);
}
void CS_SetSinkSourceChannel(CS_Sink sink, int channel, CS_Status* status) {
return cs::SetSinkSourceChannel(sink, channel, status);
}
} // extern "C"