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

Bugfix; verify frame grabbers before use

Browse Source
This commit is contained in:
Bruno
2021-05-13 23:15:47 +02:00
parent e892dc1eb5
commit 2a7857c499
3 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FrameGrabber.cpp
View File

@@ -41,12 +41,18 @@ void FrameGrabbing::add(FrameGrabber *rec)
grabbers_.push_back(rec);
}
void FrameGrabbing::verify(FrameGrabber **rec)
{
if ( std::find(grabbers_.begin(), grabbers_.end(), *rec) == grabbers_.end() )
*rec = nullptr;
}
FrameGrabber *FrameGrabbing::front()
{
if (grabbers_.empty())
return nullptr;
else
return grabbers_.front();
return grabbers_.front();
}
struct fgId: public std::unary_function<FrameGrabber*, bool>

1
FrameGrabber.h
View File

@@ -100,6 +100,7 @@ public:
inline uint height() const { return height_; }
void add(FrameGrabber *rec);
void verify(FrameGrabber **rec);
FrameGrabber *front();
FrameGrabber *get(uint64_t id);
void stopAll();

50
UserInterfaceManager.cpp
View File

@@ -717,6 +717,27 @@ void UserInterface::NewFrame()
void UserInterface::Render()
{
// management of video_recorders
if ( !_video_recorders.empty() ) {
// check that file dialog thread finished
if (_video_recorders.back().wait_for(timeout) == std::future_status::ready ) {
video_recorder_ = _video_recorders.back().get();
FrameGrabbing::manager().add(video_recorder_);
_video_recorders.pop_back();
}
}
// verify the video recorder is valid
FrameGrabbing::manager().verify(&video_recorder_);
if (video_recorder_ && video_recorder_->duration() > Settings::application.record.timeout ){
video_recorder_->stop();
video_recorder_ = nullptr;
}
#if defined(LINUX)
// verify the frame grabber for webcam emulator is valid
FrameGrabbing::manager().verify(&webcam_emulator_);
#endif
// warning modal dialog
Log::Render(&Settings::application.widget.logs);
@@ -757,23 +778,6 @@ void UserInterface::Render()
&Settings::application.widget.stats_corner,
&Settings::application.widget.stats_mode);
// management of video_recorders
if ( !_video_recorders.empty() ) {
// check that file dialog thread finished
if (_video_recorders.back().wait_for(timeout) == std::future_status::ready ) {
video_recorder_ = _video_recorders.back().get();
FrameGrabbing::manager().add(video_recorder_);
_video_recorders.pop_back();
}
}
if (video_recorder_ && video_recorder_->duration() > Settings::application.record.timeout ){
video_recorder_->stop();
video_recorder_ = nullptr;
}
// all IMGUI Rendering
ImGui::Render();
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
@@ -1239,7 +1243,17 @@ void UserInterface::RenderPreview()
ImGui::PopStyleColor(1);
ImGui::PopFont();
}
// streaming indicator overlay
if (webcam_emulator_)
{
float r = ImGui::GetTextLineHeightWithSpacing();
ImGui::SetCursorScreenPos(ImVec2(draw_pos.x + width - 2.f * r, draw_pos.y + imagesize.y - 2.f * r));
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_LARGE);
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.8f, 0.8f, 0.8f, 0.8f));
ImGui::Text(ICON_FA_CAMERA);
ImGui::PopStyleColor(1);
ImGui::PopFont();
}
ImGui::End();
}