UI: Add Virtual Camera source selector dialog

This commit is contained in:
Chip Bradford committed 2022-07-31 15:39:18 -07:00
1 parent 0a87797a21
commit df446c3f6e
11 files changed
+638 -88

No files matched your search

+9 -2
View File
@@ -5,6 +5,7 @@
#include "audio-encoders.hpp"
#include "window-basic-main.hpp"
#include "window-basic-main-outputs.hpp"
#include "window-basic-vcam-config.hpp"
using namespace std;
@@ -178,6 +179,9 @@ static void OBSStopVirtualCam(void *data, calldata_t *params)
os_atomic_set_bool(&virtualcam_active, false);
QMetaObject::invokeMethod(output->main, "OnVirtualCamStop",
Q_ARG(int, code));
obs_output_set_media(output->virtualCam, nullptr, nullptr);
OBSBasicVCamConfig::StopVideo();
}
/* ------------------------------------------------------------------------ */
@@ -226,8 +230,11 @@ inline BasicOutputHandler::BasicOutputHandler(OBSBasic *main_) : main(main_)
bool BasicOutputHandler::StartVirtualCam()
{
if (main->vcamEnabled) {
obs_output_set_media(virtualCam, obs_get_video(),
obs_get_audio());
video_t *video = OBSBasicVCamConfig::StartVideo();
if (!video)
return false;
obs_output_set_media(virtualCam, video, obs_get_audio());
if (!Active())
SetupOutputs();