diff --git a/src/single_window/control_bar.cpp b/src/single_window/control_bar.cpp index 5f7a501..6ed5354 100644 --- a/src/single_window/control_bar.cpp +++ b/src/single_window/control_bar.cpp @@ -88,8 +88,7 @@ int Render::ControlBar() { RemoteAction remote_action; remote_action.type = ControlType::audio_capture; remote_action.a = audio_capture_button_pressed_; - SendData(peer_, DATA_TYPE::DATA, (const char*)&remote_action, - sizeof(remote_action)); + SendData(peer_, (const char*)&remote_action, sizeof(remote_action)); } } if (!audio_capture_button_pressed_) { diff --git a/src/single_window/render.cpp b/src/single_window/render.cpp index e2667a7..5000a1b 100644 --- a/src/single_window/render.cpp +++ b/src/single_window/render.cpp @@ -199,9 +199,6 @@ int Render::StartScreenCapturer() { .count(); auto duration = now_time - last_frame_time_; if (duration >= 0 && connection_established_) { - // SendData(peer_, DATA_TYPE::VIDEO, (const char *)data, - // NV12_BUFFER_SIZE); - XVideoFrame frame; frame.data = (const char*)data; frame.size = size; @@ -242,7 +239,7 @@ int Render::StartSpeakerCapturer() { int speaker_capturer_init_ret = speaker_capturer_->Init( [this](unsigned char* data, size_t size) -> void { if (connection_established_) { - SendData(peer_, DATA_TYPE::AUDIO, (const char*)data, size); + SendAudioFrame(peer_, (const char*)data, size); } }); diff --git a/src/single_window/render_callback_func.cpp b/src/single_window/render_callback_func.cpp index dd3dd2f..dc20c2b 100644 --- a/src/single_window/render_callback_func.cpp +++ b/src/single_window/render_callback_func.cpp @@ -62,8 +62,7 @@ int Render::ProcessMouseEvent(SDL_Event &event) { if (control_bar_hovered_) { remote_action.m.flag = MouseFlag::move; } - SendData(peer_, DATA_TYPE::DATA, (const char *)&remote_action, - sizeof(remote_action)); + SendData(peer_, (const char *)&remote_action, sizeof(remote_action)); } else if (SDL_MOUSEBUTTONUP == event.type) { remote_action.type = ControlType::mouse; if (SDL_BUTTON_LEFT == event.button.button) { @@ -74,13 +73,11 @@ int Render::ProcessMouseEvent(SDL_Event &event) { if (control_bar_hovered_) { remote_action.m.flag = MouseFlag::move; } - SendData(peer_, DATA_TYPE::DATA, (const char *)&remote_action, - sizeof(remote_action)); + SendData(peer_, (const char *)&remote_action, sizeof(remote_action)); } else if (SDL_MOUSEMOTION == event.type) { remote_action.type = ControlType::mouse; remote_action.m.flag = MouseFlag::move; - SendData(peer_, DATA_TYPE::DATA, (const char *)&remote_action, - sizeof(remote_action)); + SendData(peer_, (const char *)&remote_action, sizeof(remote_action)); } return 0; @@ -96,8 +93,7 @@ int Render::SendKeyEvent(int key_code, bool is_down) { } remote_action.k.key_value = key_code; - SendData(peer_, DATA_TYPE::DATA, (const char *)&remote_action, - sizeof(remote_action)); + SendData(peer_, (const char *)&remote_action, sizeof(remote_action)); return 0; } @@ -118,7 +114,7 @@ void Render::SdlCaptureAudioIn(void *userdata, Uint8 *stream, int len) { if (1) { if ("Connected" == render->connection_status_str_) { - SendData(render->peer_, DATA_TYPE::AUDIO, (const char *)stream, len); + SendAudioFrame(render->peer_, (const char *)stream, len); } } else { memcpy(render->audio_buffer_, stream, len); @@ -131,7 +127,7 @@ void Render::SdlCaptureAudioIn(void *userdata, Uint8 *stream, int len) { void Render::SdlCaptureAudioOut(void *userdata, Uint8 *stream, int len) { // Render *render = (Render *)userdata; // if ("Connected" == render->connection_status_str_) { - // SendData(render->peer_, DATA_TYPE::AUDIO, (const char *)stream, len); + // SendAudioFrame(render->peer_, (const char *)stream, len); // } // if (!render->audio_buffer_fresh_) { @@ -286,8 +282,8 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char *user_id, remote_action.type = ControlType::host_infomation; memcpy(&remote_action.i.host_name, host_name.data(), host_name.size()); remote_action.i.host_name_size = host_name.size(); - int ret = SendData(render->peer_, DATA_TYPE::DATA, - (const char *)&remote_action, sizeof(remote_action)); + int ret = SendData(render->peer_, (const char *)&remote_action, + sizeof(remote_action)); if (0 == ret) { render->hostname_sent_ = true; } diff --git a/thirdparty/projectx b/thirdparty/projectx index 38fabc9..09c0ab9 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 38fabc97412ca77fabc6ec1379e757f7c89dcd8e +Subproject commit 09c0ab923504779214c511378b8495c47ca7b05a