backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-10 21:56:13 +08:00
Code Issues Projects Releases Wiki Activity

Renamed FileChunker to StreamChunker #4601

Browse Source
This commit is contained in:
Jerry (Xinyu Hou)
2015-05-18 10:17:22 -07:00
parent 4c36c08099
commit 30f96b9fbb
6 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/server/Server.cpp
View File

@@ -2033,13 +2033,13 @@ Server::onMouseWheel(SInt32 xDelta, SInt32 yDelta)
void
Server::onFileChunkSending(const void* data)
{
FileChunker::FileChunk* fileChunk = reinterpret_cast<FileChunker::FileChunk*>(const_cast<void*>(data));
StreamChunker::Chunk* chunk = reinterpret_cast<StreamChunker::Chunk*>(const_cast<void*>(data));
LOG((CLOG_DEBUG1 "onFileChunkSending"));
LOG((CLOG_DEBUG1 "sending file chunk"));
assert(m_active != NULL);
// relay
m_active->fileChunkSending(fileChunk->m_chunk[0], &(fileChunk->m_chunk[1]), fileChunk->m_dataSize);
m_active->fileChunkSending(chunk->m_chunk[0], &(chunk->m_chunk[1]), chunk->m_size);
}
void
@@ -2376,7 +2376,7 @@ Server::sendFileThread(void* data)
try {
char* filename = reinterpret_cast<char*>(data);
LOG((CLOG_DEBUG "sending file to client, filename=%s", filename));
FileChunker::sendFileChunks(filename, m_events, this);
StreamChunker::sendFileChunks(filename, m_events, this);
}
catch (std::runtime_error error) {
LOG((CLOG_ERR "failed sending file chunks, error: %s", error.what()));