mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-19 17:49:14 +00:00
218b936b1d
The BasicOutputHandler::Active() function was used for checking whether outputs had started or not. However, the virtual camera is not used in the subclasses; instead it's a part of the base class. Because of that fact, when the virtual camera is started, the procedures used to start up the other outputs are never called, causing outputs to crash because they hadn't been initialized properly. For example, starting the virtual camera, then starting stream/recording would crash. So, as a simple fix to this, when checking the active status in the derived classes, do not factor in the virtual camera.
63 lines
1.7 KiB
C++
63 lines
1.7 KiB
C++
#pragma once
|
|
|
|
#include <string>
|
|
|
|
class OBSBasic;
|
|
|
|
struct BasicOutputHandler {
|
|
OBSOutput fileOutput;
|
|
OBSOutput streamOutput;
|
|
OBSOutput replayBuffer;
|
|
OBSOutput virtualCam;
|
|
bool streamingActive = false;
|
|
bool recordingActive = false;
|
|
bool delayActive = false;
|
|
bool replayBufferActive = false;
|
|
bool virtualCamActive = false;
|
|
OBSBasic *main;
|
|
|
|
std::string outputType;
|
|
std::string lastError;
|
|
|
|
OBSSignal startRecording;
|
|
OBSSignal stopRecording;
|
|
OBSSignal startReplayBuffer;
|
|
OBSSignal stopReplayBuffer;
|
|
OBSSignal startStreaming;
|
|
OBSSignal stopStreaming;
|
|
OBSSignal startVirtualCam;
|
|
OBSSignal stopVirtualCam;
|
|
OBSSignal streamDelayStarting;
|
|
OBSSignal streamStopping;
|
|
OBSSignal recordStopping;
|
|
OBSSignal replayBufferStopping;
|
|
|
|
inline BasicOutputHandler(OBSBasic *main_);
|
|
|
|
virtual ~BasicOutputHandler(){};
|
|
|
|
virtual bool StartStreaming(obs_service_t *service) = 0;
|
|
virtual bool StartRecording() = 0;
|
|
virtual bool StartReplayBuffer() { return false; }
|
|
virtual bool StartVirtualCam();
|
|
virtual void StopStreaming(bool force = false) = 0;
|
|
virtual void StopRecording(bool force = false) = 0;
|
|
virtual void StopReplayBuffer(bool force = false) { (void)force; }
|
|
virtual void StopVirtualCam();
|
|
virtual bool StreamingActive() const = 0;
|
|
virtual bool RecordingActive() const = 0;
|
|
virtual bool ReplayBufferActive() const { return false; }
|
|
virtual bool VirtualCamActive() const;
|
|
|
|
virtual void Update() = 0;
|
|
|
|
inline bool Active(bool check_vcam = true) const
|
|
{
|
|
return streamingActive || recordingActive || delayActive ||
|
|
replayBufferActive || (check_vcam && virtualCamActive);
|
|
}
|
|
};
|
|
|
|
BasicOutputHandler *CreateSimpleOutputHandler(OBSBasic *main);
|
|
BasicOutputHandler *CreateAdvancedOutputHandler(OBSBasic *main);
|