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

Integration of Shmdata in vimix

Browse Source 
Unified menu in output window for streaming (for SRT, Shmdata and peer to peer). Cleanup SRT broadcaster and bugfix on FrameGrabber default frame timing.
This commit is contained in:
Bruno Herbelin
2022-12-06 23:21:17 +01:00
parent 07e8f489c1
commit da06cf52ec
6 changed files with 124 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/UserInterfaceManager.h
View File

@@ -110,6 +110,7 @@ class FrameBufferImage;
class FrameGrabber;
class VideoRecorder;
class VideoBroadcast;
class ShmdataBroadcast;
class SourcePreview {
@@ -330,6 +331,7 @@ class OutputPreview : public WorkspaceWindow
// frame grabbers
VideoRecorder *video_recorder_;
VideoBroadcast *video_broadcaster_;
ShmdataBroadcast *shm_broadcaster_;
// delayed trigger for recording
std::vector< std::future<VideoRecorder *> > _video_recorders;
@@ -350,6 +352,9 @@ public:
void ToggleBroadcast();
inline bool isBroadcasting() const { return video_broadcaster_ != nullptr; }
void ToggleSharedMemory();
inline bool isSharingMemory() const { return shm_broadcaster_ != nullptr; }
void Render();
void setVisible(bool on);