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

UI info procrastination

Browse Source
This commit is contained in:
Bruno Herbelin
2022-01-20 23:27:43 +01:00
parent f4eb8b246b
commit 4f915d6708
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CloneSource.cpp
View File

@@ -239,5 +239,5 @@ glm::ivec2 CloneSource::icon() const
std::string CloneSource::info() const std::string CloneSource::info() const
{ {
return std::string("clone of '") + origin_->name() + "'"; return std::string("clone of ") + cloning_provenance_label[provenance_] + " from '" + origin_->name() + "'";
} }

2
RenderSource.cpp
View File

@@ -161,5 +161,5 @@ glm::ivec2 RenderSource::icon() const
std::string RenderSource::info() const std::string RenderSource::info() const
{ {
return std::string("Render loopback"); return std::string("Render ") + RenderSource::rendering_provenance_label[provenance_];
} }

6
UserInterfaceManager.cpp
View File

@@ -3762,14 +3762,14 @@ void OutputPreview::Render()
} }
#endif #endif
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(IMGUI_COLOR_STREAM, 0.9f)); ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(IMGUI_COLOR_STREAM, 0.9f));
if ( ImGui::MenuItem( ICON_FA_SHARE_ALT " Accept connections ", NULL, &Settings::application.accept_connections) ) { if ( ImGui::MenuItem( ICON_FA_SHARE_ALT_SQUARE " Accept connections ", NULL, &Settings::application.accept_connections) ) {
Streaming::manager().enable(Settings::application.accept_connections); Streaming::manager().enable(Settings::application.accept_connections);
} }
ImGui::PopStyleColor(1); ImGui::PopStyleColor(1);
if (Settings::application.accept_connections) if (Settings::application.accept_connections)
{ {
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
ImGui::MenuItem( "Lower bandwidth (H264)", NULL, &Settings::application.stream_low_bandwidth); ImGui::MenuItem( ICON_FA_LESS_THAN_EQUAL " Low bandwidth (H264)", NULL, &Settings::application.stream_low_bandwidth);
std::vector<std::string> ls = Streaming::manager().listStreams(); std::vector<std::string> ls = Streaming::manager().listStreams();
if (ls.size()>0) { if (ls.size()>0) {
@@ -3809,7 +3809,7 @@ void OutputPreview::Render()
ImGui::SetCursorScreenPos(draw_pos); ImGui::SetCursorScreenPos(draw_pos);
ImGui::Text(" %d x %d px, %.d fps", output->width(), output->height(), int(Mixer::manager().fps()) ); ImGui::Text(" %d x %d px, %.d fps", output->width(), output->height(), int(Mixer::manager().fps()) );
if (Settings::application.accept_connections){ if (Settings::application.accept_connections){
ImGui::Text( " " ICON_FA_SHARE_ALT " %s", Connection::manager().info().name.c_str() ); ImGui::Text( " " ICON_FA_SHARE_ALT_SQUARE " %s", Connection::manager().info().name.c_str() );
} }
} }