jp9000
/
obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #399 from Aslai/master 

Allow plugins to toggle the default transition via the API
master
Jim 2015-01-17 23:15:37 -08:00
parent 5cfd3751ca c054777d66
commit 70bdd367c8
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OBSApi/APIDefs.cpp
View File

@ -64,6 +64,10 @@ Scene* OBSGetScene() {return API->GetScene();}
CTSTR OBSGetSceneName() {return API->GetSceneName();}
XElement* OBSGetSceneElement() {return API->GetSceneElement();}
void OBSDisableTransitions() { API->DisableTransitions(); }
void OBSEnableTransitions() { API->EnableTransitions(); }
bool OBSTransitionsEnabled() { return API->TransitionsEnabled(); }
bool OBSSetSceneCollection(CTSTR lpCollection, CTSTR lpScene)
{
return API->SetSceneCollection(lpCollection, lpScene);

8
OBSApi/APIInterface.h
View File

@ -197,6 +197,10 @@ public:
virtual bool SetSceneCollection(CTSTR lpCollection, CTSTR lpScene) = 0;
virtual CTSTR GetSceneCollectionName() const = 0;
virtual void GetSceneCollectionNames(StringList &list) const = 0;
virtual void DisableTransitions() = 0;
virtual void EnableTransitions() = 0;
virtual bool TransitionsEnabled() const = 0;
};
BASE_EXPORT extern APIInterface *API;
@ -226,6 +230,10 @@ BASE_EXPORT bool OBSSetSceneCollection(CTSTR lpCollection, CTSTR lpScene);
BASE_EXPORT CTSTR OBSGetSceneCollectionName();
BASE_EXPORT void OBSGetSceneCollectionNames(StringList &list);
BASE_EXPORT void OBSDisableTransitions();
BASE_EXPORT void OBSEnableTransitions();
BASE_EXPORT bool OBSTransitionsEnabled();
//low-order word is VK, high-order word is modifier. equivalent to the value given by hotkey controls
BASE_EXPORT UINT OBSCreateHotkey(DWORD hotkey, OBSHOTKEYPROC hotkeyProc, UPARAM param);
BASE_EXPORT void OBSDeleteHotkey(UINT hotkeyID);

5
Source/API.cpp
View File

@ -264,7 +264,7 @@ bool OBS::SetScene(CTSTR lpScene)
bChangingSources = true;
ListView_DeleteAllItems(hwndSources);
bool bSkipTransition = false;
bool bSkipTransition = !performTransition;
XElement *sources = sceneElement->GetElement(TEXT("sources"));
if(sources)
@ -679,6 +679,9 @@ public:
}
virtual CTSTR GetSceneCollectionName() const { return App->GetCurrentSceneCollection(); }
virtual void GetSceneCollectionNames(StringList &list) const { return App->GetSceneCollection(list); }
virtual void DisableTransitions() { App->performTransition = false; }
virtual void EnableTransitions() { App->performTransition = true; }
virtual bool TransitionsEnabled() const { return App->performTransition; }
};
APIInterface* CreateOBSApiInterface()

2
Source/OBS.cpp
View File

@ -130,6 +130,8 @@ OBS::OBS()
{
App = this;
performTransition = true; //Default to true and don't set the conf.
//We don't want to let plugins disable standard behavior permanently.
hSceneMutex = OSCreateMutex();
hAuxAudioMutex = OSCreateMutex();
hVideoEvent = CreateEvent(NULL, FALSE, FALSE, NULL);

1
Source/OBS.h
View File

@ -643,6 +643,7 @@ class OBS
Texture *lastRenderTexture;
Texture *transitionTexture;
bool performTransition;
bool bTransitioning;
float transitionAlpha;