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

10
src/lib/client/Client.cpp
View File

@@ -27,7 +27,7 @@
#include "synergy/ProtocolUtil.h"
#include "synergy/protocol_types.h"
#include "synergy/XSynergy.h"
#include "synergy/FileChunker.h"
#include "synergy/StreamChunker.h"
#include "synergy/IPlatformScreen.h"
#include "mt/Thread.h"
#include "net/TCPSocket.h"
@@ -422,12 +422,12 @@ Client::sendConnectionFailedEvent(const char* msg)
void
Client::sendFileChunk(const void* data)
{
FileChunker::FileChunk* fileChunk = reinterpret_cast<FileChunker::FileChunk*>(const_cast<void*>(data));
LOG((CLOG_DEBUG1 "sendFileChunk"));
StreamChunker::Chunk* chunk = reinterpret_cast<StreamChunker::Chunk*>(const_cast<void*>(data));
LOG((CLOG_DEBUG1 "send file chunk"));
assert(m_server != NULL);
// relay
m_server->fileChunkSending(fileChunk->m_chunk[0], &(fileChunk->m_chunk[1]), fileChunk->m_dataSize);
m_server->fileChunkSending(chunk->m_chunk[0], &(chunk->m_chunk[1]), chunk->m_size);
}
void
@@ -821,7 +821,7 @@ Client::sendFileThread(void* filename)
{
try {
char* name = reinterpret_cast<char*>(filename);
FileChunker::sendFileChunks(name, m_events, this);
StreamChunker::sendFileChunks(name, m_events, this);
}
catch (std::runtime_error error) {
LOG((CLOG_ERR "failed sending file chunks: %s", error.what()));