etc
/
obs-StreamFX
mirror of https://github.com/Xaymar/obs-StreamFX
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

source-mirror: Ensure that we have a proper source on activate()

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2018-04-24 15:31:51 +02:00
parent d8d60f7a21
commit 5e4a781912
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/source-mirror.cpp
View File

@ -308,6 +308,11 @@ void Source::Mirror::update(obs_data_t* data) {
void Source::Mirror::activate() { void Source::Mirror::activate() {
m_active = true; m_active = true;
if (!m_mirrorSource) {
obs_data_t* ref = obs_source_get_settings(m_source);
update(ref);
obs_data_release(ref);
}
} }
void Source::Mirror::deactivate() { void Source::Mirror::deactivate() {
@ -315,9 +320,10 @@ void Source::Mirror::deactivate() {
} }
void Source::Mirror::video_tick(float) { void Source::Mirror::video_tick(float) {
if (m_mirrorSource) if (m_mirrorSource) {
m_mirrorName = obs_source_get_name(m_mirrorSource->get_object()); m_mirrorName = obs_source_get_name(m_mirrorSource->get_object());
} }
}
void Source::Mirror::video_render(gs_effect_t*) { void Source::Mirror::video_render(gs_effect_t*) {
if ((m_width == 0) || (m_height == 0) || !m_mirrorSource || (m_mirrorSource->get_object() == m_source)) { if ((m_width == 0) || (m_height == 0) || !m_mirrorSource || (m_mirrorSource->get_object() == m_source)) {

16
source/source-mirror.h
View File

@ -23,6 +23,7 @@
#include "gs-sampler.h" #include "gs-sampler.h"
#include "gfx-source-texture.h" #include "gfx-source-texture.h"
#include <memory> #include <memory>
#include <obs-source.h>
namespace Source { namespace Source {
class MirrorAddon { class MirrorAddon {
@ -48,23 +49,24 @@ namespace Source {
static void deactivate(void *); static void deactivate(void *);
static void video_tick(void *, float); static void video_tick(void *, float);
static void video_render(void *, gs_effect_t *); static void video_render(void *, gs_effect_t *);
static void enum_active_sources(void *data, obs_source_enum_proc_t enum_callback, void *param); static void enum_active_sources(void *, obs_source_enum_proc_t, void *);
}; };
class Mirror { class Mirror {
bool m_active; bool m_active;
obs_source_t* m_source = nullptr; obs_source_t* m_source = nullptr;
// Input Source
std::string m_mirrorName;
std::unique_ptr<gfx::source_texture> m_mirrorSource;
// Scaling
bool m_rescale = false; bool m_rescale = false;
bool m_keepOriginalSize = false;
uint32_t m_width, m_height; uint32_t m_width, m_height;
gs_effect_t* m_scalingEffect = nullptr;
bool m_keepOriginalSize = false;
std::unique_ptr<gs::rendertarget> m_renderTargetScale; std::unique_ptr<gs::rendertarget> m_renderTargetScale;
std::shared_ptr<gs::sampler> m_sampler; std::shared_ptr<gs::sampler> m_sampler;
gs_effect_t* m_scalingEffect = nullptr;
std::unique_ptr<gfx::source_texture> m_mirrorSource;
std::string m_mirrorName;
public: public:
Mirror(obs_data_t*, obs_source_t*); Mirror(obs_data_t*, obs_source_t*);
@ -78,6 +80,6 @@ namespace Source {
void deactivate(); void deactivate();
void video_tick(float); void video_tick(float);
void video_render(gs_effect_t*); void video_render(gs_effect_t*);
void enum_active_sources(obs_source_enum_proc_t enum_callback, void *param); void enum_active_sources(obs_source_enum_proc_t, void *);
}; };
}; };