opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-29 19:22:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6577 from chippydip/multiple-video-mixes

Browse Source 
libobs: Add support for multiple video mixes
This commit is contained in:
Jim
2022-08-09 21:37:48 -07:00
committed by GitHub
parent fb146fa370 df446c3f6e
commit 9e15114750
19 changed files with 1157 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main.hpp
+4 -5
View File
@@ -178,7 +178,7 @@ class OBSBasic : public OBSMainWindow {
friend class AutoConfig;
friend class AutoConfigStreamPage;
friend class RecordButton;
friend class ReplayBufferButton;
friend class ControlsSplitButton;
friend class ExtraBrowsersModel;
friend class ExtraBrowsersDelegate;
friend class DeviceCaptureToolbar;
@@ -299,12 +299,10 @@ private:
QPointer<QMenu> startStreamMenu;
QPointer<QPushButton> transitionButton;
QPointer<QPushButton> replayBufferButton;
QPointer<QHBoxLayout> replayLayout;
QPointer<ControlsSplitButton> replayBufferButton;
QScopedPointer<QPushButton> pause;
QScopedPointer<QPushButton> replay;
QPointer<QPushButton> vcamButton;
QPointer<ControlsSplitButton> vcamButton;
bool vcamEnabled = false;
QScopedPointer<QSystemTrayIcon> trayIcon;
@@ -1062,6 +1060,7 @@ private slots:
void on_streamButton_clicked();
void on_recordButton_clicked();
void VCamButtonClicked();
void VCamConfigButtonClicked();
void on_settingsButton_clicked();
void Screenshot(OBSSource source_ = nullptr);
void ScreenshotSelectedSource();