Browse Source

make it so that when a scene is clicked it becomes active

jp9000 12 years ago
parent
commit
d917745cea
2 changed files with 29 additions and 0 deletions
  1. 26 0
      obs/window-basic-main.cpp
  2. 3 0
      obs/window-basic-main.hpp

+ 26 - 0
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)

+ 3 - 0
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);