mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-09-08 17:45:57 -05:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99c9b1a4a2 | ||
|
|
8c0aad4c96 |
@@ -457,6 +457,7 @@ AdvSceneSwitcher.videoTab.help="<html><head/><body><p>This tab will allow you to
|
|||||||
|
|
||||||
; Network Tab
|
; Network Tab
|
||||||
AdvSceneSwitcher.networkTab.title="Network"
|
AdvSceneSwitcher.networkTab.title="Network"
|
||||||
|
AdvSceneSwitcher.networkTab.description="This tab will allow you to remotely control the active scene of another OBS instance.\nPlease note that the scene names have to match exactly on all OBS instances."
|
||||||
AdvSceneSwitcher.networkTab.warning="Running the server outside of a local network will allow third parties to read the active scene."
|
AdvSceneSwitcher.networkTab.warning="Running the server outside of a local network will allow third parties to read the active scene."
|
||||||
AdvSceneSwitcher.networkTab.DisabledWarning="This functionality unfortunately had to be disabled on macOS due to library incompatibilities when running the obs-websocket plugin in parallel."
|
AdvSceneSwitcher.networkTab.DisabledWarning="This functionality unfortunately had to be disabled on macOS due to library incompatibilities when running the obs-websocket plugin in parallel."
|
||||||
AdvSceneSwitcher.networkTab.server="Start server (Sends scene switch messages to all connected clients)"
|
AdvSceneSwitcher.networkTab.server="Start server (Sends scene switch messages to all connected clients)"
|
||||||
|
|||||||
@@ -3716,6 +3716,13 @@
|
|||||||
<string>AdvSceneSwitcher.networkTab.title</string>
|
<string>AdvSceneSwitcher.networkTab.title</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_30">
|
<layout class="QVBoxLayout" name="verticalLayout_30">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="networkTabDescription">
|
||||||
|
<property name="text">
|
||||||
|
<string>AdvSceneSwitcher.networkTab.description</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="networkTabWarningLabel">
|
<widget class="QLabel" name="networkTabWarningLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ bool MacroConditionVideo::Save(obs_data_t *obj)
|
|||||||
|
|
||||||
bool MacroConditionVideo::Load(obs_data_t *obj)
|
bool MacroConditionVideo::Load(obs_data_t *obj)
|
||||||
{
|
{
|
||||||
|
MacroCondition::Load(obj);
|
||||||
const char *videoSourceName = obs_data_get_string(obj, "videoSource");
|
const char *videoSourceName = obs_data_get_string(obj, "videoSource");
|
||||||
_videoSource = GetWeakSourceByName(videoSourceName);
|
_videoSource = GetWeakSourceByName(videoSourceName);
|
||||||
_condition =
|
_condition =
|
||||||
|
|||||||
Reference in New Issue
Block a user