From d917745cea94008a7c0e4565cc01136bfaeac19f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 30 Dec 2013 01:17:57 -0700 Subject: [PATCH] make it so that when a scene is clicked it becomes active --- obs/window-basic-main.cpp | 26 ++++++++++++++++++++++++++ obs/window-basic-main.hpp | 3 +++ 2 files changed, 29 insertions(+) diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index 57a587023..83ac1bb80 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -181,6 +181,19 @@ void OBSBasic::fileExitClicked(wxCommandEvent &event) wxGetApp().ExitMainLoop(); } +void OBSBasic::scenesClicked(wxCommandEvent &event) +{ + int sel = scenes->GetSelection(); + + obs_source_t source = NULL; + if (sel != wxNOT_FOUND) { + obs_scene_t scene = (obs_scene_t)scenes->GetClientData(sel); + source = obs_scene_getsource(scene); + } + + obs_set_output_source(0, source); +} + void OBSBasic::scenesRDown(wxMouseEvent &event) { } @@ -234,12 +247,25 @@ void OBSBasic::sceneDownClicked(wxCommandEvent &event) { } +void OBSBasic::sourcesClicked(wxCommandEvent &event) +{ +} + +void OBSBasic::sourcesToggled(wxCommandEvent &event) +{ +} + void OBSBasic::sourcesRDown(wxMouseEvent &event) { } void OBSBasic::sourceAddClicked(wxCommandEvent &event) { + int sceneSel = scenes->GetSelection(); + if (sceneSel == wxNOT_FOUND) + return; + + } void OBSBasic::sourceRemoveClicked(wxCommandEvent &event) diff --git a/obs/window-basic-main.hpp b/obs/window-basic-main.hpp index d0d7a20ef..83101ff17 100644 --- a/obs/window-basic-main.hpp +++ b/obs/window-basic-main.hpp @@ -42,12 +42,15 @@ protected: virtual void fileOpenClicked(wxCommandEvent &event); virtual void fileSaveClicked(wxCommandEvent &event); virtual void fileExitClicked(wxCommandEvent &event); + virtual void scenesClicked(wxCommandEvent &event); virtual void scenesRDown(wxMouseEvent &event); virtual void sceneAddClicked(wxCommandEvent &event); virtual void sceneRemoveClicked(wxCommandEvent &event); virtual void scenePropertiesClicked(wxCommandEvent &event); virtual void sceneUpClicked(wxCommandEvent &event); virtual void sceneDownClicked(wxCommandEvent &event); + virtual void sourcesClicked(wxCommandEvent &event); + virtual void sourcesToggled(wxCommandEvent &event); virtual void sourcesRDown(wxMouseEvent &event); virtual void sourceAddClicked(wxCommandEvent &event); virtual void sourceRemoveClicked(wxCommandEvent &event);