eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-05 23:40:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

OSX compilation

Browse Source
This commit is contained in:
Bruno
2021-05-19 23:30:07 +02:00
parent fb59bf491f
commit a1b6ec066b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -19,6 +19,8 @@ rules.ninja
rsc/shaders/paint.fs rsc/shaders/paint.fs
.vscode/settings.json
osx/.DS_Store osx/.DS_Store
.DS_Store .DS_Store

6
UserInterfaceManager.cpp
View File

@@ -112,7 +112,10 @@ UserInterface::UserInterface()
// keep hold on frame grabbers // keep hold on frame grabbers
video_recorder_ = nullptr; video_recorder_ = nullptr;
#if defined(LINUX)
webcam_emulator_ = nullptr; webcam_emulator_ = nullptr;
#endif
} }
bool UserInterface::Init() bool UserInterface::Init()
@@ -1243,6 +1246,8 @@ void UserInterface::RenderPreview()
ImGui::PopStyleColor(1); ImGui::PopStyleColor(1);
ImGui::PopFont(); ImGui::PopFont();
} }
#if defined(LINUX)
// streaming indicator overlay // streaming indicator overlay
if (webcam_emulator_) if (webcam_emulator_)
{ {
@@ -1254,6 +1259,7 @@ void UserInterface::RenderPreview()
ImGui::PopStyleColor(1); ImGui::PopStyleColor(1);
ImGui::PopFont(); ImGui::PopFont();
} }
#endif
ImGui::End(); ImGui::End();
} }