eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-13 19:29:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvement Tooltips Settings

Browse Source
This commit is contained in:
Bruno Herbelin
2022-09-10 11:24:02 +02:00
parent a836796fcc
commit 7dfa8776fd
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
UserInterfaceManager.cpp
View File

@@ -7624,9 +7624,15 @@ void Navigator::RenderMainPannelSettings()
ImGui::Text("Stream"); ImGui::Text("Stream");
char msg[256]; char msg[256];
ImFormatString(msg, IM_ARRAYSIZE(msg),"Port for broadcasting on Secure Reliable Transport (SRT) protocol\n" ImFormatString(msg, IM_ARRAYSIZE(msg), "Broadcast SRT\n\n"
"You can e.g. connect to:\n srt://%s:%d", "vimix is listening to SRT requests on Port %d. "
"Example network addresses to call:\n"
" srt//%s:%d (localhost)\n"
" srt//%s:%d (local IP)",
Settings::application.broadcast_port,
NetworkToolkit::host_ips()[0].c_str(), Settings::application.broadcast_port,
NetworkToolkit::host_ips()[1].c_str(), Settings::application.broadcast_port ); NetworkToolkit::host_ips()[1].c_str(), Settings::application.broadcast_port );
ImGuiToolkit::Indication(msg, ICON_FA_PODCAST); ImGuiToolkit::Indication(msg, ICON_FA_PODCAST);
ImGui::SameLine(0); ImGui::SameLine(0);
ImGui::SetCursorPosX(-1.f * IMGUI_RIGHT_ALIGN); ImGui::SetCursorPosX(-1.f * IMGUI_RIGHT_ALIGN);
@@ -7639,7 +7645,8 @@ void Navigator::RenderMainPannelSettings()
Settings::application.broadcast_port = CLAMP(Settings::application.broadcast_port, 1029, 49150); Settings::application.broadcast_port = CLAMP(Settings::application.broadcast_port, 1029, 49150);
} }
ImGuiToolkit::Indication("Sharing H264 stream requires less bandwidth but more resources for encoding.", ICON_FA_SHARE_ALT_SQUARE); ImGuiToolkit::Indication("Share on local network\n\n"
"vimix can stream JPEG (default) or H264 (requires less bandwidth but more resources for encoding)", ICON_FA_SHARE_ALT_SQUARE);
ImGui::SameLine(0); ImGui::SameLine(0);
ImGui::SetCursorPosX(-1.f * IMGUI_RIGHT_ALIGN); ImGui::SetCursorPosX(-1.f * IMGUI_RIGHT_ALIGN);
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
@@ -7651,7 +7658,14 @@ void Navigator::RenderMainPannelSettings()
ImGuiToolkit::Spacing(); ImGuiToolkit::Spacing();
ImGui::Text("OSC"); ImGui::Text("OSC");
sprintf(msg, "You can send OSC messages via UDP to the local IP address %s on Port %d", ImFormatString(msg, IM_ARRAYSIZE(msg), "Open Sound Control\n\n"
"vimix accepts OSC messages sent by UDP on Port %d and replies on Port %d."
"Example network addresses:\n"
" udp//%s:%d (localhost)\n"
" udp//%s:%d (local IP)",
Settings::application.control.osc_port_receive,
Settings::application.control.osc_port_send,
NetworkToolkit::host_ips()[0].c_str(), Settings::application.control.osc_port_receive,
NetworkToolkit::host_ips()[1].c_str(), Settings::application.control.osc_port_receive ); NetworkToolkit::host_ips()[1].c_str(), Settings::application.control.osc_port_receive );
ImGuiToolkit::Indication(msg, ICON_FA_NETWORK_WIRED); ImGuiToolkit::Indication(msg, ICON_FA_NETWORK_WIRED);
ImGui::SameLine(0); ImGui::SameLine(0);
@@ -7892,7 +7906,6 @@ void SourcePreview::setSource(Source *s, const string &label)
std::thread (deletesource, source_).detach(); std::thread (deletesource, source_).detach();
} }
source_ = s; source_ = s;
label_ = label; label_ = label;
reset_ = true; reset_ = true;

2
VideoBroadcast.cpp
View File

@@ -188,7 +188,7 @@ std::string VideoBroadcast::info() const
if (!initialized_) if (!initialized_)
ret << "Starting SRT"; ret << "Starting SRT";
else if (active_) else if (active_)
ret << "SRT Broadcast on Port " << port_ << " (listener mode)"; ret << "Broadcasting on SRT (listener mode)";
else else
ret << "SRT Terminated"; ret << "SRT Terminated";