mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-05 15:30:00 +01:00
OSX compilation
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -19,6 +19,8 @@ rules.ninja
|
||||
|
||||
rsc/shaders/paint.fs
|
||||
|
||||
.vscode/settings.json
|
||||
|
||||
osx/.DS_Store
|
||||
|
||||
.DS_Store
|
||||
|
||||
@@ -112,7 +112,10 @@ UserInterface::UserInterface()
|
||||
|
||||
// keep hold on frame grabbers
|
||||
video_recorder_ = nullptr;
|
||||
|
||||
#if defined(LINUX)
|
||||
webcam_emulator_ = nullptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool UserInterface::Init()
|
||||
@@ -1243,6 +1246,8 @@ void UserInterface::RenderPreview()
|
||||
ImGui::PopStyleColor(1);
|
||||
ImGui::PopFont();
|
||||
}
|
||||
|
||||
#if defined(LINUX)
|
||||
// streaming indicator overlay
|
||||
if (webcam_emulator_)
|
||||
{
|
||||
@@ -1254,6 +1259,7 @@ void UserInterface::RenderPreview()
|
||||
ImGui::PopStyleColor(1);
|
||||
ImGui::PopFont();
|
||||
}
|
||||
#endif
|
||||
|
||||
ImGui::End();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user