mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
Compare commits
223 Commits
5.0.0-alph
...
5.1.0
Author | SHA1 | Date | |
---|---|---|---|
31f9845b61 | |||
cb6f0b8986 | |||
9959acb0e8 | |||
8b1ef17c25 | |||
a254172c12 | |||
57a9e23f16 | |||
4c3660c08d | |||
323b5d0b5d | |||
23f883d906 | |||
60dbcc1b66 | |||
8cabe24b77 | |||
9cfca3c7d1 | |||
cfa0b4363e | |||
815d47e2ff | |||
9bdf560bf8 | |||
47f9beb095 | |||
32d0834c3f | |||
9722ed3df4 | |||
9f72852588 | |||
6e0220ac7b | |||
6d4b7c786e | |||
290e042612 | |||
7e4c9529eb | |||
bc18401fb0 | |||
265899f76f | |||
9e1a41f219 | |||
7893ae5caa | |||
a715639302 | |||
6038fe9a0a | |||
6fba48929a | |||
7eb4eb101c | |||
f2e595e1ab | |||
c1ffbf0111 | |||
f08d3225ad | |||
84542e1ed5 | |||
bb9371b0dc | |||
ab918faea8 | |||
5716577019 | |||
b4a1266cf0 | |||
6527381c91 | |||
fb2abc45cf | |||
54b0dc3781 | |||
0ff90d1687 | |||
62bdbb2e64 | |||
5f8a0122bd | |||
20ea6e3352 | |||
b07dce821a | |||
2f549b82a3 | |||
17243577c5 | |||
c0ba751aaf | |||
eba6c4c6f3 | |||
59e7e3a307 | |||
8bf8995ad8 | |||
2b8dd47a6c | |||
268a45e8dd | |||
e52d5402cf | |||
0db223b148 | |||
420e600864 | |||
190a9551f6 | |||
773f85e0d7 | |||
b5d50c4243 | |||
e3314b3608 | |||
1902d7e1a3 | |||
e0d322d4cc | |||
ecde83a28d | |||
b0167e6296 | |||
16f3ceb997 | |||
2875fc7313 | |||
b9a63603c7 | |||
de40b53d77 | |||
1698b2895b | |||
1d25f97004 | |||
258bfc5689 | |||
35e3e278bf | |||
5341cb5951 | |||
00504a0d52 | |||
ab743c2ee6 | |||
1dd57f6140 | |||
a22a7cf993 | |||
d9026c1791 | |||
2524dc47cf | |||
798eebf638 | |||
9cdfa41113 | |||
aab925c0ed | |||
be1b13f15d | |||
6122fe6ea7 | |||
4201664c7b | |||
3deea2b5da | |||
c3ee52c4fe | |||
f4b72b69ce | |||
5b8fd096d5 | |||
22fee0312d | |||
17292520f2 | |||
711746524c | |||
e04bca0993 | |||
c8d0ed2138 | |||
6deadc25ac | |||
f73e78582b | |||
7b238793d0 | |||
7a09f38a64 | |||
27d21975f0 | |||
60e272e6f0 | |||
dd4971b1cc | |||
749ecc976b | |||
d85c86e3a0 | |||
3303acfcca | |||
1cd12c1023 | |||
1da0214201 | |||
226c81ce78 | |||
ca34981aae | |||
828dbde75c | |||
ac102de1e8 | |||
20e654186c | |||
f42cd2177a | |||
2479501879 | |||
371c414281 | |||
3a5f0d89b9 | |||
9f68e0166b | |||
8b85658c61 | |||
a9c9363d4a | |||
95df4782f3 | |||
9d899376a5 | |||
d8c042fe4a | |||
c355c72f4b | |||
e6c48990d6 | |||
620f11e8a3 | |||
b02a32ce06 | |||
ce31ed177d | |||
71a32c981c | |||
4440327141 | |||
bbf9c283c0 | |||
9ac7c5890e | |||
a7698a732f | |||
e15b2edb4f | |||
7fade98407 | |||
df13ad30b7 | |||
2297432f90 | |||
be48d0bfe9 | |||
2027394d33 | |||
d7de347b37 | |||
e0057b05db | |||
aa13828cf5 | |||
db2ffa569a | |||
66c14dced5 | |||
29b2b1bd5d | |||
361547a96d | |||
b3a5c55bef | |||
f76de69b34 | |||
0b294734a2 | |||
7b52d7e015 | |||
9664f28483 | |||
d9070f9edb | |||
559212682a | |||
fa8a091a3e | |||
ab137ce8a4 | |||
5a3bed7d8b | |||
3362d3f998 | |||
7ca8140a34 | |||
341259e610 | |||
c64e360c2d | |||
7c35d6e738 | |||
b206321b05 | |||
403c69463a | |||
eeb7bac4b7 | |||
7113055218 | |||
ddf752fd03 | |||
e80bcad1e1 | |||
d2ddde3229 | |||
931a1630ce | |||
5cbc1019ff | |||
14227237d7 | |||
3e2984fd7a | |||
96a2fd8c25 | |||
38d78596ce | |||
13c7b83c34 | |||
1844f85e1f | |||
bc0b499944 | |||
ae906bb283 | |||
63dfed1cf9 | |||
873eadec05 | |||
dea0fcd561 | |||
9f7beb1c0d | |||
db9f4b24df | |||
6035294339 | |||
6a2d5968ad | |||
8f2d266dec | |||
fe64620731 | |||
24e43d0276 | |||
c0308d6ce1 | |||
506a9167c3 | |||
043444cad5 | |||
35c8a87def | |||
e451a8d6b0 | |||
02bcc0ac1b | |||
702f88cea8 | |||
6d216e0412 | |||
e6761cf286 | |||
00dd8d7821 | |||
e43ebde794 | |||
4a2654d095 | |||
6291cb1532 | |||
a90dafb971 | |||
3a96b585ce | |||
12c6527442 | |||
31997db509 | |||
85f65952bd | |||
9113ff9021 | |||
1ed095de48 | |||
a94ac24027 | |||
903b7d4171 | |||
a59ce69ba1 | |||
195c4a3ca9 | |||
3b2369ae97 | |||
af634b63fd | |||
444685c89d | |||
05aba45809 | |||
1f1a8926b1 | |||
0c5d4ba3fb | |||
947450ce4e | |||
63cc1f316d | |||
38157579a6 | |||
9b879baf38 | |||
947f261d17 |
107
.clang-format
Normal file
107
.clang-format
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
# please use clang-format version 8 or later
|
||||||
|
|
||||||
|
Standard: Cpp11
|
||||||
|
AccessModifierOffset: -8
|
||||||
|
AlignAfterOpenBracket: Align
|
||||||
|
AlignConsecutiveAssignments: false
|
||||||
|
AlignConsecutiveDeclarations: false
|
||||||
|
AlignEscapedNewlines: Left
|
||||||
|
AlignOperands: true
|
||||||
|
AlignTrailingComments: true
|
||||||
|
#AllowAllArgumentsOnNextLine: false # requires clang-format 9
|
||||||
|
#AllowAllConstructorInitializersOnNextLine: false # requires clang-format 9
|
||||||
|
AllowAllParametersOfDeclarationOnNextLine: false
|
||||||
|
AllowShortBlocksOnASingleLine: false
|
||||||
|
AllowShortCaseLabelsOnASingleLine: false
|
||||||
|
AllowShortFunctionsOnASingleLine: Inline
|
||||||
|
AllowShortIfStatementsOnASingleLine: false
|
||||||
|
#AllowShortLambdasOnASingleLine: Inline # requires clang-format 9
|
||||||
|
AllowShortLoopsOnASingleLine: false
|
||||||
|
AlwaysBreakAfterDefinitionReturnType: None
|
||||||
|
AlwaysBreakAfterReturnType: None
|
||||||
|
AlwaysBreakBeforeMultilineStrings: false
|
||||||
|
AlwaysBreakTemplateDeclarations: false
|
||||||
|
BinPackArguments: true
|
||||||
|
BinPackParameters: true
|
||||||
|
BraceWrapping:
|
||||||
|
AfterClass: false
|
||||||
|
AfterControlStatement: false
|
||||||
|
AfterEnum: false
|
||||||
|
AfterFunction: true
|
||||||
|
AfterNamespace: false
|
||||||
|
AfterObjCDeclaration: false
|
||||||
|
AfterStruct: false
|
||||||
|
AfterUnion: false
|
||||||
|
AfterExternBlock: false
|
||||||
|
BeforeCatch: false
|
||||||
|
BeforeElse: false
|
||||||
|
IndentBraces: false
|
||||||
|
SplitEmptyFunction: true
|
||||||
|
SplitEmptyRecord: true
|
||||||
|
SplitEmptyNamespace: true
|
||||||
|
BreakBeforeBinaryOperators: None
|
||||||
|
BreakBeforeBraces: Custom
|
||||||
|
BreakBeforeTernaryOperators: true
|
||||||
|
BreakConstructorInitializers: BeforeColon
|
||||||
|
BreakStringLiterals: false # apparently unpredictable
|
||||||
|
ColumnLimit: 132
|
||||||
|
CompactNamespaces: false
|
||||||
|
ConstructorInitializerAllOnOneLineOrOnePerLine: true
|
||||||
|
ConstructorInitializerIndentWidth: 8
|
||||||
|
ContinuationIndentWidth: 8
|
||||||
|
Cpp11BracedListStyle: true
|
||||||
|
DerivePointerAlignment: false
|
||||||
|
DisableFormat: false
|
||||||
|
FixNamespaceComments: false
|
||||||
|
ForEachMacros:
|
||||||
|
- 'json_object_foreach'
|
||||||
|
- 'json_object_foreach_safe'
|
||||||
|
- 'json_array_foreach'
|
||||||
|
IncludeBlocks: Preserve
|
||||||
|
IndentCaseLabels: false
|
||||||
|
IndentPPDirectives: None
|
||||||
|
IndentWidth: 8
|
||||||
|
IndentWrappedFunctionNames: false
|
||||||
|
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||||
|
MaxEmptyLinesToKeep: 1
|
||||||
|
NamespaceIndentation: All
|
||||||
|
#ObjCBinPackProtocolList: Auto # requires clang-format 7
|
||||||
|
ObjCBlockIndentWidth: 8
|
||||||
|
ObjCSpaceAfterProperty: true
|
||||||
|
ObjCSpaceBeforeProtocolList: true
|
||||||
|
|
||||||
|
PenaltyBreakAssignment: 10
|
||||||
|
PenaltyBreakBeforeFirstCallParameter: 30
|
||||||
|
PenaltyBreakComment: 10
|
||||||
|
PenaltyBreakFirstLessLess: 0
|
||||||
|
PenaltyBreakString: 10
|
||||||
|
PenaltyExcessCharacter: 100
|
||||||
|
PenaltyReturnTypeOnItsOwnLine: 60
|
||||||
|
|
||||||
|
PointerAlignment: Right
|
||||||
|
ReflowComments: false
|
||||||
|
SortIncludes: false
|
||||||
|
SortUsingDeclarations: false
|
||||||
|
SpaceAfterCStyleCast: false
|
||||||
|
#SpaceAfterLogicalNot: false # requires clang-format 9
|
||||||
|
SpaceAfterTemplateKeyword: false
|
||||||
|
SpaceBeforeAssignmentOperators: true
|
||||||
|
#SpaceBeforeCtorInitializerColon: true # requires clang-format 7
|
||||||
|
#SpaceBeforeInheritanceColon: true # requires clang-format 7
|
||||||
|
SpaceBeforeParens: ControlStatements
|
||||||
|
#SpaceBeforeRangeBasedForLoopColon: true # requires clang-format 7
|
||||||
|
SpaceInEmptyParentheses: false
|
||||||
|
SpacesBeforeTrailingComments: 1
|
||||||
|
SpacesInAngles: false
|
||||||
|
SpacesInCStyleCastParentheses: false
|
||||||
|
SpacesInContainerLiterals: false
|
||||||
|
SpacesInParentheses: false
|
||||||
|
SpacesInSquareBrackets: false
|
||||||
|
#StatementMacros: # requires clang-format 8
|
||||||
|
# - 'Q_OBJECT'
|
||||||
|
TabWidth: 8
|
||||||
|
#TypenameMacros: # requires clang-format 9
|
||||||
|
# - 'DARRAY'
|
||||||
|
UseTab: ForContinuationAndIndentation
|
||||||
|
---
|
||||||
|
Language: ObjC
|
13
.cmake-format.json
Normal file
13
.cmake-format.json
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"additional_commands": {
|
||||||
|
"find_qt": {
|
||||||
|
"flags": [],
|
||||||
|
"kwargs": {
|
||||||
|
"COMPONENTS": "+",
|
||||||
|
"COMPONENTS_WIN": "+",
|
||||||
|
"COMPONENTS_MACOS": "+",
|
||||||
|
"COMPONENTS_LINUX": "+"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -9,8 +9,16 @@ indent_style = tab
|
|||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|
||||||
[CMakeLists.txt]
|
[CMakeLists.txt]
|
||||||
indent_style = tab
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 2
|
||||||
|
|
||||||
|
[**/CMakeLists.txt]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[cmake/**/*.cmake]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
[*.{yml,yaml}]
|
[*.{yml,yaml}]
|
||||||
indent_style = space
|
indent_style = space
|
||||||
|
20
.github/ISSUE_TEMPLATE/bug_report.yaml
vendored
20
.github/ISSUE_TEMPLATE/bug_report.yaml
vendored
@ -27,10 +27,9 @@ body:
|
|||||||
- macOS 10.15
|
- macOS 10.15
|
||||||
- macOS 10.14
|
- macOS 10.14
|
||||||
- macOS 10.13
|
- macOS 10.13
|
||||||
- Ubuntu 21.04
|
- Ubuntu 22.04 LTS
|
||||||
- Ubuntu 20.10
|
- Ubuntu 20.10
|
||||||
- Ubuntu 20.04
|
- Ubuntu 20.04 LTS
|
||||||
- Ubuntu 18.04
|
|
||||||
- Other
|
- Other
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
@ -48,10 +47,10 @@ body:
|
|||||||
label: OBS Studio Version
|
label: OBS Studio Version
|
||||||
description: What version of OBS Studio are you using?
|
description: What version of OBS Studio are you using?
|
||||||
options:
|
options:
|
||||||
- 27.1.3
|
- 29.0.x
|
||||||
- 27.1.1
|
- 28.1.x
|
||||||
- 27.1.0
|
- 28.0.x
|
||||||
- 27.0.1
|
- 27.2.4
|
||||||
- Git
|
- Git
|
||||||
- Other
|
- Other
|
||||||
validations:
|
validations:
|
||||||
@ -69,10 +68,9 @@ body:
|
|||||||
label: obs-websocket Version
|
label: obs-websocket Version
|
||||||
description: What version of obs-websocket are you using?
|
description: What version of obs-websocket are you using?
|
||||||
options:
|
options:
|
||||||
- 5.0.0-alpha3
|
- 5.1.0
|
||||||
- 5.0.0-alpha2
|
- 5.0.1
|
||||||
- 4.9.1
|
- 5.0.0
|
||||||
- 4.9.0
|
|
||||||
- Git
|
- Git
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
|
2
.github/pull_request_template.md
vendored
2
.github/pull_request_template.md
vendored
@ -29,6 +29,6 @@ Tested OS(s):
|
|||||||
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
|
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
|
||||||
- [ ] I have read the [Contributing Guidelines](https://github.com/obsproject/obs-websocket/wiki/Contributing-Guidelines).
|
- [ ] I have read the [Contributing Guidelines](https://github.com/obsproject/obs-websocket/wiki/Contributing-Guidelines).
|
||||||
- [ ] All commit messages are properly formatted and commits squashed where appropriate.
|
- [ ] All commit messages are properly formatted and commits squashed where appropriate.
|
||||||
- [ ] My code is not on the `master` branch.
|
- [ ] My code is not on `master` or a `release/*` branch.
|
||||||
- [ ] The code has been tested.
|
- [ ] The code has been tested.
|
||||||
- [ ] I have included updates to all appropriate documentation.
|
- [ ] I have included updates to all appropriate documentation.
|
||||||
|
24
.github/workflows/lint.yml
vendored
Normal file
24
.github/workflows/lint.yml
vendored
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
name: Code Quality
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
markdown:
|
||||||
|
name: Lint Markdown
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: contains(github.event.head_commit.message, '[skip ci]') != true
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- name: Generate docs
|
||||||
|
run: cd docs && ./build_docs.sh
|
||||||
|
- name: Run markdownlint-cli
|
||||||
|
uses: nosborn/github-action-markdown-cli@v3.0.1
|
||||||
|
with:
|
||||||
|
files: .
|
357
.github/workflows/main.yml
vendored
357
.github/workflows/main.yml
vendored
@ -1,357 +0,0 @@
|
|||||||
name: "CI Multiplatform Build"
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
paths-ignore:
|
|
||||||
- 'docs/**'
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
tags:
|
|
||||||
- '[45].[0-9]+.[0-9]+*'
|
|
||||||
pull_request:
|
|
||||||
paths-ignore:
|
|
||||||
- 'docs/**'
|
|
||||||
- '**.md'
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
windows:
|
|
||||||
name: 'Windows 32/64-bit'
|
|
||||||
runs-on: [windows-latest]
|
|
||||||
if: contains(github.event.head_commit.message, '[skip ci]') != true
|
|
||||||
env:
|
|
||||||
QT_CACHE_VERSION: '2' # Change whenever updating OBS dependencies URL, in order to force a cache reset
|
|
||||||
QT_VERSION: '5.15.2'
|
|
||||||
WINDOWS_DEPS_CACHE_VERSION: '1' # Change whenever updating Qt dependency URL, in order to force a cache reset
|
|
||||||
WINDOWS_DEPS_VERSION: '2019'
|
|
||||||
CMAKE_GENERATOR: "Visual Studio 16 2019"
|
|
||||||
CMAKE_SYSTEM_VERSION: "10.0"
|
|
||||||
steps:
|
|
||||||
- name: 'Add msbuild to PATH'
|
|
||||||
uses: microsoft/setup-msbuild@v1.0.2
|
|
||||||
- name: 'Checkout obs-websocket'
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
path: ${{ github.workspace }}/obs-websocket
|
|
||||||
submodules: 'recursive'
|
|
||||||
- name: 'Checkout OBS-Studio'
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
repository: obsproject/obs-studio
|
|
||||||
path: ${{ github.workspace }}/obs-studio
|
|
||||||
submodules: 'recursive'
|
|
||||||
- name: 'Get OBS-Studio Git Info'
|
|
||||||
shell: bash
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
git fetch --prune --unshallow
|
|
||||||
echo "OBS_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
|
|
||||||
echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
|
|
||||||
- name: 'Checkout last OBS-Studio release (${{ env.OBS_GIT_TAG }})'
|
|
||||||
shell: bash
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
git checkout ${{ env.OBS_GIT_TAG }}
|
|
||||||
git submodule update
|
|
||||||
- name: 'Get obs-websocket Git Info'
|
|
||||||
shell: bash
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
run: |
|
|
||||||
git fetch --prune --unshallow
|
|
||||||
GIT_HASH=$(git rev-parse --short HEAD)
|
|
||||||
echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV
|
|
||||||
GIT_TAG=$(git describe --exact-match --tags --abbrev=0) || GIT_TAG=""
|
|
||||||
echo "GIT_TAG=$GIT_TAG" >> $GITHUB_ENV
|
|
||||||
if [ "$GIT_TAG" ] ; then \
|
|
||||||
VERSION="$GIT_TAG" \
|
|
||||||
VERSION_SUFFIX=$(echo "$GIT_TAG" | cut -c6-20) ; \
|
|
||||||
else \
|
|
||||||
VERSION="$GIT_HASH-git" \
|
|
||||||
VERSION_SUFFIX="-$GIT_HASH-git" ; \
|
|
||||||
fi
|
|
||||||
echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
|
|
||||||
echo "CMAKE_VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV
|
|
||||||
- name: 'Restore Cached Qt'
|
|
||||||
id: qtcache
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: Qt_${{ env.QT_VERSION }}.7z
|
|
||||||
key: 'qtdep-${{ env.QT_CACHE_VERSION }} | ${{ runner.os }}'
|
|
||||||
restore-keys: |
|
|
||||||
qtdep-${{ env.QT_CACHE_VERSION }} | ${{ runner.os }}
|
|
||||||
- name: 'Download Prerequisite: Qt'
|
|
||||||
if: steps.qtcache.outputs.cache-hit != 'true'
|
|
||||||
run: |
|
|
||||||
curl -kLO https://tt2468.net/dl/Qt_${{ env.QT_VERSION }}.7z -f --retry 5 -C -
|
|
||||||
- name: 'Extract Prerequisite: Qt'
|
|
||||||
run: |
|
|
||||||
7z x Qt_${{ env.QT_VERSION }}.7z -o"${{ github.workspace }}\cmbuild\QT"
|
|
||||||
- name: 'Restore Cached OBS-Studio Dependencies'
|
|
||||||
id: obscache
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: ${{ github.workspace }}\cmbuild\deps\**
|
|
||||||
key: 'obsdep-${{ env.WINDOWS_DEPS_CACHE_VERSION }} | ${{ runner.os }}'
|
|
||||||
restore-keys: |
|
|
||||||
obsdep-${{ env.WINDOWS_DEPS_CACHE_VERSION }} | ${{ runner.os }}
|
|
||||||
- name: 'Install Prerequisite: Pre-built OBS-Studio dependencies'
|
|
||||||
if: steps.obscache.outputs.cache-hit != 'true'
|
|
||||||
run: |
|
|
||||||
curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -f --retry 5 -C -
|
|
||||||
7z x dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -o"${{ github.workspace }}\cmbuild\deps"
|
|
||||||
- name: 'Restore OBS-Studio 32-bit Build v${{ env.OBS_GIT_TAG }} from Cache'
|
|
||||||
id: build-cache-obs-32
|
|
||||||
uses: actions/cache@v2
|
|
||||||
env:
|
|
||||||
CACHE_NAME: 'build-cache-obs-32'
|
|
||||||
with:
|
|
||||||
path: ${{ github.workspace }}/obs-studio/build32
|
|
||||||
key: ${{ runner.os }}-${{ env.CACHE_NAME }}-${{ env.OBS_GIT_TAG }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-${{ env.CACHE_NAME }}-
|
|
||||||
- name: 'Configure OBS-Studio 32-bit'
|
|
||||||
if: steps.build-cache-obs-32.outputs.cache-hit != 'true'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
if(!(Test-Path -Path ".\build32")){New-Item -ItemType directory -Path .\build32}
|
|
||||||
cd .\build32
|
|
||||||
cmake -G "${{ env.CMAKE_GENERATOR }}" -A Win32 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019" -DDepsPath="${{ github.workspace }}\cmbuild\deps\win32" -DCOPIED_DEPENDENCIES=NO -DCOPY_DEPENDENCIES=YES -DBUILD_BROWSER=OFF ..
|
|
||||||
- name: 'Build OBS-Studio 32-bit'
|
|
||||||
if: steps.build-cache-obs-32.outputs.cache-hit != 'true'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
msbuild /m /p:Configuration=RelWithDebInfo .\build32\libobs\libobs.vcxproj
|
|
||||||
msbuild /m /p:Configuration=RelWithDebInfo .\build32\UI\obs-frontend-api\obs-frontend-api.vcxproj
|
|
||||||
- name: 'Restore OBS-Studio 64-bit Build v${{ env.OBS_GIT_TAG }} from Cache'
|
|
||||||
id: build-cache-obs-64
|
|
||||||
uses: actions/cache@v1
|
|
||||||
env:
|
|
||||||
CACHE_NAME: 'build-cache-obs-64'
|
|
||||||
with:
|
|
||||||
path: ${{ github.workspace }}/obs-studio/build64
|
|
||||||
key: ${{ runner.os }}-${{ env.CACHE_NAME }}-${{ env.OBS_GIT_TAG }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-${{ env.CACHE_NAME }}-
|
|
||||||
- name: 'Configure OBS-Studio 64-bit'
|
|
||||||
if: steps.build-cache-obs-64.outputs.cache-hit != 'true'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
if(!(Test-Path -Path ".\build64")){New-Item -ItemType directory -Path .\build64}
|
|
||||||
cd .\build64
|
|
||||||
cmake -G "${{ env.CMAKE_GENERATOR }}" -A x64 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019_64" -DDepsPath="${{ github.workspace }}\cmbuild\deps\win64" -DCOPIED_DEPENDENCIES=NO -DCOPY_DEPENDENCIES=YES -DBUILD_BROWSER=OFF ..
|
|
||||||
- name: 'Build OBS-Studio 64-bit'
|
|
||||||
if: steps.build-cache-obs-64.outputs.cache-hit != 'true'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
msbuild /m /p:Configuration=RelWithDebInfo .\build64\libobs\libobs.vcxproj
|
|
||||||
msbuild /m /p:Configuration=RelWithDebInfo .\build64\UI\obs-frontend-api\obs-frontend-api.vcxproj
|
|
||||||
- name: 'Configure obs-websocket 32-bit'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
run: |
|
|
||||||
mkdir .\build32
|
|
||||||
cd .\build32
|
|
||||||
cmake -G "${{ env.CMAKE_GENERATOR }}" -A Win32 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019" -DLibObs_DIR="${{ github.workspace }}\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="${{ github.workspace }}\obs-studio\libobs" -DLIBOBS_LIB="${{ github.workspace }}\obs-studio\build32\libobs\RelWithDebInfo\obs.lib" -DOBS_FRONTEND_LIB="${{ github.workspace }}\obs-studio\build32\UI\obs-frontend-api\RelWithDebInfo\obs-frontend-api.lib" -DOBS_WEBSOCKET_VERSION_SUFFIX="${{ env.CMAKE_VERSION_SUFFIX }}" ..
|
|
||||||
- name: 'Configure obs-websocket 64-bit'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
run: |
|
|
||||||
mkdir .\build64
|
|
||||||
cd .\build64
|
|
||||||
cmake -G "${{ env.CMAKE_GENERATOR }}" -A x64 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019_64" -DLibObs_DIR="${{ github.workspace }}\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="${{ github.workspace }}\obs-studio\libobs" -DLIBOBS_LIB="${{ github.workspace }}\obs-studio\build64\libobs\RelWithDebInfo\obs.lib" -DOBS_FRONTEND_LIB="${{ github.workspace }}\obs-studio\build64\UI\obs-frontend-api\RelWithDebInfo\obs-frontend-api.lib" -DOBS_WEBSOCKET_VERSION_SUFFIX="${{ env.CMAKE_VERSION_SUFFIX }}" ..
|
|
||||||
- name: 'Build obs-websocket 32-bit'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
run: msbuild /m /p:Configuration=RelWithDebInfo .\build32\obs-websocket.sln
|
|
||||||
- name: 'Build obs-websocket 64-bit'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
run: msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-websocket.sln
|
|
||||||
- name: 'Set PR Artifact Filename'
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "WIN_FILENAME=obs-websocket-${{ env.PACKAGE_VERSION }}-Windows" >> $GITHUB_ENV
|
|
||||||
- name: 'Package obs-websocket'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
run: |
|
|
||||||
mkdir package
|
|
||||||
cd package
|
|
||||||
7z a "${{ env.WIN_FILENAME }}.zip" "..\release\*"
|
|
||||||
iscc ..\installer\installer-windows.generated.iss /O. /F"${{ env.WIN_FILENAME }}-Installer"
|
|
||||||
- name: 'Publish ${{ env.WIN_FILENAME }}.zip'
|
|
||||||
if: success()
|
|
||||||
uses: actions/upload-artifact@v2-preview
|
|
||||||
with:
|
|
||||||
name: 'obs-websocket-${{ env.PACKAGE_VERSION }}-Windows'
|
|
||||||
path: ${{ github.workspace }}/obs-websocket/package/*.zip
|
|
||||||
- name: 'Publish ${{ env.WIN_FILENAME }}-Installer.exe'
|
|
||||||
if: success()
|
|
||||||
uses: actions/upload-artifact@v2-preview
|
|
||||||
with:
|
|
||||||
name: 'obs-websocket-${{ env.PACKAGE_VERSION }}-Windows-Installer'
|
|
||||||
path: ${{ github.workspace }}/obs-websocket/package/*.exe
|
|
||||||
ubuntu64:
|
|
||||||
name: "Linux/Ubuntu 64-bit"
|
|
||||||
runs-on: [ubuntu-latest]
|
|
||||||
if: contains(github.event.head_commit.message, '[skip ci]') != true
|
|
||||||
steps:
|
|
||||||
- name: 'Checkout obs-websocket'
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
path: ${{ github.workspace }}/obs-websocket
|
|
||||||
submodules: 'recursive'
|
|
||||||
- name: 'Checkout OBS-Studio'
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
repository: obsproject/obs-studio
|
|
||||||
path: ${{ github.workspace }}/obs-studio
|
|
||||||
submodules: 'recursive'
|
|
||||||
- name: 'Get OBS-Studio Git Info'
|
|
||||||
shell: bash
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
git fetch --prune --unshallow
|
|
||||||
echo "OBS_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
|
|
||||||
echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
|
|
||||||
- name: 'Checkout last OBS-Studio release (${{ env.OBS_GIT_TAG }})'
|
|
||||||
shell: bash
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
run: |
|
|
||||||
git checkout ${{ env.OBS_GIT_TAG }}
|
|
||||||
git submodule update
|
|
||||||
- name: 'Get obs-websocket git info'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
run: |
|
|
||||||
git fetch --prune --unshallow
|
|
||||||
GIT_HASH=$(git rev-parse --short HEAD)
|
|
||||||
echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV
|
|
||||||
GIT_TAG=$(git describe --exact-match --tags --abbrev=0) || GIT_TAG=""
|
|
||||||
echo "GIT_TAG=$GIT_TAG" >> $GITHUB_ENV
|
|
||||||
if [ "$GIT_TAG" ] ; then \
|
|
||||||
VERSION="$GIT_TAG" \
|
|
||||||
VERSION_SUFFIX=$(echo "$GIT_TAG" | cut -c6-20) ; \
|
|
||||||
else \
|
|
||||||
VERSION="$GIT_HASH-git" \
|
|
||||||
VERSION_SUFFIX="-$GIT_HASH-git" ; \
|
|
||||||
fi
|
|
||||||
echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
|
|
||||||
echo "CMAKE_VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV
|
|
||||||
- name: 'Install prerequisites (Apt)'
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
sudo dpkg --add-architecture amd64
|
|
||||||
sudo apt-get -qq update
|
|
||||||
sudo apt-get install -y \
|
|
||||||
build-essential \
|
|
||||||
checkinstall \
|
|
||||||
cmake \
|
|
||||||
libasound2-dev \
|
|
||||||
libavcodec-dev \
|
|
||||||
libavdevice-dev \
|
|
||||||
libavfilter-dev \
|
|
||||||
libavformat-dev \
|
|
||||||
libavutil-dev \
|
|
||||||
libcurl4-openssl-dev \
|
|
||||||
libfdk-aac-dev \
|
|
||||||
libfontconfig-dev \
|
|
||||||
libfreetype6-dev \
|
|
||||||
libgl1-mesa-dev \
|
|
||||||
libjack-jackd2-dev \
|
|
||||||
libjansson-dev \
|
|
||||||
libluajit-5.1-dev \
|
|
||||||
libpulse-dev \
|
|
||||||
libqt5x11extras5-dev \
|
|
||||||
libspeexdsp-dev \
|
|
||||||
libswresample-dev \
|
|
||||||
libswscale-dev \
|
|
||||||
libudev-dev \
|
|
||||||
libv4l-dev \
|
|
||||||
libva-dev \
|
|
||||||
libvlc-dev \
|
|
||||||
libx11-dev \
|
|
||||||
libx264-dev \
|
|
||||||
libxcb-randr0-dev \
|
|
||||||
libxcb-shm0-dev \
|
|
||||||
libxcb-xinerama0-dev \
|
|
||||||
libxcomposite-dev \
|
|
||||||
libxinerama-dev \
|
|
||||||
libmbedtls-dev \
|
|
||||||
pkg-config \
|
|
||||||
python3-dev \
|
|
||||||
qtbase5-dev \
|
|
||||||
qtbase5-private-dev \
|
|
||||||
libqt5svg5-dev \
|
|
||||||
swig \
|
|
||||||
libxcb-randr0-dev \
|
|
||||||
libxcb-xfixes0-dev \
|
|
||||||
libx11-xcb-dev \
|
|
||||||
libxcb1-dev \
|
|
||||||
libxss-dev \
|
|
||||||
- name: 'Configure OBS-Studio'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir ./build
|
|
||||||
cd ./build
|
|
||||||
cmake -DDISABLE_PLUGINS=YES -DENABLE_SCRIPTING=NO -DUNIX_STRUCTURE=YES -DCMAKE_INSTALL_PREFIX=/usr ..
|
|
||||||
- name: 'Build OBS-Studio'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
cd ./build
|
|
||||||
make -j4 libobs obs-frontend-api
|
|
||||||
- name: 'Install OBS-Studio'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-studio
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
cd ./build
|
|
||||||
sudo cp ./libobs/libobs.so /usr/lib
|
|
||||||
sudo cp ./UI/obs-frontend-api/libobs-frontend-api.so /usr/lib
|
|
||||||
sudo mkdir -p /usr/include/obs
|
|
||||||
sudo cp ../UI/obs-frontend-api/obs-frontend-api.h /usr/include/obs/obs-frontend-api.h
|
|
||||||
- name: 'Configure obs-websocket'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir ./build
|
|
||||||
cd ./build
|
|
||||||
if [ "${{ env.GIT_TAG }}" ] ; then \
|
|
||||||
cmake -DLIBOBS_INCLUDE_DIR=${{ github.workspace }}/obs-studio/libobs -DCMAKE_INSTALL_PREFIX=/usr -DUSE_UBUNTU_FIX=TRUE -DOBS_WEBSOCKET_VERSION_SUFFIX="${{ env.CMAKE_VERSION_SUFFIX }}" -DCMAKE_BUILD_TYPE=Release .. ; \
|
|
||||||
else \
|
|
||||||
cmake -DLIBOBS_INCLUDE_DIR=${{ github.workspace }}/obs-studio/libobs -DCMAKE_INSTALL_PREFIX=/usr -DUSE_UBUNTU_FIX=TRUE -DOBS_WEBSOCKET_VERSION_SUFFIX="${{ env.CMAKE_VERSION_SUFFIX }}" .. ; \
|
|
||||||
fi
|
|
||||||
- name: 'Build obs-websocket'
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
cd ./build
|
|
||||||
make -j4
|
|
||||||
- name: 'Set PR Artifact Filename'
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "LINUX_FILENAME=obs-websocket-${{ env.PACKAGE_VERSION }}-Ubuntu64.deb" >> $GITHUB_ENV
|
|
||||||
- name: 'Package ${{ env.LINUX_FILENAME }}'
|
|
||||||
if: success()
|
|
||||||
working-directory: ${{ github.workspace }}/obs-websocket
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
if [ "${{ env.GIT_TAG }}" ] ; then \
|
|
||||||
CHECKINSTALL_VERSION="${{ env.PACKAGE_VERSION }}" ; \
|
|
||||||
else \
|
|
||||||
CHECKINSTALL_VERSION="1-${{ env.PACKAGE_VERSION }}" ; \
|
|
||||||
fi
|
|
||||||
cd ./build
|
|
||||||
sudo checkinstall -y --type=debian --fstrans=no -nodoc \
|
|
||||||
--backup=no --deldoc=yes --install=no --pkgname=obs-websocket --pkgversion="$CHECKINSTALL_VERSION" \
|
|
||||||
--pkglicense="GPLv2.0" --maintainer="${{ github.event.pusher.email }}" --pkggroup="video" \
|
|
||||||
--pkgsource="${{ github.event.repository.html_url }}" \
|
|
||||||
--requires="obs-studio,libqt5network5,libqt5concurrent5,qt5-image-formats-plugins" \
|
|
||||||
--pakdir="../package"
|
|
||||||
sudo chmod ao+r ../package/*
|
|
||||||
sudo mv ../package/* ../package/${{ env.LINUX_FILENAME }}
|
|
||||||
cd -
|
|
||||||
- name: 'Publish ${{ env.LINUX_FILENAME }}'
|
|
||||||
if: success()
|
|
||||||
uses: actions/upload-artifact@v2-preview
|
|
||||||
with:
|
|
||||||
name: 'obs-websocket-${{ env.PACKAGE_VERSION }}-Ubuntu64'
|
|
||||||
path: '${{ github.workspace }}/obs-websocket/package/*.deb'
|
|
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,13 +1,14 @@
|
|||||||
*~
|
*~
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.idea
|
||||||
|
.vscode
|
||||||
|
**.generated.h
|
||||||
/build/
|
/build/
|
||||||
/build32/
|
/build32/
|
||||||
/build64/
|
/build64/
|
||||||
/release/
|
/release/
|
||||||
/package/
|
/package/
|
||||||
/installer/Output/
|
/installer/Output/
|
||||||
.idea
|
|
||||||
.vscode
|
|
||||||
/docs/node_modules/
|
/docs/node_modules/
|
||||||
/src/plugin-macros.generated.h
|
|
||||||
/installer/installer-windows.generated.iss
|
/installer/installer-windows.generated.iss
|
||||||
|
/cmake-build-debug/
|
||||||
|
2
.markdownlintignore
Normal file
2
.markdownlintignore
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
/deps
|
||||||
|
/docs/comments/node_modules
|
3
.markdownlintrc
Normal file
3
.markdownlintrc
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"line-length": false
|
||||||
|
}
|
@ -1,5 +0,0 @@
|
|||||||
brew "jack"
|
|
||||||
brew "speexdsp"
|
|
||||||
brew "cmake"
|
|
||||||
brew "freetype"
|
|
||||||
brew "fdk-aac"
|
|
@ -1,27 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
OSTYPE=$(uname)
|
|
||||||
|
|
||||||
if [ "${OSTYPE}" != "Darwin" ]; then
|
|
||||||
echo "[obs-websocket - Error] macOS build script can be run on Darwin-type OS only."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
HAS_CMAKE=$(type cmake 2>/dev/null)
|
|
||||||
|
|
||||||
if [ "${HAS_CMAKE}" = "" ]; then
|
|
||||||
echo "[obs-websocket - Error] CMake not installed - please run 'install-dependencies-macos.sh' first."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[obs-websocket] Building 'obs-websocket' for macOS."
|
|
||||||
mkdir -p build && cd build
|
|
||||||
cmake .. \
|
|
||||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
|
|
||||||
-DQTDIR=/tmp/obsdeps \
|
|
||||||
-DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
|
|
||||||
-DLIBOBS_LIB=../../obs-studio/libobs \
|
|
||||||
-DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
|
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
|
||||||
&& make -j4
|
|
@ -1,39 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
OSTYPE=$(uname)
|
|
||||||
|
|
||||||
if [ "${OSTYPE}" != "Darwin" ]; then
|
|
||||||
echo "[obs-websocket - Error] macOS obs-studio build script can be run on Darwin-type OS only."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
HAS_CMAKE=$(type cmake 2>/dev/null)
|
|
||||||
HAS_GIT=$(type git 2>/dev/null)
|
|
||||||
|
|
||||||
if [ "${HAS_CMAKE}" = "" ]; then
|
|
||||||
echo "[obs-websocket - Error] CMake not installed - please run 'install-dependencies-macos.sh' first."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${HAS_GIT}" = "" ]; then
|
|
||||||
echo "[obs-websocket - Error] Git not installed - please install Xcode developer tools or via Homebrew."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Build obs-studio
|
|
||||||
cd ..
|
|
||||||
echo "[obs-websocket] Cloning obs-studio from GitHub.."
|
|
||||||
git clone https://github.com/obsproject/obs-studio
|
|
||||||
cd obs-studio
|
|
||||||
OBSLatestTag=$(git describe --tags --abbrev=0)
|
|
||||||
git checkout $OBSLatestTag
|
|
||||||
mkdir build && cd build
|
|
||||||
echo "[obs-websocket] Building obs-studio.."
|
|
||||||
cmake .. \
|
|
||||||
-DQTDIR=/tmp/obsdeps \
|
|
||||||
-DDepsPath=/tmp/obsdeps \
|
|
||||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
|
|
||||||
-DDISABLE_PLUGINS=true \
|
|
||||||
-DENABLE_SCRIPTING=0 \
|
|
||||||
-DCMAKE_PREFIX_PATH=/tmp/obsdeps/lib/cmake \
|
|
||||||
&& make -j4
|
|
@ -1,57 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
OSTYPE=$(uname)
|
|
||||||
|
|
||||||
if [ "${OSTYPE}" != "Darwin" ]; then
|
|
||||||
echo "[obs-websocket - Error] macOS install dependencies script can be run on Darwin-type OS only."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
HAS_BREW=$(type brew 2>/dev/null)
|
|
||||||
|
|
||||||
if [ "${HAS_BREW}" = "" ]; then
|
|
||||||
echo "[obs-websocket - Error] Please install Homebrew (https://www.brew.sh/) to build obs-websocket on macOS."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# OBS Studio Brew Deps
|
|
||||||
echo "[obs-websocket] Updating Homebrew.."
|
|
||||||
brew update >/dev/null
|
|
||||||
echo "[obs-websocket] Checking installed Homebrew formulas.."
|
|
||||||
|
|
||||||
if [ -d /usr/local/opt/openssl@1.0.2t ]; then
|
|
||||||
brew uninstall openssl@1.0.2t
|
|
||||||
brew untap local/openssl
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -d /usr/local/opt/python@2.7.17 ]; then
|
|
||||||
brew uninstall python@2.7.17
|
|
||||||
brew untap local/python2
|
|
||||||
fi
|
|
||||||
|
|
||||||
brew bundle --file ./CI/macos/Brewfile
|
|
||||||
|
|
||||||
# Fetch and install Packages app
|
|
||||||
# =!= NOTICE =!=
|
|
||||||
# Installs a LaunchDaemon under /Library/LaunchDaemons/fr.whitebox.packages.build.dispatcher.plist
|
|
||||||
# =!= NOTICE =!=
|
|
||||||
|
|
||||||
HAS_PACKAGES=$(type packagesbuild 2>/dev/null)
|
|
||||||
|
|
||||||
if [ "${HAS_PACKAGES}" = "" ]; then
|
|
||||||
echo "[obs-websocket] Installing Packaging app (might require password due to 'sudo').."
|
|
||||||
curl -L -O http://s.sudre.free.fr/Software/files/Packages.dmg
|
|
||||||
sudo hdiutil attach ./Packages.dmg
|
|
||||||
sudo installer -pkg /Volumes/Packages\ 1.2.9/Install\ Packages.pkg -target /
|
|
||||||
fi
|
|
||||||
|
|
||||||
# OBS Deps
|
|
||||||
echo "[obs-websocket] Installing obs-websocket dependency 'OBS Deps ${OBS_DEPS_VERSION}'.."
|
|
||||||
wget --quiet --retry-connrefused --waitretry=1 https://github.com/obsproject/obs-deps/releases/download/${OBS_DEPS_VERSION}/macos-deps-${OBS_DEPS_VERSION}.tar.gz
|
|
||||||
tar -xf ./macos-deps-${OBS_DEPS_VERSION}.tar.gz -C /tmp
|
|
||||||
|
|
||||||
# Qt deps
|
|
||||||
echo "[obs-websocket] Installing obs-websocket dependency 'Qt ${QT_VERSION}'.."
|
|
||||||
curl -L -O https://github.com/obsproject/obs-deps/releases/download/${OBS_DEPS_VERSION}/macos-qt-${QT_VERSION}-${OBS_DEPS_VERSION}.tar.gz
|
|
||||||
tar -xf ./macos-qt-${QT_VERSION}-${OBS_DEPS_VERSION}.tar.gz -C "/tmp"
|
|
||||||
xattr -r -d com.apple.quarantine /tmp/obsdeps
|
|
@ -1,726 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>PROJECT</key>
|
|
||||||
<dict>
|
|
||||||
<key>PACKAGE_FILES</key>
|
|
||||||
<dict>
|
|
||||||
<key>DEFAULT_INSTALL_LOCATION</key>
|
|
||||||
<string>/</string>
|
|
||||||
<key>HIERARCHY</key>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>../../build/obs-websocket.so</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>3</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>bin</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>2</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>../../data</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>3</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>obs-websocket</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>2</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>plugins</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>2</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>obs-studio</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>2</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Application Support</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Automator</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Documentation</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Extensions</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Filesystems</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Frameworks</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Input Methods</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Internet Plug-Ins</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>LaunchAgents</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>LaunchDaemons</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>PreferencePanes</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Preferences</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Printers</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>PrivilegedHelperTools</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>QuickLook</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>QuickTime</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Screen Savers</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Scripts</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Services</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Widgets</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Library</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CHILDREN</key>
|
|
||||||
<array/>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Shared</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>1023</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>80</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>Users</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>GID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>/</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>PERMISSIONS</key>
|
|
||||||
<integer>493</integer>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>UID</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<key>PAYLOAD_TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>VERSION</key>
|
|
||||||
<integer>4</integer>
|
|
||||||
</dict>
|
|
||||||
<key>PACKAGE_SCRIPTS</key>
|
|
||||||
<dict>
|
|
||||||
<key>RESOURCES</key>
|
|
||||||
<array/>
|
|
||||||
</dict>
|
|
||||||
<key>PACKAGE_SETTINGS</key>
|
|
||||||
<dict>
|
|
||||||
<key>AUTHENTICATION</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>CONCLUSION_ACTION</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
<key>IDENTIFIER</key>
|
|
||||||
<string>fr.palakis.obs-websocket</string>
|
|
||||||
<key>OVERWRITE_PERMISSIONS</key>
|
|
||||||
<false/>
|
|
||||||
<key>VERSION</key>
|
|
||||||
<string>5.0.0</string>
|
|
||||||
</dict>
|
|
||||||
<key>PROJECT_COMMENTS</key>
|
|
||||||
<dict>
|
|
||||||
<key>NOTES</key>
|
|
||||||
<data>
|
|
||||||
PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
|
|
||||||
IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
|
|
||||||
c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
|
|
||||||
cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
|
|
||||||
IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
|
|
||||||
ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
|
|
||||||
dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
|
|
||||||
dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
|
|
||||||
b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE0MDQuMTMiPgo8c3R5bGUg
|
|
||||||
dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
|
|
||||||
Pgo8L2JvZHk+CjwvaHRtbD4K
|
|
||||||
</data>
|
|
||||||
</dict>
|
|
||||||
<key>PROJECT_SETTINGS</key>
|
|
||||||
<dict>
|
|
||||||
<key>BUILD_PATH</key>
|
|
||||||
<dict>
|
|
||||||
<key>PATH</key>
|
|
||||||
<string>../../release</string>
|
|
||||||
<key>PATH_TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
</dict>
|
|
||||||
<key>EXCLUDED_FILES</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>PATTERNS_ARRAY</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>.DS_Store</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>PROTECTED</key>
|
|
||||||
<true/>
|
|
||||||
<key>PROXY_NAME</key>
|
|
||||||
<string>Remove .DS_Store files</string>
|
|
||||||
<key>PROXY_TOOLTIP</key>
|
|
||||||
<string>Remove ".DS_Store" files created by the Finder.</string>
|
|
||||||
<key>STATE</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>PATTERNS_ARRAY</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>.pbdevelopment</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>PROTECTED</key>
|
|
||||||
<true/>
|
|
||||||
<key>PROXY_NAME</key>
|
|
||||||
<string>Remove .pbdevelopment files</string>
|
|
||||||
<key>PROXY_TOOLTIP</key>
|
|
||||||
<string>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
|
|
||||||
<key>STATE</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>PATTERNS_ARRAY</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>CVS</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>.cvsignore</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>.cvspass</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>.svn</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>.git</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>.gitignore</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>PROTECTED</key>
|
|
||||||
<true/>
|
|
||||||
<key>PROXY_NAME</key>
|
|
||||||
<string>Remove SCM metadata</string>
|
|
||||||
<key>PROXY_TOOLTIP</key>
|
|
||||||
<string>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
|
|
||||||
<key>STATE</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>PATTERNS_ARRAY</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>classes.nib</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>designable.db</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>info.nib</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>0</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>PROTECTED</key>
|
|
||||||
<true/>
|
|
||||||
<key>PROXY_NAME</key>
|
|
||||||
<string>Optimize nib files</string>
|
|
||||||
<key>PROXY_TOOLTIP</key>
|
|
||||||
<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
|
|
||||||
<key>STATE</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>PATTERNS_ARRAY</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>REGULAR_EXPRESSION</key>
|
|
||||||
<false/>
|
|
||||||
<key>STRING</key>
|
|
||||||
<string>Resources Disabled</string>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>PROTECTED</key>
|
|
||||||
<true/>
|
|
||||||
<key>PROXY_NAME</key>
|
|
||||||
<string>Remove Resources Disabled folders</string>
|
|
||||||
<key>PROXY_TOOLTIP</key>
|
|
||||||
<string>Remove "Resources Disabled" folders.</string>
|
|
||||||
<key>STATE</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
<dict>
|
|
||||||
<key>SEPARATOR</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
<key>NAME</key>
|
|
||||||
<string>obs-websocket</string>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
|
||||||
<key>TYPE</key>
|
|
||||||
<integer>1</integer>
|
|
||||||
<key>VERSION</key>
|
|
||||||
<integer>2</integer>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
@ -1,93 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
OSTYPE=$(uname)
|
|
||||||
|
|
||||||
if [ "${OSTYPE}" != "Darwin" ]; then
|
|
||||||
echo "[obs-websocket - Error] macOS package script can be run on Darwin-type OS only."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[obs-websocket] Preparing package build"
|
|
||||||
|
|
||||||
GIT_HASH=$(git rev-parse --short HEAD)
|
|
||||||
GIT_BRANCH_OR_TAG=$(git name-rev --name-only HEAD | awk -F/ '{print $NF}')
|
|
||||||
|
|
||||||
VERSION="$GIT_HASH-$GIT_BRANCH_OR_TAG"
|
|
||||||
|
|
||||||
FILENAME_UNSIGNED="obs-websocket-$VERSION-Unsigned.pkg"
|
|
||||||
FILENAME="obs-websocket-$VERSION.pkg"
|
|
||||||
|
|
||||||
echo "[obs-websocket] Modifying obs-websocket.so linking"
|
|
||||||
install_name_tool \
|
|
||||||
-change /tmp/obsdeps/lib/QtWidgets.framework/Versions/5/QtWidgets \
|
|
||||||
@executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \
|
|
||||||
-change /tmp/obsdeps/lib/QtGui.framework/Versions/5/QtGui \
|
|
||||||
@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \
|
|
||||||
-change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore \
|
|
||||||
@executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \
|
|
||||||
-change /tmp/obsdeps/lib/QtNetwork.framework/Versions/5/QtNetwork \
|
|
||||||
@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork \
|
|
||||||
-change /tmp/obsdeps/lib/QtSvg.framework/Versions/5/QtSvg \
|
|
||||||
@executable_path/../Frameworks/QtSvg.framework/Versions/5/QtSvg \
|
|
||||||
./build/obs-websocket.so
|
|
||||||
|
|
||||||
# Check if replacement worked
|
|
||||||
echo "[obs-websocket] Dependencies for obs-websocket"
|
|
||||||
otool -L ./build/obs-websocket.so
|
|
||||||
|
|
||||||
if [[ "$RELEASE_MODE" == "True" ]]; then
|
|
||||||
echo "[obs-websocket] Signing plugin binary: obs-websocket.so"
|
|
||||||
codesign --sign "$CODE_SIGNING_IDENTITY" ./build/obs-websocket.so
|
|
||||||
else
|
|
||||||
echo "[obs-websocket] Skipped plugin codesigning"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[obs-websocket] Actual package build"
|
|
||||||
packagesbuild ./CI/macos/obs-websocket.pkgproj
|
|
||||||
|
|
||||||
echo "[obs-websocket] Renaming obs-websocket.pkg to $FILENAME"
|
|
||||||
mv ./release/obs-websocket.pkg ./release/$FILENAME_UNSIGNED
|
|
||||||
|
|
||||||
if [[ "$RELEASE_MODE" == "True" ]]; then
|
|
||||||
echo "[obs-websocket] Signing installer: $FILENAME"
|
|
||||||
productsign \
|
|
||||||
--sign "$INSTALLER_SIGNING_IDENTITY" \
|
|
||||||
./release/$FILENAME_UNSIGNED \
|
|
||||||
./release/$FILENAME
|
|
||||||
rm ./release/$FILENAME_UNSIGNED
|
|
||||||
|
|
||||||
echo "[obs-websocket] Submitting installer $FILENAME for notarization"
|
|
||||||
zip -r ./release/$FILENAME.zip ./release/$FILENAME
|
|
||||||
UPLOAD_RESULT=$(xcrun altool \
|
|
||||||
--notarize-app \
|
|
||||||
--primary-bundle-id "fr.palakis.obs-websocket" \
|
|
||||||
--username "$AC_USERNAME" \
|
|
||||||
--password "$AC_PASSWORD" \
|
|
||||||
--asc-provider "$AC_PROVIDER_SHORTNAME" \
|
|
||||||
--file "./release/$FILENAME.zip")
|
|
||||||
rm ./release/$FILENAME.zip
|
|
||||||
|
|
||||||
REQUEST_UUID=$(echo $UPLOAD_RESULT | awk -F ' = ' '/RequestUUID/ {print $2}')
|
|
||||||
echo "Request UUID: $REQUEST_UUID"
|
|
||||||
|
|
||||||
echo "[obs-websocket] Wait for notarization result"
|
|
||||||
# Pieces of code borrowed from rednoah/notarized-app
|
|
||||||
while sleep 30 && date; do
|
|
||||||
CHECK_RESULT=$(xcrun altool \
|
|
||||||
--notarization-info "$REQUEST_UUID" \
|
|
||||||
--username "$AC_USERNAME" \
|
|
||||||
--password "$AC_PASSWORD" \
|
|
||||||
--asc-provider "$AC_PROVIDER_SHORTNAME")
|
|
||||||
echo $CHECK_RESULT
|
|
||||||
|
|
||||||
if ! grep -q "Status: in progress" <<< "$CHECK_RESULT"; then
|
|
||||||
echo "[obs-websocket] Staple ticket to installer: $FILENAME"
|
|
||||||
xcrun stapler staple ./release/$FILENAME
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
echo "[obs-websocket] Skipped installer codesigning and notarization"
|
|
||||||
fi
|
|
339
CMakeLists.txt
339
CMakeLists.txt
@ -1,98 +1,73 @@
|
|||||||
cmake_minimum_required(VERSION 3.16...3.20)
|
project(obs-websocket VERSION 5.1.0)
|
||||||
|
|
||||||
# Version variables
|
|
||||||
project(obs-websocket VERSION 5.0.0)
|
|
||||||
set(OBS_WEBSOCKET_RPC_VERSION 1)
|
set(OBS_WEBSOCKET_RPC_VERSION 1)
|
||||||
|
|
||||||
|
option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
|
||||||
|
|
||||||
# Set correct version string
|
if(NOT ENABLE_WEBSOCKET OR NOT ENABLE_UI)
|
||||||
if(DEFINED OBS_WEBSOCKET_VERSION_SUFFIX AND NOT OBS_WEBSOCKET_VERSION_SUFFIX STREQUAL "")
|
message(STATUS "OBS: DISABLED obs-websocket")
|
||||||
set(OBS_WEBSOCKET_VERSION "${CMAKE_PROJECT_VERSION}${OBS_WEBSOCKET_VERSION_SUFFIX}")
|
return()
|
||||||
message(WARNING "-----------------------------------\nVersion Suffix provided. OBS_WEBSOCKET_VERSION is now ${OBS_WEBSOCKET_VERSION}\n-----------------------------------")
|
|
||||||
else()
|
|
||||||
set(OBS_WEBSOCKET_VERSION "${CMAKE_PROJECT_VERSION}")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Submodule deps check
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
if(NOT
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/json/CMakeLists.txt
|
||||||
|
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp/CMakeLists.txt
|
||||||
|
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp
|
||||||
# Prohibit in-source builds
|
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include/asio.hpp))
|
||||||
file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" _LOC_PATH)
|
obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
|
||||||
if(EXISTS "${LOC_PATH}")
|
|
||||||
message(FATAL_ERROR "obs-websocket: You cannot build in a source directory (or any directory with "
|
|
||||||
"CMakeLists.txt file). Please make a build subdirectory. Feel free to "
|
|
||||||
"remove CMakeCache.txt and CMakeFiles.")
|
|
||||||
endif()
|
endif()
|
||||||
unset(_LOC_PATH)
|
|
||||||
|
|
||||||
|
|
||||||
# Allow selection of common build types via UI
|
|
||||||
if(NOT CMAKE_BUILD_TYPE)
|
|
||||||
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
|
|
||||||
"OBS build type [Release, RelWithDebInfo, Debug, MinSizeRel]" FORCE)
|
|
||||||
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Release RelWithDebInfo Debug MinSizeRel)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
# Plugin tests flag
|
# Plugin tests flag
|
||||||
option(PLUGIN_TESTS "Enable plugin runtime tests" OFF)
|
option(PLUGIN_TESTS "Enable plugin runtime tests" OFF)
|
||||||
|
|
||||||
|
|
||||||
# Qt build stuff
|
# Qt build stuff
|
||||||
set(CMAKE_PREFIX_PATH "${QTDIR}")
|
set(CMAKE_PREFIX_PATH "${QTDIR}")
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
|
|
||||||
set(CMAKE_AUTORCC ON) # For resources.qrc
|
set(CMAKE_AUTORCC ON) # For resources.qrc
|
||||||
|
|
||||||
|
# Find Qt
|
||||||
|
find_qt(COMPONENTS Core Widgets Svg Network)
|
||||||
|
|
||||||
|
# Find nlohmann
|
||||||
|
set(JSON_BuildTests
|
||||||
|
OFF
|
||||||
|
CACHE INTERNAL "")
|
||||||
|
add_subdirectory(deps/json)
|
||||||
|
|
||||||
# Tell websocketpp not to use system boost
|
# Tell websocketpp not to use system boost
|
||||||
add_definitions(-DASIO_STANDALONE)
|
add_definitions(-DASIO_STANDALONE)
|
||||||
|
|
||||||
|
|
||||||
# Arm build fixes
|
|
||||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
|
|
||||||
set(CMAKE_CXX_FLAGS "-mfpu=neon")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
# Find libobs
|
|
||||||
if (WIN32 OR APPLE)
|
|
||||||
include(cmake/FindLibObs.cmake)
|
|
||||||
endif()
|
|
||||||
find_package(LibObs REQUIRED)
|
|
||||||
|
|
||||||
|
|
||||||
# Find Qt5
|
|
||||||
find_package(Qt5 REQUIRED COMPONENTS Core Widgets Svg Network)
|
|
||||||
|
|
||||||
|
|
||||||
# Find nlohmann
|
|
||||||
set(JSON_BuildTests OFF CACHE INTERNAL "")
|
|
||||||
add_subdirectory(deps/json)
|
|
||||||
|
|
||||||
|
|
||||||
# Configure files
|
# Configure files
|
||||||
configure_file(
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.h.in
|
||||||
src/plugin-macros.h.in
|
${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.generated.h)
|
||||||
../src/plugin-macros.generated.h
|
|
||||||
)
|
|
||||||
configure_file(
|
|
||||||
installer/installer-windows.iss.in
|
|
||||||
../installer/installer-windows.generated.iss
|
|
||||||
)
|
|
||||||
|
|
||||||
|
# Setup target
|
||||||
|
add_library(obs-websocket MODULE)
|
||||||
|
add_library(OBS::websocket ALIAS obs-websocket)
|
||||||
|
|
||||||
# Inlude sources
|
target_sources(
|
||||||
set(obs-websocket_SOURCES
|
obs-websocket
|
||||||
src/obs-websocket.cpp
|
PRIVATE src/obs-websocket.cpp
|
||||||
|
src/obs-websocket.h
|
||||||
src/Config.cpp
|
src/Config.cpp
|
||||||
|
src/Config.h
|
||||||
|
lib/obs-websocket-api.h
|
||||||
|
src/forms/SettingsDialog.cpp
|
||||||
|
src/forms/SettingsDialog.h
|
||||||
|
src/forms/ConnectInfo.cpp
|
||||||
|
src/forms/ConnectInfo.h
|
||||||
|
src/forms/resources.qrc
|
||||||
src/WebSocketApi.cpp
|
src/WebSocketApi.cpp
|
||||||
|
src/WebSocketApi.h
|
||||||
src/websocketserver/WebSocketServer.cpp
|
src/websocketserver/WebSocketServer.cpp
|
||||||
src/websocketserver/WebSocketServer_Protocol.cpp
|
src/websocketserver/WebSocketServer_Protocol.cpp
|
||||||
|
src/websocketserver/WebSocketServer.h
|
||||||
src/websocketserver/rpc/WebSocketSession.cpp
|
src/websocketserver/rpc/WebSocketSession.cpp
|
||||||
|
src/websocketserver/rpc/WebSocketSession.h
|
||||||
|
src/websocketserver/types/WebSocketCloseCode.h
|
||||||
|
src/websocketserver/types/WebSocketOpCode.h
|
||||||
src/eventhandler/EventHandler.cpp
|
src/eventhandler/EventHandler.cpp
|
||||||
src/eventhandler/EventHandler_General.cpp
|
src/eventhandler/EventHandler_General.cpp
|
||||||
src/eventhandler/EventHandler_Config.cpp
|
src/eventhandler/EventHandler_Config.cpp
|
||||||
@ -104,8 +79,9 @@ set(obs-websocket_SOURCES
|
|||||||
src/eventhandler/EventHandler_SceneItems.cpp
|
src/eventhandler/EventHandler_SceneItems.cpp
|
||||||
src/eventhandler/EventHandler_MediaInputs.cpp
|
src/eventhandler/EventHandler_MediaInputs.cpp
|
||||||
src/eventhandler/EventHandler_Ui.cpp
|
src/eventhandler/EventHandler_Ui.cpp
|
||||||
|
src/eventhandler/EventHandler.h
|
||||||
|
src/eventhandler/types/EventSubscription.h
|
||||||
src/requesthandler/RequestHandler.cpp
|
src/requesthandler/RequestHandler.cpp
|
||||||
src/requesthandler/RequestBatchHandler.cpp
|
|
||||||
src/requesthandler/RequestHandler_General.cpp
|
src/requesthandler/RequestHandler_General.cpp
|
||||||
src/requesthandler/RequestHandler_Config.cpp
|
src/requesthandler/RequestHandler_Config.cpp
|
||||||
src/requesthandler/RequestHandler_Sources.cpp
|
src/requesthandler/RequestHandler_Sources.cpp
|
||||||
@ -114,226 +90,85 @@ set(obs-websocket_SOURCES
|
|||||||
src/requesthandler/RequestHandler_Transitions.cpp
|
src/requesthandler/RequestHandler_Transitions.cpp
|
||||||
src/requesthandler/RequestHandler_Filters.cpp
|
src/requesthandler/RequestHandler_Filters.cpp
|
||||||
src/requesthandler/RequestHandler_SceneItems.cpp
|
src/requesthandler/RequestHandler_SceneItems.cpp
|
||||||
|
src/requesthandler/RequestHandler_Outputs.cpp
|
||||||
src/requesthandler/RequestHandler_Stream.cpp
|
src/requesthandler/RequestHandler_Stream.cpp
|
||||||
src/requesthandler/RequestHandler_Record.cpp
|
src/requesthandler/RequestHandler_Record.cpp
|
||||||
src/requesthandler/RequestHandler_MediaInputs.cpp
|
src/requesthandler/RequestHandler_MediaInputs.cpp
|
||||||
src/requesthandler/RequestHandler_Ui.cpp
|
src/requesthandler/RequestHandler_Ui.cpp
|
||||||
|
src/requesthandler/RequestHandler.h
|
||||||
|
src/requesthandler/RequestBatchHandler.cpp
|
||||||
|
src/requesthandler/RequestBatchHandler.h
|
||||||
src/requesthandler/rpc/Request.cpp
|
src/requesthandler/rpc/Request.cpp
|
||||||
|
src/requesthandler/rpc/Request.h
|
||||||
src/requesthandler/rpc/RequestBatchRequest.cpp
|
src/requesthandler/rpc/RequestBatchRequest.cpp
|
||||||
|
src/requesthandler/rpc/RequestBatchRequest.h
|
||||||
src/requesthandler/rpc/RequestResult.cpp
|
src/requesthandler/rpc/RequestResult.cpp
|
||||||
src/forms/SettingsDialog.cpp
|
src/requesthandler/rpc/RequestResult.h
|
||||||
src/forms/ConnectInfo.cpp
|
src/requesthandler/types/RequestStatus.h
|
||||||
src/forms/resources.qrc
|
src/requesthandler/types/RequestBatchExecutionType.h
|
||||||
src/utils/Crypto.cpp
|
src/utils/Crypto.cpp
|
||||||
|
src/utils/Crypto.h
|
||||||
src/utils/Json.cpp
|
src/utils/Json.cpp
|
||||||
|
src/utils/Json.h
|
||||||
src/utils/Obs.cpp
|
src/utils/Obs.cpp
|
||||||
src/utils/Obs_StringHelper.cpp
|
src/utils/Obs_StringHelper.cpp
|
||||||
src/utils/Obs_EnumHelper.cpp
|
|
||||||
src/utils/Obs_NumberHelper.cpp
|
src/utils/Obs_NumberHelper.cpp
|
||||||
src/utils/Obs_ArrayHelper.cpp
|
src/utils/Obs_ArrayHelper.cpp
|
||||||
src/utils/Obs_ObjectHelper.cpp
|
src/utils/Obs_ObjectHelper.cpp
|
||||||
src/utils/Obs_SearchHelper.cpp
|
src/utils/Obs_SearchHelper.cpp
|
||||||
src/utils/Obs_ActionHelper.cpp
|
src/utils/Obs_ActionHelper.cpp
|
||||||
src/utils/Obs_VolumeMeter.cpp
|
|
||||||
src/utils/Platform.cpp
|
|
||||||
src/utils/Compat.cpp
|
|
||||||
deps/qr/cpp/QrCode.cpp)
|
|
||||||
|
|
||||||
set(obs-websocket_HEADERS
|
|
||||||
src/obs-websocket.h
|
|
||||||
src/Config.h
|
|
||||||
src/WebSocketApi.h
|
|
||||||
src/websocketserver/WebSocketServer.h
|
|
||||||
src/websocketserver/types/WebSocketCloseCode.h
|
|
||||||
src/websocketserver/types/WebSocketOpCode.h
|
|
||||||
src/websocketserver/rpc/WebSocketSession.h
|
|
||||||
src/eventhandler/EventHandler.h
|
|
||||||
src/eventhandler/types/EventSubscription.h
|
|
||||||
src/requesthandler/RequestHandler.h
|
|
||||||
src/requesthandler/RequestBatchHandler.h
|
|
||||||
src/requesthandler/types/RequestStatus.h
|
|
||||||
src/requesthandler/types/RequestBatchExecutionType.h
|
|
||||||
src/requesthandler/rpc/Request.h
|
|
||||||
src/requesthandler/rpc/RequestBatchRequest.h
|
|
||||||
src/requesthandler/rpc/RequestResult.h
|
|
||||||
src/forms/SettingsDialog.h
|
|
||||||
src/forms/ConnectInfo.h
|
|
||||||
src/utils/Crypto.h
|
|
||||||
src/utils/Json.h
|
|
||||||
src/utils/Obs.h
|
src/utils/Obs.h
|
||||||
|
src/utils/Obs_VolumeMeter.cpp
|
||||||
src/utils/Obs_VolumeMeter.h
|
src/utils/Obs_VolumeMeter.h
|
||||||
src/utils/Obs_VolumeMeter_Helpers.h
|
src/utils/Obs_VolumeMeter_Helpers.h
|
||||||
|
src/utils/Platform.cpp
|
||||||
src/utils/Platform.h
|
src/utils/Platform.h
|
||||||
|
src/utils/Compat.cpp
|
||||||
src/utils/Compat.h
|
src/utils/Compat.h
|
||||||
src/utils/Utils.h
|
src/utils/Utils.h
|
||||||
lib/obs-websocket-api.h
|
deps/qr/cpp/QrCode.cpp
|
||||||
deps/qr/cpp/QrCode.hpp)
|
deps/qr/cpp/QrCode.hpp)
|
||||||
|
|
||||||
|
target_include_directories(
|
||||||
|
obs-websocket
|
||||||
|
PRIVATE ${Qt5Core_INCLUDES} ${Qt5Widgets_INCLUDES} ${Qt5Svg_INCLUDES}
|
||||||
|
${Qt5Network_INCLUDES} "deps/asio/asio/include" "deps/websocketpp")
|
||||||
|
|
||||||
# Platform-independent build settings
|
target_link_libraries(
|
||||||
add_library(obs-websocket MODULE
|
obs-websocket
|
||||||
${obs-websocket_SOURCES}
|
PRIVATE OBS::libobs
|
||||||
${obs-websocket_HEADERS})
|
OBS::frontend-api
|
||||||
|
Qt::Core
|
||||||
include_directories(
|
Qt::Widgets
|
||||||
"${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api"
|
Qt::Svg
|
||||||
${Qt5Core_INCLUDES}
|
Qt::Network
|
||||||
${Qt5Widgets_INCLUDES}
|
|
||||||
${Qt5Svg_INCLUDES}
|
|
||||||
${Qt5Network_INCLUDES}
|
|
||||||
"${CMAKE_SOURCE_DIR}/deps/asio/asio/include"
|
|
||||||
"${CMAKE_SOURCE_DIR}/deps/websocketpp")
|
|
||||||
|
|
||||||
target_link_libraries(obs-websocket
|
|
||||||
libobs
|
|
||||||
Qt5::Core
|
|
||||||
Qt5::Widgets
|
|
||||||
Qt5::Svg
|
|
||||||
Qt5::Network
|
|
||||||
nlohmann_json::nlohmann_json)
|
nlohmann_json::nlohmann_json)
|
||||||
|
|
||||||
|
target_compile_features(obs-websocket PRIVATE cxx_std_17)
|
||||||
|
|
||||||
|
set_target_properties(obs-websocket PROPERTIES FOLDER "plugins/obs-websocket")
|
||||||
|
|
||||||
if(PLUGIN_TESTS)
|
if(PLUGIN_TESTS)
|
||||||
target_compile_definitions(obs-websocket PRIVATE PLUGIN_TESTS)
|
target_compile_definitions(obs-websocket PRIVATE PLUGIN_TESTS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Random other things
|
||||||
# Windows-specific build settings and tasks
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
if(NOT DEFINED OBS_FRONTEND_LIB)
|
add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
|
||||||
set(OBS_FRONTEND_LIB "OBS_FRONTEND_LIB-NOTFOUND" CACHE FILEPATH "OBS frontend library")
|
|
||||||
message(FATAL_ERROR "Could not find OBS Frontend API's library!")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
# Enable Multicore Builds and disable FH4 (to not depend on VCRUNTIME140_1.DLL)
|
target_compile_options(obs-websocket PRIVATE /wd4267 /wd4996)
|
||||||
add_definitions(/MP /d2FH4-)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
|
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
||||||
set(ARCH_NAME "64bit")
|
|
||||||
set(OBS_BUILDDIR_ARCH "build64")
|
|
||||||
else()
|
else()
|
||||||
set(ARCH_NAME "32bit")
|
target_compile_options(
|
||||||
set(OBS_BUILDDIR_ARCH "build32")
|
obs-websocket
|
||||||
endif()
|
PRIVATE
|
||||||
|
-Wall
|
||||||
include_directories(
|
"$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=format-overflow>"
|
||||||
"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/UI"
|
"$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations>"
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries(obs-websocket
|
|
||||||
"${OBS_FRONTEND_LIB}")
|
|
||||||
|
|
||||||
# Release package helper
|
|
||||||
# The "release" folder has a structure similar OBS' one on Windows
|
|
||||||
set(RELEASE_DIR "${PROJECT_SOURCE_DIR}/release")
|
|
||||||
|
|
||||||
add_custom_command(TARGET obs-websocket POST_BUILD
|
|
||||||
# If config is Release or RelWithDebInfo, package release files
|
|
||||||
COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E make_directory
|
|
||||||
"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}"
|
|
||||||
)
|
|
||||||
|
|
||||||
COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E copy_directory
|
|
||||||
"${PROJECT_SOURCE_DIR}/data"
|
|
||||||
"${RELEASE_DIR}/data/obs-plugins/obs-websocket"
|
|
||||||
)
|
|
||||||
|
|
||||||
COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E copy
|
|
||||||
"$<TARGET_FILE:obs-websocket>"
|
|
||||||
"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}"
|
|
||||||
)
|
|
||||||
|
|
||||||
# In Release or RelWithDebInfo mode, copy Qt image format plugins
|
|
||||||
COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E make_directory
|
|
||||||
"${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats"
|
|
||||||
)
|
|
||||||
COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E copy
|
|
||||||
"${QTDIR}/plugins/imageformats/qicns.dll"
|
|
||||||
"${QTDIR}/plugins/imageformats/qico.dll"
|
|
||||||
"${QTDIR}/plugins/imageformats/qjpeg.dll"
|
|
||||||
"${QTDIR}/plugins/imageformats/qtiff.dll"
|
|
||||||
"${QTDIR}/plugins/imageformats/qwbmp.dll"
|
|
||||||
"${QTDIR}/plugins/imageformats/qwebp.dll"
|
|
||||||
"${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats"
|
|
||||||
)
|
|
||||||
|
|
||||||
# If config is RelWithDebInfo, package PDB file for target
|
|
||||||
COMMAND if $<CONFIG:RelWithDebInfo>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E copy
|
|
||||||
"$<TARGET_PDB_FILE:obs-websocket>"
|
|
||||||
"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}"
|
|
||||||
)
|
|
||||||
|
|
||||||
# In the Debug configuration, copy to obs-studio dev environment for immediate testing
|
|
||||||
COMMAND if $<CONFIG:Debug>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E copy
|
|
||||||
"$<TARGET_FILE:obs-websocket>"
|
|
||||||
"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/obs-plugins/${ARCH_NAME}"
|
|
||||||
)
|
|
||||||
|
|
||||||
COMMAND if $<CONFIG:Debug>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E copy
|
|
||||||
"$<TARGET_PDB_FILE:obs-websocket>"
|
|
||||||
"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/obs-plugins/${ARCH_NAME}"
|
|
||||||
)
|
|
||||||
|
|
||||||
COMMAND if $<CONFIG:Debug>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E make_directory
|
|
||||||
"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/data/obs-plugins/obs-websocket"
|
|
||||||
)
|
|
||||||
|
|
||||||
COMMAND if $<CONFIG:Debug>==1 (
|
|
||||||
"${CMAKE_COMMAND}" -E copy_directory
|
|
||||||
"${PROJECT_SOURCE_DIR}/data"
|
|
||||||
"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/data/obs-plugins/obs-websocket"
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Final CMake helpers
|
||||||
# Linux-specific build settings and tasks
|
setup_plugin_target(obs-websocket)
|
||||||
if(UNIX AND NOT APPLE)
|
setup_target_resources(obs-websocket "obs-plugins/obs-websocket")
|
||||||
include(GNUInstallDirs)
|
|
||||||
|
|
||||||
target_compile_options(obs-websocket PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-missing-field-initializers)
|
|
||||||
|
|
||||||
set_target_properties(obs-websocket PROPERTIES PREFIX "")
|
|
||||||
target_link_libraries(obs-websocket obs-frontend-api)
|
|
||||||
|
|
||||||
# Manually set permissions for locales
|
|
||||||
file(GLOB locale_files data/locale/*.ini)
|
|
||||||
set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
|
|
||||||
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
|
|
||||||
|
|
||||||
# Manually set file permissions for binary
|
|
||||||
install(TARGETS obs-websocket LIBRARY
|
|
||||||
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins"
|
|
||||||
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
|
|
||||||
|
|
||||||
# OBS on Ubuntu installs into a different directory than most linux distros
|
|
||||||
if(${USE_UBUNTU_FIX})
|
|
||||||
install(TARGETS obs-websocket LIBRARY
|
|
||||||
DESTINATION "/usr/lib/obs-plugins"
|
|
||||||
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
install(FILES ${locale_files}
|
|
||||||
DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/obs-websocket/locale")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# MacOS-specific build settings and tasks
|
|
||||||
if(APPLE)
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fvisibility=default")
|
|
||||||
|
|
||||||
set(CMAKE_SKIP_RPATH TRUE)
|
|
||||||
set_target_properties(obs-websocket PROPERTIES PREFIX "")
|
|
||||||
target_link_libraries(obs-websocket "${OBS_FRONTEND_LIB}")
|
|
||||||
endif()
|
|
||||||
|
39
README.md
39
README.md
@ -1,3 +1,5 @@
|
|||||||
|
<!-- markdownlint-disable no-inline-html -->
|
||||||
|
|
||||||
# obs-websocket
|
# obs-websocket
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
@ -6,19 +8,20 @@
|
|||||||
|
|
||||||
WebSocket API for OBS Studio.
|
WebSocket API for OBS Studio.
|
||||||
|
|
||||||
[](https://github.com/obs-websocket/obs-websocket/actions/workflows/main.yml)
|
|
||||||
[](https://discord.gg/WBaSQ3A)
|
[](https://discord.gg/WBaSQ3A)
|
||||||
[](https://opencollective.com/obs-websocket-dev)
|
[](https://opencollective.com/obs-websocket-dev)
|
||||||
|
|
||||||
## Downloads
|
## Downloads
|
||||||
|
|
||||||
Binaries for Windows, MacOS, and Linux are available in the [Releases](https://github.com/obsproject/obs-websocket/releases) section.
|
obs-websocket is now included by default with OBS Studio 28.0.0 and above. As such, **there should be no need to download obs-websocket if you have OBS Studio > 28.0.0.**
|
||||||
|
|
||||||
|
Binaries **for OBS Studio < 28.0.0** on Windows, MacOS, and Linux are available in the [Releases](https://github.com/obsproject/obs-websocket/releases) section.
|
||||||
|
|
||||||
## Using obs-websocket
|
## Using obs-websocket
|
||||||
|
|
||||||
It is **highly recommended** to protect obs-websocket with a password against unauthorized control. To do this, open the "Websocket server settings" dialog under OBS' "Tools" menu. In the settings dialogs, you can enable or disable authentication and set a password for it.
|
It is **highly recommended** to keep obs-websocket protected with a password against unauthorized control. obs-websocket generates a password for you automatically when you load it for the first time. To change this, open the "obs-websocket Settings" dialog under OBS' "Tools" menu. In the settings dialog, you can enable or disable authentication and set a password for it.
|
||||||
|
|
||||||
(Psst. You can use `--websocket_port`(value), `--websocket_password`(value), and `--websocket_debug`(flag) on the command line to override the configured values.)
|
(Psst. You can use `--websocket_port`(value), `--websocket_password`(value), `--websocket_debug`(flag) and `--websocket_ipv4_only`(flag) on the command line to override the configured values.)
|
||||||
|
|
||||||
### Possible use cases
|
### Possible use cases
|
||||||
|
|
||||||
@ -27,18 +30,36 @@ It is **highly recommended** to protect obs-websocket with a password against un
|
|||||||
- Automate scene switching with a third-party program (e.g. : auto-pilot, foot pedal, ...)
|
- Automate scene switching with a third-party program (e.g. : auto-pilot, foot pedal, ...)
|
||||||
|
|
||||||
### Client software
|
### Client software
|
||||||
- (No known clients supporting 5.0.0 at the moment. Send a message in Discord if you have one!)
|
|
||||||
|
- [Macro Deck](https://www.macrodeck.org/)
|
||||||
|
- [Touch Portal](https://www.touch-portal.com/)
|
||||||
|
- [Twitchat](https://twitchat.fr/)
|
||||||
|
- [OBS-web](https://github.com/Niek/obs-web) - hosted client at [obs-web.niek.tv/](http://obs-web.niek.tv/)
|
||||||
|
- [Streamer.bot](https://streamer.bot/)
|
||||||
|
- [Deckboard](https://deckboard.app/)
|
||||||
|
- [OBS Blade](https://github.com/Kounex/obs_blade)
|
||||||
|
- [Aitum](https://aitum.tv/)
|
||||||
|
- [Kruiz Control](https://github.com/Kruiser8/Kruiz-Control)
|
||||||
|
- [Bitfocus Companion Module](https://bitfocus.io/companion/)
|
||||||
|
|
||||||
### Client libraries (for developers)
|
### Client libraries (for developers)
|
||||||
|
|
||||||
Here's a list of available language APIs for obs-websocket:
|
Here's a list of available language APIs for obs-websocket:
|
||||||
- Python 3.7+ (Asyncio): [simpleobsws](https://github.com/IRLToolkit/simpleobsws/tree/master) by IRLToolkit
|
|
||||||
- Rust: [obws](https://github.com/dnaka91/obws/tree/v5-api) by dnaka91
|
|
||||||
|
|
||||||
The server is a typical Websockets server running by default on port 4444 (the port number can be changed in the Settings dialog under `Tools`).
|
- Python 3.7+ (Asyncio): [simpleobsws](https://github.com/IRLToolkit/simpleobsws/tree/master) by IRLToolkit
|
||||||
|
- Python 3.10+ (Non-Asyncio): [obsws-python](https://pypi.org/project/obsws-python) by aatikturk and onyx-and-iris
|
||||||
|
- Rust: [obws](https://github.com/dnaka91/obws) by dnaka91
|
||||||
|
- Godot 3.4.x: [obs-websocket-gd](https://github.com/you-win/obs-websocket-gd) by you-win
|
||||||
|
- Javascript (Node and web): [obs-websocket-js](https://github.com/obs-websocket-community-projects/obs-websocket-js) by OBS Websocket Community
|
||||||
|
- C (uses obs-websocket-js): [v8-libwebsocket-obs-websocket](https://github.com/dgatwood/v8-libwebsocket-obs-websocket)
|
||||||
|
- Go: [goobs](https://github.com/andreykaipov/goobs) by andreykaipov
|
||||||
|
- Dart/Flutter (can target all supported platforms): [obs_websocket](https://github.com/faithoflifedev/obs_websocket) by faithoflifedev
|
||||||
|
- Java: [obs-websocket-java](https://github.com/obs-websocket-community-projects/obs-websocket-java) by OBS Websocket Community
|
||||||
|
|
||||||
|
The 5.x server is a typical WebSocket server running by default on port 4455 (the port number can be changed in the Settings dialog under `Tools`).
|
||||||
The protocol we use is documented in [PROTOCOL.md](docs/generated/protocol.md).
|
The protocol we use is documented in [PROTOCOL.md](docs/generated/protocol.md).
|
||||||
|
|
||||||
We'd like to know what you're building with or for obs-websocket. If you do something in this fashion, feel free to drop a message in `#project-showoff` in the [discord server!](https://discord.gg/WBaSQ3A)
|
We'd like to know what you're building with obs-websocket! If you do something in this fashion, feel free to drop a message in `#project-showoff` in the [discord server!](https://discord.gg/WBaSQ3A)
|
||||||
|
|
||||||
## Contributors
|
## Contributors
|
||||||
|
|
||||||
|
@ -1,107 +0,0 @@
|
|||||||
# This module can be copied and used by external plugins for OBS
|
|
||||||
#
|
|
||||||
# Once done these will be defined:
|
|
||||||
#
|
|
||||||
# LIBOBS_FOUND
|
|
||||||
# LIBOBS_INCLUDE_DIRS
|
|
||||||
# LIBOBS_LIBRARIES
|
|
||||||
|
|
||||||
find_package(PkgConfig QUIET)
|
|
||||||
if (PKG_CONFIG_FOUND)
|
|
||||||
pkg_check_modules(_OBS QUIET obs libobs)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
||||||
set(_lib_suffix 64)
|
|
||||||
else()
|
|
||||||
set(_lib_suffix 32)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(DEFINED CMAKE_BUILD_TYPE)
|
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
|
||||||
set(_build_type_base "debug")
|
|
||||||
else()
|
|
||||||
set(_build_type_base "release")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_path(LIBOBS_INCLUDE_DIR
|
|
||||||
NAMES obs.h
|
|
||||||
HINTS
|
|
||||||
ENV obsPath${_lib_suffix}
|
|
||||||
ENV obsPath
|
|
||||||
${obsPath}
|
|
||||||
PATHS
|
|
||||||
/usr/include /usr/local/include /opt/local/include /sw/include
|
|
||||||
PATH_SUFFIXES
|
|
||||||
libobs
|
|
||||||
)
|
|
||||||
|
|
||||||
function(find_obs_lib base_name repo_build_path lib_name)
|
|
||||||
string(TOUPPER "${base_name}" base_name_u)
|
|
||||||
|
|
||||||
if(DEFINED _build_type_base)
|
|
||||||
set(_build_type_${repo_build_path} "${_build_type_base}/${repo_build_path}")
|
|
||||||
set(_build_type_${repo_build_path}${_lib_suffix} "${_build_type_base}${_lib_suffix}/${repo_build_path}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_library(${base_name_u}_LIB
|
|
||||||
NAMES ${_${base_name_u}_LIBRARIES} ${lib_name} lib${lib_name}
|
|
||||||
HINTS
|
|
||||||
ENV obsPath${_lib_suffix}
|
|
||||||
ENV obsPath
|
|
||||||
${obsPath}
|
|
||||||
${_${base_name_u}_LIBRARY_DIRS}
|
|
||||||
PATHS
|
|
||||||
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
|
|
||||||
PATH_SUFFIXES
|
|
||||||
lib${_lib_suffix} lib
|
|
||||||
libs${_lib_suffix} libs
|
|
||||||
bin${_lib_suffix} bin
|
|
||||||
../lib${_lib_suffix} ../lib
|
|
||||||
../libs${_lib_suffix} ../libs
|
|
||||||
../bin${_lib_suffix} ../bin
|
|
||||||
# base repo non-msvc-specific search paths
|
|
||||||
${_build_type_${repo_build_path}}
|
|
||||||
${_build_type_${repo_build_path}${_lib_suffix}}
|
|
||||||
build/${repo_build_path}
|
|
||||||
build${_lib_suffix}/${repo_build_path}
|
|
||||||
# base repo msvc-specific search paths on windows
|
|
||||||
build${_lib_suffix}/${repo_build_path}/Debug
|
|
||||||
build${_lib_suffix}/${repo_build_path}/RelWithDebInfo
|
|
||||||
build/${repo_build_path}/Debug
|
|
||||||
build/${repo_build_path}/RelWithDebInfo
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
find_obs_lib(LIBOBS libobs obs)
|
|
||||||
|
|
||||||
if(MSVC)
|
|
||||||
find_obs_lib(W32_PTHREADS deps/w32-pthreads w32-pthreads)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
find_package_handle_standard_args(Libobs DEFAULT_MSG LIBOBS_LIB LIBOBS_INCLUDE_DIR)
|
|
||||||
mark_as_advanced(LIBOBS_INCLUDE_DIR LIBOBS_LIB)
|
|
||||||
|
|
||||||
if(LIBOBS_FOUND)
|
|
||||||
if(MSVC)
|
|
||||||
if (NOT DEFINED W32_PTHREADS_LIB)
|
|
||||||
message(FATAL_ERROR "Could not find the w32-pthreads library" )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(W32_PTHREADS_INCLUDE_DIR ${LIBOBS_INCLUDE_DIR}/../deps/w32-pthreads)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR})
|
|
||||||
set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB})
|
|
||||||
include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake)
|
|
||||||
|
|
||||||
# allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg)
|
|
||||||
if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES)
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${LIBOBS_INCLUDE_DIR}/../cmake/Modules/")
|
|
||||||
set(INCLUDED_LIBOBS_CMAKE_MODULES true)
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
message(FATAL_ERROR "Could not find the libobs library" )
|
|
||||||
endif()
|
|
43
data/locale/ar-SA.ini
Normal file
43
data/locale/ar-SA.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="التحكم عن بعد في استوديو OBS من خلال WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="إعدادات obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="إعدادات الإضافات"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="تمكين خادم WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="تمكين تنبيهات شريط النظام"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="تمكين سجلات التصحيح"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="تمكين تسجيل التصحيح للجلسة الحالية لـ OBS. لا تستمر عند اعادة الفتح.\nاستخدم --websocket_debug للتفعيل عند فتح البرنامج."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="إعدادات الخادم"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="تمكين المصادقة"
|
||||||
|
OBSWebSocket.Settings.Password="كلمة مرور الخادم"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="إنشاء كلمة مرور"
|
||||||
|
OBSWebSocket.Settings.ServerPort="منفذ الخادم"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="إظهار معلومات الاتصال"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="تحذير: البث المباشر جاري"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="يبدو أن المخرجات (البث والتسجيل الخ) نشطة حاليا."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="هل أنت متأكد من أنك تريد إظهار معلومات الاتصال الخاصة بك؟"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="تحذير: مشكلة أمان محتملة"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="يخزن obs-websocket كلمة مرور الخادم كنص عادي. يوصى بشدة استخدام كلمة المرور التي تم إنشاؤها من قبل obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="هل أنت متأكد من أنك تريد استخدام كلمة المرور الخاصة بك؟"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="خطأ:إعدادات غير صالحة"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="يجب عليك استخدام كلمة مرور تتكون من 6 أحرف أو أكثر."
|
||||||
|
OBSWebSocket.SessionTable.Title="جلسات WebSocket متصلة"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="العنوان البعيد"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="مدة الجلسة"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="الرسائل الداخلة/الخارجة"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="المعرِّف"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="طرد؟"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="طرد"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="معلومات اتصال WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="نسخ"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="عنوان IP الخادم (أفضل تخمين)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="منفذ الخادم"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="كلمة مرور الخادم"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[تم تعطيل المصادقة]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR الاتصال"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="اتصال WebSocket جديد"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="تم تحديد العميل %1."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="فشل مصادقة WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="فشل العميل %1 في المصادقة."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="تم قطع اتصال عميل WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="العميل %1 قطع الاتصال."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="فشل خادم WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="فشل تشغيل خادم WebSocket. قد يكون منفذ TCP %1 قيد الاستخدام في تطبيق آخر على هذا النظام. حاول تعيين منفذ TCP مختلف في إعدادات خادم WebSocket، أو إيقاف أي تطبيق يمكن أن يستخدم هذا المنفذ.\n رسالة الخطأ: %2"
|
43
data/locale/ca-ES.ini
Normal file
43
data/locale/ca-ES.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Control remot de l'OBS Studio mitjançant un servidor web"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Configuració del servidor web de l'OBS"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Configuració del complement"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Habilita el servidor web"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Habilita les notificacions a la barra de tasques"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Habilita l'informe de depuració"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Habilita l'informe de depuració només per a la instància actual de l'OBS i no queda resident en inicis posteriors.\nUtilitzeu --websocket_debug si us cal que el canvi sigui persistent."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Configuració del servidor"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Habilita l'autenticació"
|
||||||
|
OBSWebSocket.Settings.Password="Contrasenya del servidor"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Genera una contrasenya"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Port del servidor"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Mostra la informació de connexió"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Atenció: Actualment en directe"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Sembla que una sortida (retransmissió, gravació, etc.) està actualment activa."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Segur que voleu mostrar la vostra informació de connexió?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Atenció: Risc potencial de seguretat"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="El servidor web del l'OBS (obs-websocket) emmagatzema la contrasenya del servidor com a text pla. És altament recomanable l'ús d'una contrasenya generada automàticament."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Segur que voleu utilitzar la vostra contrasenya?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Error: Configuració no vàlida"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Utilitzeu una contrasenya de 6 o més caràcters."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sessions de servidor connectades"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Adreça remota"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durada de la sessió"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Missatges d'entrada/sortida"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificat"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsió?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Expulsa"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informació de connexió del servidor Web (WebSocket)"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Copia"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Adreça IP (més acurada)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Port"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Contrasenya"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autenticació inhabilitada]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR de la connexió"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Connexió nova de servidor Web (WebSocket)"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Client %1 identificat."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ha fallat l'autenticació del servidor Web"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Ha fallat l'autenticació del client %1."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Client desconnectat del servidor Web"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 desconnectat."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Ha fallat el servidor Web (WebSocket)"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="El servidor Web ha fallat en iniciar. Potser el port TCP %1 ja està en ús per altre programa del sistema. Proveu un port diferent a la configuració del servidor Web (WebSocket), o atureu qualsevol altra aplicació que pugui utilitzar aquest port.\n Missatge d'error: %2"
|
43
data/locale/cs-CZ.ini
Normal file
43
data/locale/cs-CZ.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Vzdálené ovládání OBS Studia přes WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Nastavení obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Nastavení pluginu"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Povolit WebSocketový server"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Povolit upozornění v systémové liště"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Povolit podrobné protokolování"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Zapne podrobné protokolování pro aktuální instanci OBS. Nastavení není zachováno mezi spuštěními.\nPoužijte --websocket_debug pro povlení při spuštění."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Nastavení serveru"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Povolit přihlašování"
|
||||||
|
OBSWebSocket.Settings.Password="Heslo serveru"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Vygenerovat heslo"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Port serveru"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Zobrazit info o připojení"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varování: Aktuálně vysíláte"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Vypadá to, že výstup (vysílání, nahrávání etc.) je právě aktivní."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Opravdu si přejete zobrazit údaje k připojení?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Varování: Potencionální bezpečnostní problém"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket ukládá heslo jako prostý text. Důrazně doporučujeme použití hesla generovaného pomocí obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Opravdu si přejete použít vaše vlastní heslo?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Chyba: Neplatná konfigurace"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Musíte použít heslo o délce nejméně 6 znaků."
|
||||||
|
OBSWebSocket.SessionTable.Title="Připojené relace WebSocketu"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Vzdálená adresa"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Délka relace"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Zprávy do/z"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identifikované"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Vykopnout?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Vykopnout"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Připojení k WebSocket serveru"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopírovat"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP adresa serveru (nejlepší odhad)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Port serveru"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Heslo serveru"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Přihlášení zakázáno]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR pro připojení"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nové WebSocket připojení"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klient %1 identifikován."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Chyba přihlášení k WebSocketu"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Klient %1 nebyl přihlášen"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket klient se odpojil"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Klient %1 se odpojil."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Chyba WebSocket serveru"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket server se nepodařilo spustit. TCP port %1 může být používán jinou aplikací. Zkuste nastavit jiný TCP port v nastavení WebSocket serveru nebo zavřete aplikaci, která může používat tento port.\n Chybová zpráva: %2"
|
43
data/locale/da-DK.ini
Normal file
43
data/locale/da-DK.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Fjernstyring af OBS Studio via WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket Indstillinger"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Plugin-indstillinger"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Aktivér WebSocket-server"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Aktivér Systembakke Alarmer"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Aktivér Fejlfindingslogning"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Aktivér fejlfindingslogning for den aktuelle forekomst af OBS. Vedvarer ikke ved indlæsning.\nBrug --websocket_debug til at aktivere ved indlæsning."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Serverindstillinger"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Aktivér godkendelse"
|
||||||
|
OBSWebSocket.Settings.Password="Serveradgangskode"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Generér adgangskode"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Serverport"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Vis forbindelsesinfo"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Advarsel: Live i øjeblikket"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Det ser ud til, at et output (stream, optagelse mv.) pt. er aktiv."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sikker på, at din forbindelsesinfo skal vises?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Advarsel: Potentielt sikkerhedsproblem"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket gemmer serverens adgangskode som alm. tekst. Det anbefales kraftigt at bruge en adgangskode genereret af obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Sikker på, at din egen adgangskoder skal bruges?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Fejl: Ugyldig opsætning"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="En adgangskode på mindst 6 tegn skal bruges."
|
||||||
|
OBSWebSocket.SessionTable.Title="Forbundne WebSocket-sessioner"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Fjernadresse"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Sessionsvarighed"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Beskeder Ind/Ud"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificeret"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Fjern?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Fjern"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket-forbindelsesinfo"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopiér"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Server-IP (bedste gæt)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Serverport"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Serveradgangskode"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Godk. deaktiveret]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Forbindelses-QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Ny WebSocket-forbindelse"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klient %1 identificeret."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket godkendelsesfejl"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Klienten %1 kunne ikke godkendes."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-klient frakoblet"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Klient %1 frakoblet."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket-serverfejl"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket-serveren started ikke. TCP-port %1 bruges måske allerede på dette system af et andet program. Prøv at angive en anden TCP-port i WebSocket-serverindstillingerne, eller stop ethvert program, der kan bruge denne port.\n Fejlmeddelelse: %2"
|
43
data/locale/de-DE.ini
Normal file
43
data/locale/de-DE.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="OBS Studio per WebSocket fernsteuern"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket-Einstellungen"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Plugineinstellungen"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocket-Server aktivieren"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Warnungen im Infobereich aktivieren"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Debug-Logging aktivieren"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Aktiviert Debug-Logging für die aktuelle OBS-Instanz.\nVerwenden Sie „--websocket_debug“, damit die Option beim Laden aktiviert wird."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Servereinstellungen"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Authentifizierung aktivieren"
|
||||||
|
OBSWebSocket.Settings.Password="Serverpasswort"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Passwort generieren"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Serverport"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Verbindungsinformationen anzeigen"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Achtung: Zurzeit live"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Derzeit ist eine Ausgabe (Stream, Aufnahme, etc.) aktiv."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Möchten Sie wirklich Ihre Verbindungsinformationen anzeigen?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Achtung: Mögliches Sicherheitsproblem"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket speichert das Serverpasswort unverschlüsselt, daher ist ein von obs-websocket generiertes Passwort sehr zu empfehlen."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Möchten Sie wirklich ein eigenes Passwort verwenden?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Fehler: Ungültige Konfiguration"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Sie müssen ein Passwort mit mindestens 6 Zeichen verwenden."
|
||||||
|
OBSWebSocket.SessionTable.Title="Verbundene WebSocket-Sitzungen"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Remote-Adresse"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Sitzungsdauer"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Nachrichten rein/raus"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identifiziert"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Entfernen?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Entfernen"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket-Verbindungsinformationen"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopieren"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Server-IP (geschätzt)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Serverport"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Serverpasswort"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Authentifizierung deaktiviert"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR-Code zum Verbinden"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Neue WebSocket-Verbindung"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Client %1 identifiziert."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket-Authentifizierungsfehler"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Client %1 konnte sich nicht authentifizieren."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-Client getrennt"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 getrennt."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket-Serverfehler"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Der WebSocket-Server konnte nicht gestartet werden, da der TCP-Port %1 möglicherweise benutzt wird. Versuchen Sie, den Port in den WebSocket-Servereinstellungen zu ändern oder Anwendungen zu schließen, die diesen verwenden könnten.\nFehler: %2"
|
@ -1,6 +1,6 @@
|
|||||||
OBSWebSocket.Plugin.Description="Remote-control of OBS Studio through WebSocket"
|
OBSWebSocket.Plugin.Description="Remote-control of OBS Studio through WebSocket"
|
||||||
|
|
||||||
OBSWebSocket.Settings.DialogTitle="obs-websocket Settings"
|
OBSWebSocket.Settings.DialogTitle="WebSocket Server Settings"
|
||||||
|
|
||||||
OBSWebSocket.Settings.PluginSettingsTitle="Plugin Settings"
|
OBSWebSocket.Settings.PluginSettingsTitle="Plugin Settings"
|
||||||
OBSWebSocket.Settings.ServerEnable="Enable WebSocket server"
|
OBSWebSocket.Settings.ServerEnable="Enable WebSocket server"
|
||||||
|
43
data/locale/es-ES.ini
Normal file
43
data/locale/es-ES.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Control remoto de OBS Studio a través de WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Ajustes de obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Ajustes del plugin"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Habilitar servidor WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Habilitar alertas en la bandeja del sistema"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Habilitar registro de depuración"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Habilita el registro de depuración para la instancia actual de OBS. No persiste al cargar.\nUse --websocket_debug para activar al cargar."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Ajustes del servidor"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Habilitar autenticación"
|
||||||
|
OBSWebSocket.Settings.Password="Contraseña del servidor"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Generar contraseña"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Puerto del servidor"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Mostrar información de conexión"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Advertencia: Actualmente en directo"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Parece que una salida (emisión, grabación, etc.) está activa."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="¿Estás seguro de que quieres mostrar tu información de conexión?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Advertencia: Problema potencial de seguridad"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket almacena la contraseña del servidor como texto plano. El uso de una contraseña generada por obs-websocket es altamente recomendable."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="¿Está seguro de que desea utilizar su propia contraseña?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Error: Configuración no válida"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Debe utilizar una contraseña de 6 o más caracteres."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sesiones conectadas de WebSocket"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Dirección remota"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Duración de la sesión"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Entrada/Salida de mensajes"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificado"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="¿Expulsar?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Expulsar"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Información de conexión de WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Copiar"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP del servidor (mejor propuesta)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Puerto del servidor"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Contraseña del servidor"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autenticación desactivada]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR de conexión"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nueva conexión WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Cliente %1 identificado."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Fallo de autenticación WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="El cliente %1 no se pudo autenticar."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Cliente WebSocket desconectado"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Cliente %1 desconectado."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Fallo del servidor WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="El servidor WebSocket no pudo iniciarse. El puerto TCP %1 puede que ya esté en uso en otro lugar de este sistema por otra aplicación. Intente configurar un puerto TCP diferente en la configuración del servidor WebSocket o detenga cualquier aplicación que pueda estar usando este puerto.\n Mensaje de error: %2"
|
43
data/locale/et-EE.ini
Normal file
43
data/locale/et-EE.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="OBS Studio kaugjuhtimine WebSocketi kaudu"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket seaded"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Plugina seaded"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Luba WebSocket server"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Luba hoiatused tegumireal"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Luba silumislogimine"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Lubab OBS-i praeguse eksemplari silumislogimise. Ei püsi laadimisel.\nLaadimisel lubamiseks kasutage --websocket_debug."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Serveri seaded"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Luba autentimine"
|
||||||
|
OBSWebSocket.Settings.Password="Serveri salasõna"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Loo salasõna"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Serveri port"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Näita ühenduse infot"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Hoiatus: hetkel otseülekandes"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Näib, et väljund (voogedastus, salvestus jne) on hetkel aktiivne."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Kas oled kindel, et soovid oma ühenduse teavet näidata?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Hoiatus: võimalik turvaprobleem"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket salvestab serveri salasõna lihtsa tekstina. obs-websocket'i poolt loodud salasõna kasutamine on väga soovitatav."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Kas oled kindel, et soovid kasutada oma salasõna?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Viga: vigane konfiguratsioon"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Pead kasutama salasõna, mis koosneb 6 või enamast tähemärgist."
|
||||||
|
OBSWebSocket.SessionTable.Title="Ühendatud WebSocket'i seansid"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Kaugjuhtimise aadress"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Seansi kestvus"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Sõnumid sisse/välja"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Tuvastatud"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Eemalda?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Eemalda"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket'i ühenduse info"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopeeri"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Serveri IP (parim oletus)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Sreveri port"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Serveri salasõna"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autentimine keelatud]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Ühenda QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Uus WebSocket'i ühendus"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klient %1 tuvastatud."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket autentimise tõrge"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Kliendi %1 autentimine ebaõnnestus."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket kliendi ühendus katkenud"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Kliendi %1 ühendus katkenud."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket serveri tõrge"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket'i serveri käivitamine ebaõnnestus. TCP-port %1 võib olla juba mujal selles süsteemis mõne teise rakenduse poolt kasutusel. Proovige määrata WebSocket'i serveri seadetes teine TCP-port või peatada rakendus, mis võib seda porti kasutada.\n Veateade: %2"
|
43
data/locale/fa-IR.ini
Normal file
43
data/locale/fa-IR.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="کنترل از راه دور OBS Studio از طریق WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="تنظیمات obs-سوکت وب"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="تنظیمات پلاگین"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="سرور سوکت وب را فعال کنید"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="هشدارهای سینی سیستم را فعال کنید"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="فعال کردن گزارش اشکال زدایی"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="ثبت اشکال زدایی را برای نمونه فعلی OBS فعال می کند. در بارگذاری ادامه نمییابد.\n برای فعال کردن در بارگذاری از --websocket_debug استفاده کنید."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="تنظیمات سرور"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="فعال کردن احراز هویت"
|
||||||
|
OBSWebSocket.Settings.Password="رمز سرور"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="ایجاد رمز عبور"
|
||||||
|
OBSWebSocket.Settings.ServerPort="پورت سرور"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="نمایش اطلاعات اتصال"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="هشدار: در حال حاضر زنده است"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="به نظر می رسد که یک خروجی (جریان، ضبط و غیره) در حال حاضر فعال است."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="آیا مطمئن هستید که می خواهید اطلاعات اتصال خود را نشان دهید؟"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="هشدار: مشکل امنیتی احتمالی"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket رمز عبور سرور را به صورت متن ساده ذخیره می کند. استفاده از رمز عبور تولید شده توسط obs-websocket بسیار توصیه می شود."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="آیا مطمئن هستید که می خواهید از رمز عبور خود استفاده کنید؟"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="خطا: پیکربندی نامعتبر است"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="باید از رمز عبور 6 کاراکتر یا بیشتر استفاده کنید."
|
||||||
|
OBSWebSocket.SessionTable.Title="جلسات سوکت وب متصل"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="آدرس از راه دور"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="مدت زمان جلسه"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="پیام های ورودی/خارجی"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="تایید هویت شده"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="لگد زدن؟"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="اخراج"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="اطلاعات اتصال سوکت وب"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="رونوشت"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP سرور (بهترین حدس)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="پورت سرور"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="رمز سرور"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[احراز غیر فعال]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR را وصل کنید"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="اتصال سوکت وب جدید"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="سرویس گیرنده %1 شناسایی شد."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="خرابی تأیید اعتبار سوکت وب"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="سرویس گیرنده %1 احراز هویت نشد."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="سرویس گیرنده سوکت وب قطع شد"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="سرویس گیرنده %1 قطع شد."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="خرابی سرور سوکت وب"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="سرور WebSocket راهاندازی نشد. درگاه TCP % 1 ممکن است قبلاً در جای دیگری در این سیستم توسط برنامه دیگری استفاده شده باشد. یک پورت TCP دیگر را در تنظیمات سرور WebSocket تنظیم کنید، یا هر برنامهای را که میتواند از این پورت استفاده کند متوقف کنید.\n پیام خطا: %2"
|
43
data/locale/fi-FI.ini
Normal file
43
data/locale/fi-FI.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="OBS Studion etähallinta WebSocketin kautta"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocketin asetukset"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Liitännäisen asetukset"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Ota WebSocket-palvelin käyttöön"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Ota ilmoitusalueen ilmoitukset käyttöön"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Ota vianjäljityslokitus käyttöön"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Ottaa käyttöön OBS:n virheenkorjauksen lokin. Ei kuormituksen aikana.\nKäytä --websocket_debug ottaaksesi latauksen käyttöön."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Palvelimen asetukset"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Ota tunnistautuminen käyttöön"
|
||||||
|
OBSWebSocket.Settings.Password="Palvelimen salasana"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Luo salasana"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Palvelimen portti"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Näytä yhteyden tiedot"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varoitus: Suora lähetys"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Näyttää siltä, että jokin lähetys (suoratoisto, tallennus jne.) on tällä hetkellä aktiivinen."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Oletko varma, että haluat näyttää sinun yhteyden tiedot?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Varoitus: Mahdollinen tietoturvaongelma"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket tallentaa palvelimen salasanan pelkkänä tekstinä. Obs-websocketin luoman salasanan käyttäminen on erittäin suositeltavaa."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Haluatko varmasti käyttää omaa salasanaasi?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Virhe: Virheellinen määritys"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Sinun täytyy käyttää salasanaa, jossa on vähintään 6 merkkiä."
|
||||||
|
OBSWebSocket.SessionTable.Title="Yhdistetyt WebSocket-istunnot"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Etäosoite"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Istunnon kesto"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Viestejä sisään/ulos"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Tunnistettu"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Potki?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Potki"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket-yhteystiedot"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopioi"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Palvelimen IP (paras arvaus)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Palvelimen portti"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Palvelimen salasana"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Todennus poistettu]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Yhdistä QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Uusi WebSocket-yhteys"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Asiakas %1 tunnistettu."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket-tunnistusvirhe"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Asiakas %1 todennus epäonnistui."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-asiakas katkaisi yhteyden"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Asiakas %1 on katkaistu."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket-palvelinvirhe"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket-palvelin ei käynnistynyt. TCP-portti %1 saattaa olla jo toisen sovelluksen käytössä. Yritä määrittää toinen TCP-portti WebSocket-palvelimen asetuksissa tai lopeta kaikki sovellukset, jotka saattavat käyttää tätä porttia.\nVirheilmoitus: %2"
|
43
data/locale/fr-FR.ini
Normal file
43
data/locale/fr-FR.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Contrôle à distance d'OBS Studio via WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Paramètre du websocket obs"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Paramètres du plugin"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Activer le serveur WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Activer les alertes de la zone de notification"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Activer les journaux de débogage"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Active la journalisation du débogage pour l'instance actuelle d'OBS. Ne persiste pas au chargement.\nUtilisez --websocket_debug pour l'activer lors du chargement."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Paramètres du serveur"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Utiliser l'authentification"
|
||||||
|
OBSWebSocket.Settings.Password="Mot de passe du serveur"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Générer un mot de passe"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Port du serveur"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Afficher les informations de connexion"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Avertissement : Actuellement en direct"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Il semble qu'une sortie (stream, enregistrement, etc.) soit actuellement active."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Êtes-vous sûr de vouloir afficher vos informations de connexion ?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Avertissement : Problème potentiel de sécurité"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket enregistre le mot de passe du serveur en texte brut. L'utilisation d'un mot de passe généré par obs-websocket est fortement recommandée."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Êtes-vous sûr de vouloir utiliser votre propre mot de passe ?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Erreur : Configuration invalide"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Vous devez utiliser un mot de passe d'au moins 6 caractères"
|
||||||
|
OBSWebSocket.SessionTable.Title="Sessions WebSocket connectées"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Adresse distante"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durée de session"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Messages entrant/sortant"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identifié"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulser ?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Expulser"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informations de connexion WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Copier"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP du serveur (meilleure estimation)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Port serveur"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Mot de passe serveur"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Authentification désactivée]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR code de connexion"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nouvelle connexion WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Client %1 identifié."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Échec de l'authentification WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Échec d'authentification du client %1."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Client WebSocket déconnecté"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 déconnecté."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Échec du serveur WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Le serveur WebSocket n'a pas pu démarrer. Le port TCP %1 est peut être déjà utilisé par une autre application ailleurs sur ce système. Essayez de définir un port TCP différent dans les paramètres du serveur WebSocket, ou arrêtez toute application qui pourrait utiliser ce port.\n Message d'erreur : %2"
|
43
data/locale/he-IL.ini
Normal file
43
data/locale/he-IL.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="שליטה מרחוק על OBS Studio באמצעות WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="הגדרות obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="הגדרות תוסף"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="הפעלת שרת WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="הפעלת התראות במגש המערכת"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="הפעלת לוג איתור באגים"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="מאפשר לוג איתור באגים עבור ההפעלה הנוכחית של OBS. לא ממשיך לפעול בעת הפעלה.\nיש להשתמש ב --websocket_debug בכדי לאפשר בעת ההפעלה."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="הגדרות שרת"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="שימוש באימות"
|
||||||
|
OBSWebSocket.Settings.Password="סיסמת שרת"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="יצירת סיסמה"
|
||||||
|
OBSWebSocket.Settings.ServerPort="פורט שרת"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="הצגת מידע חיבור"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="אזהרה: שידור חי פעיל"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="נראה כי פלט (שידור חי, הקלטה וכו') פעיל כרגע."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="האם ברצונך להציג את המידע על החיבור שלך?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="אזהרה: בעיית אבטחה אפשרית"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket שומר את סיסמת השרת שלך כטקסט רגיל. מומלץ להשתמש בסיסמה שנוצרה ע\"י obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="האם ברצונך להשתמש בסיסמה שלך?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="שגיאה: תצורה לא חוקית"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="חובה להשתמש בסיסמה עם 6 תווים או יותר."
|
||||||
|
OBSWebSocket.SessionTable.Title="הפעלות WebSocket מחוברות"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="כתובת מרוחקת"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="משך זמן הפעלה"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="הודעות פנים/חוץ"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="מזוהים"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="בעט?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="בעט"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="מידע חיבור WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="העתקה"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="כתובת IP שרת (הניחוש המוצלח ביותר)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="פורט שרת"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="סיסמת שרת"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[אימות מושבת]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="חיבור QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="חיבור WebSocket חדש"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="לקוח %1 זוהה."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="אימות WebSocket נכשל"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="לקוח %1 נכשל באימות"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="לקוח WebSocket התנתק"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="לקוח %1 התנתק."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="שגיאת שרת WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="שרת ה-WebSocket נכשל בהפעלה. ייתכן שפורט TCP %1 כבר נמצא בשימוש במקום אחר במערכת זו על ידי יישום אחר. יש לנסות להגדיר פורט TCP אחר בהגדרות שרת WebSocket, או לעצור כל יישום שעשוי להשתמש בפורט זה.\nהודעת שגיאה: %2"
|
43
data/locale/hi-IN.ini
Normal file
43
data/locale/hi-IN.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="WebSocket के माध्यम से OBS स्टूडियो का रिमोट-कंट्रोल"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket सेटिंग्स"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="प्लगइन सेटिंग्स"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocket सर्वर सक्षम करें"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="सिस्टम ट्रे अलर्ट सक्षम करें"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="डिबग लॉगिंग सक्रिय करें"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="OBS के वर्तमान इंसटैन्स के लिए डीबग लॉगिंग सक्षम करता है. लोड होने पर कायम नहीं रहता है.\n लोड होने पर सक्षम करने के लिए --websocket_debug का उपयोग करें."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="सर्वर सेटिंग"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="प्रमाणीकरण सक्षम करें"
|
||||||
|
OBSWebSocket.Settings.Password="सर्वर का पासवर्ड"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="पासवर्ड बनाएं"
|
||||||
|
OBSWebSocket.Settings.ServerPort="सर्वर पोर्ट"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="कनेक्ट जानकारी दिखाएं"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="चेतावनी: वर्तमान में लाइव"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="ऐसा प्रतीत होता है कि कोई एक आउटपुट (स्ट्रीम, रिकॉर्डिंग, आदि) वर्तमान में सक्रिय है."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="क्या आप वाकई अपनी कनेक्ट जानकारी दिखाना चाहते हैं?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="चेतावनी : संभावित सुरक्षा समस्या"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket सर्वर पासवर्ड को प्लेन टेक्स्ट के रूप में स्टोर करता है. obs-websocket द्वारा उत्पन्न पासवर्ड का उपयोग करने की अत्यधिक अनुशंसा की जाती है."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="क्या आप वाकई स्वयं का पासवर्ड प्रयोग करना चाहते हैं?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="त्रुटि : अमान्य कॉन्फ़िगरेशन"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="आपको 6 या अधिक वर्णों वाले पासवर्ड का उपयोग करना चाहिए."
|
||||||
|
OBSWebSocket.SessionTable.Title="कनेक्टेड वेबसॉकेट सत्र"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="रिमोट ऐड्रेस"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="सत्र अवधि"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="संदेश इन/आउट"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="पहचाना हुआ"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="निकालें?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="निकालें"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket कनेक्ट जानकारी दिखाएं"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="प्रतिलिपि"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="सर्वर IP (सर्वश्रेष्ठ अनुमान)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="सर्वर पोर्ट"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="सर्वर का पासवर्ड"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[पहुँच अक्षम]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR से जुड़ें"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="नया WebSocket कनेक्शन"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="क्लाइंट %1 की पहचान की गई."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket सत्यापन विफलता"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="क्लाइंट %1प्रमाणित करने में विफल रहा."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="वेबसॉकेट क्लाइंट डिस्कनेक्ट हो गया"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="क्लाइंट %1 डिस्कनेक्ट हो गया."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="वेबसॉकेट सर्वर विफलता"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket सर्वर प्रारंभ करने में विफल रहा. TCP पोर्ट %1 पहले से ही इस सिस्टम पर किसी अन्य एप्लिकेशन द्वारा कहीं और उपयोग में हो सकता है. वेबसॉकेट सर्वर सेटिंग्स में एक अलग TCP पोर्ट सेट करने का प्रयास करें, या इस पोर्ट का उपयोग करने वाले किसी भी एप्लिकेशन को रोकें.\n त्रुटि संदेश : %2"
|
43
data/locale/hu-HU.ini
Normal file
43
data/locale/hu-HU.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Az OBS Studio távvezérlése WebSocketen keresztül"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Az obs-websocket beállításai"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Bővítménybeállítások"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocket-kiszolgáló engedélyezése"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Rendszertálca-riasztások bekapcsolása"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Hibakeresési naplózás bekapcsolása"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Bekapcsolja a hibakeresési naplózást a jelenlegi OBS-példánynál. Betöltéskor nem marad meg.\nA betöltéskor történő bekapcsoláshoz használja a --websocket_debug kapcsolót."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Kiszolgálóbeállítások"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Hitelesítés bekapcsolása"
|
||||||
|
OBSWebSocket.Settings.Password="Kiszolgáló jelszava"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Jelszó előállítása"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Kiszolgáló portja"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Kapcsolódási információ megjelenítése"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Figyelmeztetés: Élő adásban van"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Úgy néz ki, hogy egy kimenet (közvetítés, felvétel, stb.) jelenleg aktív."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Biztos, hogy megjeleníti a kapcsolódási információkat?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Figyelmeztetés: lehetséges biztonsági probléma"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="Az obs-websocket titkosítatlan szövegként tárolja a kiszolgáló jelszavát. Ajánlatos egy az obs-websocket általelőállított jelsztó használni."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Biztos, hogy a saját jelszavát használja?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Hiba: Érvénytelen konfiguráció"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Legalább 6 karakterből álló jelszót kell használnia."
|
||||||
|
OBSWebSocket.SessionTable.Title="Kapcsolódott WebSocket munkamenetek"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Távoli cím"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Munkamenet hossza"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Bejövő és kimenő üzenetek"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Azonosított"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Kirúgás?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Kirúgás"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket kapcsolati információk"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Másolás"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Kiszolgáló IP (legjobb tipp)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Kiszolgáló portja"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Kiszolgáló jelszava"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Hitelesítés kikapcsolva]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Kapcsolódási QR-kód"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Új WebSocket-kapcsolat"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="A(z) %1 kliens azonosítva."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket hitelesítési hiba"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="A(z) %1 kliens hitelesítése sikertelen."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="A WebSocket-kliens bontotta a kapcsolatot"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="A(z) %1 kliens bontotta a kapcsolatot"
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket kiszolgálóhiba"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="A WebSocket-kiszolgáló nem tudott elindulni. A(z) %1 TCP-portot lehet, hogy már egy másik alkalmazás használja. Próbáljon eltérő TCP-portot beállítani a WebSocket-kiszolgáló beállítasaiban, vagy állítson le minden olyan alkalmazást, amely ezt a portot használhatja.\n Hibaüzenet: %2"
|
43
data/locale/hy-AM.ini
Normal file
43
data/locale/hy-AM.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="OBS Studio-ի հեռակառավարումը WebSocket-ի միջոցով"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket կարգավորումներ"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Միացնիչի կարգավորումներ"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Միացնել WebSocket սերվերը"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Միացնել սկուտեղի ծանուցումները"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Միացնել վրիպազերծման գրանցումը"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Միացնում է վրիպազերծման գրանցումը ընթացիկ OBS օրինակի համար: Չի պահպանվում գործարկման ժամանակ:\nՕգտագործեք --websocket_debug՝ գործարկման ժամանակ միացնելու համար:"
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Սերվերի կարգավորումներ"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Միացնել նույնականացումը"
|
||||||
|
OBSWebSocket.Settings.Password="Սերվերի գաղտնաբառը"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Ստեղծել գաղտնաբառը"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Սերվերի պորտ"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Ցույց տալ կապի մանրամասները"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Զգուշացում։ Հիմա ուղիղ եթեր"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Կարծես թե ելքը (հոսք, գրել և այլն) ներկայումս ակտիվ է:"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Իսկապե՞ս ուզում եք ցույց տալ ձեր կապի մանրամասները:"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Զգուշացում։ Հնարավոր անվտանգության խնդիր"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket-ը պահպանում է սերվերի գաղտնաբառը պարզ տեքստով: Խիստ խորհուրդ է տրվում օգտագործել obs-websock-ի կողմից ստեղծված գաղտնաբառը:"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Վստա՞հ եք, որ ցանկանում եք օգտագործել ձեր սեփական գաղտնաբառը:"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Սխալ։ Անվավեր կոնֆիգուրացիա"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Դուք պետք է օգտագործեք 6 կամ ավելի նիշից բաղկացած գաղտնաբառ:"
|
||||||
|
OBSWebSocket.SessionTable.Title="Միացված WebSocket նիստեր"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Ջնջված հասցե"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Նիստի տևողությունը"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Ներս/Դուրս հաղորդագրություններ"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Ճանաչված"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Վտարե՞լ:"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Վտարել"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket կապի մանրամասները"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Պատճենել"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Սերվերի ԻԱ (լավագույն ենթադրություն)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Սերվերի պորտ"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Սերվերի գաղտնաբառը"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Թույլտվությունն անջատված է]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Միացման ԱԱ կոդը"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Նոր WebSocket կապ"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Հաճախորդը ճանաչվեց %1:"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket վավերացման սխալ"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 հաճախորդը չհաջողվեց նույնականացնել:"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket հաճախորդն անջատված է"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="%1 հաճախորդն անջատվել է:"
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket սերվերի սխալ"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Չհաջողվեց գործարկել WebSockt սերվերը: Հնարավոր է, որ TCP %1 պորտն արդեն օգտագործվում է մեկ այլ հավելվածի կողմից: Փորձեք կարգավորել այլ TCP պորտ WebSocket սերվերի կարգավորումներում կամ դադարեցնել ցանկացած ծրագիր, որը կարող է օգտագործել այս պորտը:\n Սխալի հաղորդագրություն՝ %2։"
|
43
data/locale/id-ID.ini
Normal file
43
data/locale/id-ID.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Kendali jarak jauh OBS Studio melalui WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Pengaturan obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Pengaturan Plugin"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Aktifkan server WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Aktifkan Peringatan Baki Sistem"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Aktifkan Pencatatan Awakutu"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Aktifkan pencatatan awakutu untuk permintaan OBS saat ini. Tidak terus aktif saat memuat.\nGunakan --websocket_debug agar diaktifkan saat memuat."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Pengaturan Server"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Aktifkan Autentikasi"
|
||||||
|
OBSWebSocket.Settings.Password="Kata Sandi Server"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Ciptakan Kata Sandi"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Port Server"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Tampilkan Informasi Koneksi"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Peringatan: Saat Ini Siaran Langsung"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Sepertinya sebuah output (stream, rekaman, dll.) sedang aktif."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Anda yakin ingin melihat informasi koneksi Anda?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Peringatan: Potensi Masalah Keamanan"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket menyimpan kata sandi server sebagai teks biasa. Sangat disarankan untuk menggunakan kata sandi yang diciptakan oleh obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Anda yakin ingin menggunakan kata sandi Anda sendiri?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Galat: Konfigurasi Tidak Berlaku"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Anda harus menggunakan kata sandi yang minimal 6 karakter atau lebih."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sesi WebSocket yang Terhubung"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Alamat Kendali"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durasi Sesi"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Pesan Masuk/Keluar"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Teridentifikasi"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Putuskan?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Putuskan"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informasi Koneksi WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Salin"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP Server (Tebakan Terbaik)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Port Server"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Kata Sandi Server"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autentikasi Dinonaktifkan]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Hubungkan QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Koneksi WebSocket Baru"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klien %1 teridentifikasi."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Autentikasi WebSocket Gagal"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Klien %1 gagal mengautentikasi."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Klien WebSocket Terputus"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Klien %1 terputus."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Server WebSocket Gagal"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Server WebSocket gagal untuk memulai. Port TCP %1 mungkin sudah digunakan siapa pun pada sistem ini oleh aplikasi lain. Coba atur port TCP yang berbeda di pengaturan server WebSocket, atau hentikan aplikasi apapun yang bisa menggunakan port ini.\n Pesan galat: %2"
|
43
data/locale/it-IT.ini
Normal file
43
data/locale/it-IT.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Controllo remoto di OBS Studio tramite WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Impostazioni obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Impostazioni del plugin"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Abilita il server WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Abilita avvisi sulla barra delle applicazioni"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Abilita registrazione debug"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Abilita la registrazione debug per l'istanza attuale di OBS.\nNon rimane attiva per il prossimo caricamento.\nUsa --websocket_debug per abilitarla al caricamento."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Impostazioni server"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Abilita autenticazione"
|
||||||
|
OBSWebSocket.Settings.Password="Password server"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Genera password"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Porta server"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Visualizza informazioni di connessione"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Attenzione: attualmente in diretta"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Sembra che sia attualmente attivo un output (stream, registrazione, ecc.)."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sei sicuro di voler visualizzare le tue informazioni di connessione?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Avvertimento: potenziale problema di sicurezza"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket memorizza la password del server come testo normale.\nTi consigliamo vivamente di usare una password generata da obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Sei sicuro di voler usare la tua password?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Errore: configurazione non valida"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="È necessario usare una password di 6 o più caratteri."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sessioni WebSocket connesse"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Indirizzo remoto"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durata sessione"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Messaggi in entrata/uscita"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificato"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Chiudere?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Chiudi"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informazioni sulla connessione WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Copia"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP server (miglior ipotesi)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Porta server"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Password server"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autorizzazione disabilitata]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR connessione"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nuova connessione WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Identificato client %1."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Errore di autenticazione WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Il client %1 non è riuscito ad autenticarsi."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Client WebSocket disconnesso"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 disconnesso."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Errore del server WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Impossibile avviare il server WebSocket.\nLa porta TCP %1 potrebbe essere già usata in questo sistema da un'altra applicazione.\nProva a impostare nelle impostazioni del server WebSocket una porta TCP diversa oppure interrompi qualsiasi applicazione che potrebbe usare questa porta.\nMessaggio di errore: %2."
|
43
data/locale/ja-JP.ini
Normal file
43
data/locale/ja-JP.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="WebSocketを介したOBS Studioのリモートコントロール"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket設定"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="プラグイン設定"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocketサーバーを有効にする"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="システムトレイアラートを有効にする"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="デバッグログを有効にする"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="現在のOBSインスタンスに対してデバッグログを有効にします。ロード時には持続しません。\nロード時に有効にするには --websocket_debug を使用します。"
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="サーバー設定"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="認証を有効にする"
|
||||||
|
OBSWebSocket.Settings.Password="サーバーパスワード"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="パスワードを生成"
|
||||||
|
OBSWebSocket.Settings.ServerPort="サーバーポート"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="接続情報を表示"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="警告: 現在出力中"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="出力 (配信、録画など) が現在アクティブになっているようです。"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="接続情報を表示してもよろしいですか?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="警告: 潜在的なセキュリティの問題"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocketはサーバーのパスワードをプレーンテキストとして保存します。 obs-websocketによって生成されたパスワードを使用することを強くお勧めします。"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="自分が設定したパスワードを使用してもよろしいですか?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="エラー: 無効な設定です"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="6文字以上のパスワードを使用する必要があります。"
|
||||||
|
OBSWebSocket.SessionTable.Title="接続されているWebSocketセッション"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="リモートアドレス"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="セッション時間"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="メッセージ In/Out"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="識別"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="キック?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="キック"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket接続情報"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="コピー"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="サーバーIP (推測)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="サーバーポート"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="サーバーパスワード"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[認証無効]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="接続用QRコード"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="新しいWebSocket接続"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="クライアント %1 が識別されました。"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket認証失敗"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="クライアント %1 の認証に失敗しました。"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocketクライアントが切断されました"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="クライアント %1 が切断されました。"
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocketサーバー障害"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocketサーバーの起動に失敗しました。TCPポート %1 はこのシステム上の他の場所で別のアプリケーションによって既に使用されている可能性があります。 WebSocketサーバーの設定で別のTCPポートを設定するか、このポートを使用している可能性のあるアプリケーションを終了してください。\n エラーメッセージ: %2"
|
43
data/locale/ka-GE.ini
Normal file
43
data/locale/ka-GE.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="OBS Studio-ს დაშორებულად მართვა WebSocket-ით"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket-პარამეტრები"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="მოდულის პარამეტრები"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocket-სერვერის ჩართვა"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="სისტემური არეში ცნობების ჩართვა"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="გამართვის აღრიცხვის ჩართვა"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="აღირიცხება ამ გაშვებული OBS-ის ჩანაწერები გაუმართაობის მოსაგვარებლად. გაშვებისას არ ნარჩუნდება.\nგამოიყენეთ --websocket_debug გაშვებისას ჩასართავად."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="სერვერის პარამეტრები"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="ანგარიშზე შესვლით"
|
||||||
|
OBSWebSocket.Settings.Password="სერვერის პაროლი"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="პაროლის შედგენა"
|
||||||
|
OBSWebSocket.Settings.ServerPort="სერვერის პორტი"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="კავშირის შესახებ"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="გაფრთხილება: პირდაპირ ეთერშია"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="როგორც ჩანს, გამოტანა (ნაკადის, ჩანაწერის და სხვ.) ეთერში გადის."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="ნამდვილად გსურთ კავშირის მონაცემების გამოჩენა?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="ყურადღება: უსაფრთხოების შესაძლო სისუსტე"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket სერვერის პაროლს ტექსტის სახით. დაჟინებით გირჩევთ, გამოიყენოთ obs-websocket-ით შედგენილი პაროლი."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="ნამდვილად გსურთ საკუთარი პაროლის გამოყენება?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="შეცდომა: არასწორი გამართვა"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="პაროლი უნდა შეიცავდეს 6 ან მეტ სიმბოლოს."
|
||||||
|
OBSWebSocket.SessionTable.Title="დაკავშირებული WebSocket-სეანსები"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="დაშორებული მისამართი"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="სეანსის ხანგრძლივობა"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="მიღებ./გაგზ. შეტყობინებები"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="ამოცნობილი"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="გაითიშოს?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="გათიშვა"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket-კავშირის შესახებ"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="ასლი"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="სერვერის-IP (თვითდადგენით)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="სერვერის პორტი"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="სერვერის პაროლი"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[ანგარიშზე შეუსვლელად]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="კავშირის QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="ახალი WebSocket-კავშირი"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="კლიენტი %1 აღმოშენილია."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket-შესვლის დამოწმება ვერ მოხერხდა"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="კლიენტი %1 ვერ დამოწმდა."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-კლიენტი გამოითიშა"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="კლიენტი %1 გამოთიშეულია."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket-სერვერის ხარვეზი"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket-სერვერი ვერ ამუშავდა. TCP-პორტი %1 შეიძლება უკვე გამოიყენება სისტემაში სხვა პროგამის მიერ. მოსინჯეთ განსხვავებული TCP-პორტი WebSocket-სერვერის პარამეტრებში ან გათიშეთ ყველა პროგრამა, რომელიც ამ პორტს უნდა იყენებდეს.\n შეცდომის აღწერა: %2"
|
43
data/locale/kmr-TR.ini
Normal file
43
data/locale/kmr-TR.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Rêveberina ji dûr ve ya OBS Studio bi riya WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Sazkariyên obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Sazkariyên pêvekê"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Rajekarê WebSocket çalak bike"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Hişyariyên darika pergalê çalak bike"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Têketinê serrastkirinê çalak bike"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Têketinê serrastkirinê çalak bike ji bo danişîna heyî ya OBS. Li ser barkirinê nadomîne.\nBikaranîna --websocket_debug rê dide bo çalakkirina barkirinê."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Sazkariyên rajekar"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Rastandinê çalak bike"
|
||||||
|
OBSWebSocket.Settings.Password="Borînpeyva rajekar"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Borînpeyvê çê bike"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Dergeha rajekar"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Zanyariyên girêdanê nîşan bide"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Hişyarî: Weşan zindî ye"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Xuye dike ku deraneke (weşan, tomarkirin, hwd.) niha çalak e."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ma tu bi rastî dixwazî zanyariya girêdana xwe nîşan bidî?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Hişyarî: Pirsgirêka ewlekariya potansiyel"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket borînpeyva rajekarê wekî nivîsek sade hiltîne. Bikaranîna borînpeyva ku ji hêla obs-websocket ve hatî çêkirin pir tê pêşniyar kirin."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ma tu dixwazî ku borînpeyva xwe bi kar bînî?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Çewtî: Pevsazkirin ne derbasdar e"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Divê tu borînpeyvekê bi kar bînî ku ji 6 an jî bêtir tîpan be."
|
||||||
|
OBSWebSocket.SessionTable.Title="Danişînên WebSocket ên girêdayî"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Navnîşana ji dûr ve"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Dirêjahiya danişînê"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Peyamên Çûyî/Hatî"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Naskirî"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Derxîne?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Derxîne"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Zanyariyên girêdanê WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Jê bigire"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP ya rajekar (Çêtirîn texmîn)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Dergeha rajekar"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Borînpeyva rajekar"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Rastandin neçalak e]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR girê bide"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Girêdana bû ya WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Rajegir %1 hate naskirin."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Rastandina WebSocket têk çû"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Rastandina rajegir %1 têk çû."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Girêdana rajegira WebSocket qut bû"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Girêdana rajegir %1 qut bû."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Rajekara WebSocket têk çû"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Destpêkirina rajekara WebSocket têk çû. Dibe ku dergeha TCP %1 jixwe ji hêla sepaneke din ve li cîhek din li ser vê pergalê were bikaranîn. Kontrol bike ku di sazkariyên rajekara WebSocket de dergehek TCP a cuda saz bikî, an jî sepanek ku dikare vê dergehê bi kar bîne rawestîne.\n Peyama çewtiyê: %2"
|
43
data/locale/ko-KR.ini
Normal file
43
data/locale/ko-KR.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="WebSocket으로 OBS Studio를 원격 제어"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket 설정"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="플러그인 설정"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocket 서버 사용"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="시스템 트레이 알림 사용"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="디버그 기록 사용"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="OBS의 현재 인스턴스에 대해 디버그 기록을 활성화합니다. 불러오는 중에는 기록이 중단됩니다.\n불러오는 중에도 활성화하려면 --websocket_debug 인자를 이용하십시오."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="서버 설정"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="인증 기능 사용"
|
||||||
|
OBSWebSocket.Settings.Password="서버 비밀번호"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="비밀번호 생성"
|
||||||
|
OBSWebSocket.Settings.ServerPort="서버 포트"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="서버 정보 표시"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="경고: 현재 활성화 중"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="현재 출력(스트림, 녹화 등)이 활성화된 것으로 보입니다."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="정말로 연결 정보를 표시하시겠습니까?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="경고: 잠재적 보안 문제"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket은 서버 비밀번호를 평문으로 저장합니다. obs-websocket에서 생성한 비밀번호를 사용하는 것을 적극 권장합니다."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="정말로 직접 설정한 비밀번호를 사용하시겠습니까?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="오류: 설정이 유효하지 않음"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="6자 이상의 비밀번호를 사용해야 합니다."
|
||||||
|
OBSWebSocket.SessionTable.Title="WebSocket 세션에 연결됨"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="원격 주소"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="세션 지속 시간"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="메시지 입출력"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="식별 기록"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="퇴장?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="퇴장"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket 연결 정보"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="복사"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="서버 IP (추정)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="서버 포트"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="서버 비밀번호"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[인증 사용 안 함]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="연결 QR코드"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="새 WebSocket 연결"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="클라이언트 %1 식별 성공."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket 인증 실패"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="클라이언트 %1 인증 실패."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket 클라이언트 연결 해제됨"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="클라이언트 %1 연결 해제됨."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket 서버 기동 실패"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket 서버를 시작하는 데 실패했습니다. %1 TCP 포트가 타 응용 프로그램에 의해 이 시스템에서 이미 사용 중일 수 있습니다. WebSocket 서버 설정에서 다른 TCP 포트로 변경하거나 이 포트를 사용하는 응용 프로그램을 종료하십시오.\n 오류 메시지: %2"
|
43
data/locale/ms-MY.ini
Normal file
43
data/locale/ms-MY.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Kawalan-jauh OBS Studio melalui WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Tetapan obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Tetapan Pemalam"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Benarkan pelayan WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Benarkan Amaran Talam Sistem"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Benarkan Pegelogan Nyahpepijat"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Membenarkan pengelogan nyahpepijat bagi kejadian OBS semasa. Tidak ditetapkan ketika muat.\nGuna --websocket_debug untuk didayakan ketika muat."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Tetapan Pelayan"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Benarkan Pengesahihan"
|
||||||
|
OBSWebSocket.Settings.Password="Kata Laluan Pelayan"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Jana Kata Lauan"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Port Pelayan"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Tunjuk Maklumat Sambungan"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Amaran: Sedang Berlangsung"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Nampaknya ada output (strim, rakaman, dll.) masih aktif."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Anda pasti mahu menunjukkan maklumat sambungan anda?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Amaran: Isu Keselamatan Mungkin Ada"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket menyimpan kata laluan pelayan dalam bentuk teks biasa. Menggunakan kata laluan yang dijana oleh obs-websocket iadalah sangat disarankan."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Adakah anda pasti mahu menggunakan kata laluan anda sendiri?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Ralat: Konfigurasi Tidak Sah"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Anda mesti guna satu kata laluan yang terdiri daripada 6 atau lebih aksara."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sesi WebSocket Bersambung"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Alamat Jauh"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Tempoh Sesi"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mesej Masuk/Keluar"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Dikenal Pasti"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Tendang?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Tendang"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Maklumat Sambungan WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Salin"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP Pelayan (Tekaan Terbaik)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Port Pelayan"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Kata Laluan Pelayan"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Izin Dilumpuh]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR Sambungan"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Sambungan WebSocket Baharu"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klien %1 dikenal past."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Kegagalan Pengesahihan WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Klien %1 gagal disahihkan."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Klien WebSocket Terputus"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Klien %1 terputus."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Kegagalan Pelayan WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Pelayan WebSocket gagal dimulakan. Port TCP %1 mungkin telah digunakan di tempat lain dalam sistem ini oleh aplikasi lain. Cuba tetapkan port TCP lain dalam tetapan pelayan WebSocket, atau hentikan mana-mana aplikasi yang guna port tersebut.\n Mesej ralat: %2"
|
42
data/locale/nl-NL.ini
Normal file
42
data/locale/nl-NL.ini
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Op afstand bediening van OBS Studio via WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket Instellingen"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Plugin instellingen"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocket server inschakelen"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Systeemtray meldingen inschakelen"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Activeer debug logging"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Schakelt debug logboekregistratie in voor de huidige instantie van OBS. Blijft niet meer te laden.\nGebruik --websocket_debug om bij laden in te schakelen."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Serverinstellingen"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Authenticatie inschakelen"
|
||||||
|
OBSWebSocket.Settings.Password="Server wachtwoord"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Wachtwoord genereren"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Serverpoort"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Toon verbindingsinformatie"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Waarschuwing: Op dit moment live"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Het lijkt erop dat een output (stream, opname, etc.) momenteel actief is."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Weet je zeker dat je je verbindingsinformatie wilt laten zien?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Waarschuwing: potentieel beveiligingsprobleem"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket slaat het serverwachtwoord op als platte tekst. Het gebruik van een wachtwoord dat wordt gegenereerd door een obs-websocket wordt sterk aanbevolen."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Weet u zeker dat u uw eigen wachtwoord wilt gebruiken?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Fout: ongeldige configuratie"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="U moet een wachtwoord gebruiken van 6 of meer tekens."
|
||||||
|
OBSWebSocket.SessionTable.Title="Verbonden WebSocket Sessies"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Extern adres"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Sessie duur"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Berichten In/Uit"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Geïdentificeerd"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Verwijderen?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Verwijderen"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket verbindingsinformatie"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopiëren"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Server IP (Beste inschatting)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Serverpoort"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Authenticatie Uitgeschakeld]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR koppelen"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nieuwe WebSocket verbinding"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Client %1 geïdentificeerd."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket Authenticatie Fout"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Authenticatie van client %1 mislukt."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket Client losgekoppeld"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 ontkoppeld."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket Server fout"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="De WebSocket server kon niet worden gestart. TCP-poort %1 is mogelijk al in gebruik op dit systeem door een andere toepassing. Probeer een andere TCP-poort in te stellen in de WebSocket server-instellingen, of stop elke toepassing die deze poort zou kunnen gebruiken.\n Foutmelding: %2"
|
43
data/locale/pl-PL.ini
Normal file
43
data/locale/pl-PL.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Zdalna kontrola OBS Studio przez WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Ustawienia obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Ustawienia wtyczki"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Włącz serwer WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Włącz powiadomienia w zasobniku systemowym"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Włącz logowanie debugowania"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Włącza logowanie debugowania dla bieżącej instancji OBS. Opcja nie jest włączana przy ładowaniu aplikacji.\nUżyj --websocket_debug, aby włączyć logowanie debugowania przy ładowaniu aplikacji."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Ustawienia serwera"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Włącz uwierzytelnianie"
|
||||||
|
OBSWebSocket.Settings.Password="Hasło serwera"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Wygeneruj hasło"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Port serwera"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Pokaż informacje połączenia"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Ostrzeżenie: Trwa transmisja lub nagranie"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Wygląda na to, że trwa transmisja lub nagrywanie."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Czy na pewno chcesz pokazać informacje połączenia?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Ostrzeżenie: Potencjalny problem bezpieczeństwa"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket przechowuje hasło serwera jako zwykły tekst. Wysoce zalecane jest użycie hasła generowanego przez obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Czy na pewno chcesz użyć własnego hasła?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Błąd: Nieprawidłowa konfiguracja"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Musisz użyć hasła, które ma 6 lub więcej znaków."
|
||||||
|
OBSWebSocket.SessionTable.Title="Podłączone sesje WebSocket"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Adres zdalny"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Czas trwania sesji"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Wiadomości przychodzące/wychodzące"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Zidentyfikowany"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Odłączyć?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Odłącz"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informacje o połączeniu WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopiuj"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP serwera (ustalone w miarę możliwości)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Port serwera"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Hasło serwera"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autoryzacja wyłączona]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Kod QR połączenia"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nowe połączenie WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klient %1 zidentyfikowany."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Błąd uwierzytelniania WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Klient %1 nie został uwierzytelniony."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Klient WebSocket odłączony"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Klient %1 odłączony."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Błąd serwera WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Nie udało się uruchomić serwera WebSocket. Port TCP %1 może być już używany w innym miejscu tego systemu przez inną aplikację. Spróbuj ustawić inny port TCP w ustawieniach serwera WebSocket lub zatrzymaj aplikację, która może korzystać z tego portu.\n Komunikat błędu: %2"
|
43
data/locale/pt-BR.ini
Normal file
43
data/locale/pt-BR.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Controle remoto do OBS Studio através de WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Configurações OBS-WebSocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Configurações de Plugin"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Ativar servidor WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Ativar Alertas da Bandeja do Sistema"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Habilitar log de depuração"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Ativa o registro de depuração para a instância atual do OBS. Não persiste ao carregar.\nUse --websocket_debug para ativar no carregamento."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Configurações de Servidor"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Habilitar Autenticação"
|
||||||
|
OBSWebSocket.Settings.Password="Senha de Servidor"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Gerar Senha"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Porta de Servidor"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Mostrar Informações de Conexão"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Aviso: Atualmente Ao Vivo"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Parece que uma saída (stream, gravação, etc.) está atualmente ativa."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Tem certeza de que deseja mostrar suas informações de conexão?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Aviso: Problema de Segurança Potencial"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket armazena a senha do servidor como texto sem formatação. Usar uma senha gerada pela obs-websocket é altamente recomendada."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Tem certeza de que deseja usar a sua própria senha?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Erro: Configuração Inválida"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Você deve usar uma senha que tenha 6 ou mais caracteres."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sessões WebSocket Conectadas"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Endereço Remoto"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Duração de Sessão"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mensagens"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificada"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsar?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Expulsar"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informação de Conexão WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Copiar"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP do servidor (Melhor Chute)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Porta de Servidor"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Senha de Servidor"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autenticação Desativada]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR da conexão"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nova Conexão de WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Cliente %1 identificado."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Falha na Autenticação de WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Cliente %1 falhou na autenticação."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Cliente WebSocket Desconectado"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Cliente %1 desconectado."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Falha no Servidor WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="O servidor de WebSocket falhou ao iniciar. A porta TCP %1 já pode estar em uso em outro lugar neste sistema por outro aplicativo. Tente definir uma porta TCP diferente nas configurações do servidor de WebSocket, ou pare qualquer aplicativo que possa estar usando essa porta.\n Mensagem de erro: %2"
|
43
data/locale/pt-PT.ini
Normal file
43
data/locale/pt-PT.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Controlo remoto do OBS Studio através de WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Configurações obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Configurações do plugin"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Ativar servidor WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Ativar alertas da bandeja do sistema"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Ativar registo de depuração"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Ativa o registro de depuração para a instância atual do OBS. Não persiste no arranque.\nUse --websocket_debug para ativar no arranque."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Configurações do servidor"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Ativar autenticação"
|
||||||
|
OBSWebSocket.Settings.Password="Senha do servidor"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Gerar senha"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Porta do servidor"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Mostrar informações de conexão"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Aviso: Atualmente ao vivo"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Parece que uma saída (transmissão, gravação, etc.) está atualmente ativa."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Tem certeza de que deseja mostrar as suas informações de ligação?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Aviso: Possível problema de segurança"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="O obs-websocket armazena a senha do servidor como texto sem formatação. É altamente recomendado usar uma senha gerada pelo obs-websocket ."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Tem a certeza de que deseja usar as suas próprias senhas?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Erro: Configuração inválida"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Deve usar uma senha que tenha 6 ou mais caracteres."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sessões WebSocket ligadas"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Endereço remoto"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Duração da sessão"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Entrada/Saída de mensagens"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificado"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsar?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Expulsar"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informação de ligação WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Copiar"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP do servidor (melhor cálculo)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Porta do servidor"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Senha do servidor"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autenticação desativada]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Código QR de ligação"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nova conexão de WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Cliente %1 identificado."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Falha na autenticação de WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Cliente %1 falhou na autenticação."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Cliente WebSocket desligado"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Cliente %1 desligado."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Falha no servidor WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="O servidor de WebSocket falhou ao iniciar. A porta TCP %1 pode já estar em uso noutro local deste sistema por outra aplicação. Tente definir uma porta TCP diferente nas configurações do servidor de WebSocket, ou pare qualquer aplicação que possa estar a usar essa porta.\n Mensagem de erro: %2"
|
43
data/locale/ro-RO.ini
Normal file
43
data/locale/ro-RO.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Control de la distanță pentru OBS Studio prin WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Setări obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Setări ale plugin-ului"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Activează serverul WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Activați alertele din bara de sistem"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Activează jurnalizarea de depanare"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Activează jurnalizarea de depanare pentru instanța curentă de OBS. Nu persistă la încărcare.\nUtilizați --websocket_debug pentru a activa la încărcare."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Setări server"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Activează autentificarea"
|
||||||
|
OBSWebSocket.Settings.Password="Parola serverului"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Generează parola"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Portul serverului"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Afișează informațiile de conectare"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Avertisment: În prezent în direct"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că un output (transmisiune, înregistrare etc.) este activ în prezent."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sigur vrei să afișezi informațiile de conectare?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Avertisment: Potențială problemă de securitate"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket stochează parola serverului ca text simplu. Este foarte recomandat să folosiți o parolă generată de obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Sigur vrei să-ți folosești propria parolă?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Eroare: Configurație invalidă"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Trebuie să folosești o parolă care să aibă 6 sau mai multe caractere."
|
||||||
|
OBSWebSocket.SessionTable.Title="Sesiuni WebSocket conectate"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Adresă la distanță"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durata sesiunii"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mesaje de intrare/ieșire"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificat"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Înlătură?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Înlătură"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Informații de conectare WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Copiază"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP-ul serverului (cea mai bună presupunere)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Portul serverului"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Parola serverului"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autentificare dezactivată]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Conectare QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="O nouă conexiune WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Client %1 identificat."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Eroare de autentificare WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Client %1 nu a reușit să se autentifice."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Client WebSocket deconectat"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Clientul %1 s-a deconectat."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Eroare de server WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Serverul WebSocket nu a reușit să pornească. Este posibil ca portul TCP %1 să fie deja utilizat în altă parte pe acest sistem de o altă aplicație. Încearcă să setezi un alt port TCP în setările serverului WebSocket sau oprește orice aplicație care ar putea utiliza acest port.\n Mesaj de eroare: %2"
|
43
data/locale/ru-RU.ini
Normal file
43
data/locale/ru-RU.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Удалённое управление OBS Studio по WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Настройки obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Настройки плагина"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Включить сервер WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Включить оповещения в трее"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Включить отладочный журнал"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Включает ведение журнала отладки для текущего экземпляра OBS. Не сохраняется при запуске.\nИспользуйте --websocket_debug для включения при запуске."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Настройки сервера"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Включить аутентификацию"
|
||||||
|
OBSWebSocket.Settings.Password="Пароль сервера"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Сгенерировать пароль"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Порт сервера"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Показать сведения о подключении"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Предупреждение: Сейчас в эфире"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Похоже, что вывод (поток, запись и т. д.) в настоящее время активен."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Уверены, что хотите показать ваши сведения о подключении?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Предупреждение: Потенциальная проблема безопасности"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket хранит пароль сервера в виде обычного текста. Настоятельно рекомендуется использовать пароль, сгенерированный obs-websock."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Уверены, что хотите использовать собственый пароль?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Ошибка: Неверная конфигурация"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Вы должны использовать пароль длиной 6 или более символов."
|
||||||
|
OBSWebSocket.SessionTable.Title="Подключённые сеансы WebSocket"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Удалённый адрес"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Длительность сеанса"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Вх./исх. сообщения"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Распознано"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Выгнать?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Выгнать"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Сведения о подключении WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Копировать"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP сервера (лучшая догадка)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Порт сервера"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Пароль сервера"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Авторизация отключена]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR-код подключения"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Новое подключение WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Клиент %1 распознан."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ошибка аутентификации WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Клиент %1 не смог аутентифицироваться."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Клиент WebSocket отключился"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Клиент %1 отключился."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Ошибка сервера WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Не удалось запустить сервер WebSockt. Возможно, порт TCP %1 уже используется другим приложением. Попробуйте установить другой TCP-порт в настройках сервера WebSocket или остановите любое приложение, которое может использовать этот порт.\n Сообщение ошибки: %2"
|
20
data/locale/si-LK.ini
Normal file
20
data/locale/si-LK.ini
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="පේනුවේ සැකසුම්"
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="සේවාදායකයේ සැකසුම්"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="සත්යාපනය සබල කරන්න"
|
||||||
|
OBSWebSocket.Settings.Password="සේවාදායකයේ මුරපදය"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="මුරපදය උත්පාදනය"
|
||||||
|
OBSWebSocket.Settings.ServerPort="සේවාදායකයේ තොට"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="සබඳතාවේ තොරතුරු පෙන්වන්න"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="අවවාදයයි: දැනට සජීවයි"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="දුරස්ථ ලිපිනය"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="වාරයේ පරාසය"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="පණිවිඩ එන/යන"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="හඳුනා ගැනිණි"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="පිටපතක්"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="සේවාදායකයේ තොට"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="සේවාදායකයේ මුරපදය"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[සත්යාපනය අබලයි]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="සබැඳුමට QR"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="දැන් %1 අනුග්රාහකය හඳුනයි."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 අනුග්රාහකය සත්යාපනයට අසමත්!"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="%1 අනුග්රාහකය විසන්ධියි."
|
43
data/locale/sk-SK.ini
Normal file
43
data/locale/sk-SK.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Vzdialené ovládanie OBS Štúdia cez WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Nastavenia obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Nastavenia pluginu"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Zapnúť WebSocket server"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Zapnúť notifikácie zo systémovej lišty"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Zapnúť debug logovanie"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Zapne debug logovanie pre momentálnu inštanciu OBS. Nezotrvá po načítaní.\nPoužite --websocket_debug pre zapnutie pri načítaní."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Nastavenia servera"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Zapnúť autentifikáciu"
|
||||||
|
OBSWebSocket.Settings.Password="Serverové heslo"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Vygenerovať heslo"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Serverový port"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Zobraziť info pripojenia"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varovanie: Momentálne naživo"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Zdá sa, že nejaký výstup (stream, nahrávanie, atď.) je momentálne aktívny."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ste si istí, že chcete zobraziť info vašeho pripojenia?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Varovanie: Potenciálny bezpečnostný problém"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket ukladá serverové heslo ako obyčajný text. Použitie vygenerovaného hesla pre obs-websocket je vysoko odporúčané."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ste si istí, že chcete použiť svoje vlastné heslo?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Chyba: Neplatná konfigurácia"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Musíte zadať heslo, ktoré má 6 alebo viac znakov."
|
||||||
|
OBSWebSocket.SessionTable.Title="Pripojené WebSocket relácie"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Vzdialená adresa"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Travnie relácie"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Správy dnu/von"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identifikovaný"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Vyhodiť?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Vyhodiť"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Info WebSocket pripojenia"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopírovať"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP servera (najlepší odhad)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Serverový port"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Serverové heslo"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autentifikácia vypnutá]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR kód pripojenia"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nové WebSocket pripojenie"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klient %1 identifikovaný."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Zlyhanie WebSocket autentifikácie"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Klientovi %1 sa nepodarilo autentifikovať."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket klient odpojený"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Klient %1 odpojený."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Zlyhanie WebSocket servera"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket server zlyhal pri spustení. TCP port %1 sa môže používať na inom mieste, na tomto systéme, inou aplikáciou. Skúste nastaviť iný TCP port v nastaveniach WebSocket servera, alebo zastavte iné aplikácie, ktoré by mohli používať tento port.\n Chybová správa: %2"
|
43
data/locale/sl-SI.ini
Normal file
43
data/locale/sl-SI.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Oddaljeni nadzor OBS Studia prek WebSocketa"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Nastavitve obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Nastavitve vtičnika"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Omogoči strežnik WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Omogoči opozorila v sistemskem pladnju"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Omogoči beleženje napak"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Omogoči beleženje dogodkov za potrebe razhroščevanja v trenutno zagnani inačici OBS. Ne vztraja ob nalaganju.\nUporabbite --websocket_debug, da to možnost omogočite ob nalaganju."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Nastavitve strežnika"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Omogoči overjanje"
|
||||||
|
OBSWebSocket.Settings.Password="Geslo strežnika"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Tvori geslo"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Vrata strežnika"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Pokaži podatke o povezavi"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Opozorilo: trenutno v živo"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Kaže, da je izhod (tok, posnetek itn.) trenutno dejaven."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ali ste prepričani, da želite pokazati svoje podatke za povezavo?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Opozorilo: potencialna varnostna težava"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket hrani geslo strežnika kot navadno besedilo. Uporaba gesla, ki ga ustvari obs-websocket je zato zelo priporočena."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ali ste prepričani, da želite uporabiti lastno geslo?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Napaka: neveljavna prilagoditev"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Uporabiti morate geslo z vsaj 6 znaki."
|
||||||
|
OBSWebSocket.SessionTable.Title="Povezane seje WebSocket"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Oddaljen naslov"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Trajanje seje"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Sporočila V/I"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identificirano"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Odvrzi?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Odvrzi"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Podatki o povezavi WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopiraj"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP strežnika (naj-domneva)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Vrata strežnika"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Geslo strežnika"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Overjanje onemog.]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Koda QR za povezavo"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Nova povezava WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Odjemalec %1 identificiran."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Spodletelo ovetjanje WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Odjemalec %1 ni prestal overjanja."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Odjemalec WebSocket je prekinil povezavo"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Odjemalec %1 ni več povezan."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Odpoved strežnika WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Strežnik WebSocket se ni uspel zagnati. Vrata TCP %1 morda že uporablja drug program na tem sistemu. Poskusite določiti druga vrata TCP v nastavitvah strežnika WebSocket ali pa ustaviti program, ki bi lahko uporabljal želena vrata.\nSporočilo o napaki: %2"
|
43
data/locale/sv-SE.ini
Normal file
43
data/locale/sv-SE.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Fjärrkontroll av OBS Studio via WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Inställningar för obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Insticksmodulsinställningar"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Aktivera WebSocket-server"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Aktivera systemfältsmeddelanden"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Aktivera felsökningsloggning"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Aktiverar felsökningsloggning för den aktuella instansen av OBS. Stannar inte igång vid inläsning.\nAnvänd --websocket_debug för att aktivera vid inläsning."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Serverinställningar"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Aktivera autentisering"
|
||||||
|
OBSWebSocket.Settings.Password="Serverlösenord"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Generera lösenord"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Serverport"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Visa anslutningsinformation"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varning: Sänder för närvarande"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Det verkar som om en utmatning (ström, inspelning, etc.) är för närvarande aktiv."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Är du säker på att du vill visa din anslutningsinformation?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Varning: Potentiellt säkerhetsproblem"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket lagrar serverns lösenord som vanlig text. Det kommenderas starkt att använda ett lösenord som genereras av obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Är du säker på att du vill använda ditt eget lösenord?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Fel: Ogiltig konfiguration"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Du måste använda ett lösenord som har 6 eller fler tecken."
|
||||||
|
OBSWebSocket.SessionTable.Title="Anslutna WebSocket-sessioner"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Fjärradress"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Sessionens varaktighet"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Meddelanden in/ut"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Identifierad"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Sparka ut?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Sparka ut"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Anslutningsinfo för WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopiera"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Server-IP (uppskattad)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Serverport"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Serverlösenord"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autentisering inaktiverad]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR för anslutning"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Ny WebSocket-anslutning"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Klient %1 har identifierats."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Autentisering av WebSocket misslyckades"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Klient %1 misslyckades att autentiseras."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-klient frånkopplades"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Klient %1 frånkopplades."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket-serverfel"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket-servern kunde inte startaw. TCP-porten %1 kanske redan används någon annanstans på detta system av ett annat program. Prova att ange en annan TCP-port i WebSocket-serverinställningarna eller stoppa alla program som kan använda denna port.\n Felmeddelande: %2"
|
43
data/locale/tr-TR.ini
Normal file
43
data/locale/tr-TR.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="WebSocket aracılığıyla uzaktan OBS Studio"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket Ayarları"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Eklenti Ayarları"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="WebSocket sunucuyu etkinleştir"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Sistem Tepsi Uyarılarını Etkinleştir"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Hata Ayıklama Günlüğünü Etkinleştir"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="OBS'in geçerli örneği için hata ayıklama günlüğünü etkinleştirir. Yüklemede kalıcı değildir.\nYüklemede etkinleştirmek için -- websocket_debug kullanın."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Sunucu Ayarları"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Kimlik Doğrulamasını Etkinleştir"
|
||||||
|
OBSWebSocket.Settings.Password="Sunucu Parolası"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Parola oluştur"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Sunucu Portu"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Bağlanma Bilgilerini Göster"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Uyarı: Şu Anda Canlı"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Şu anda bir çıkış (yayın, kayıt, vb.) aktif görünüyor."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Bağlanma bilgilerinizi göstermek istediğinizden emin misiniz?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Uyarı: Olası Güvenlik Sorunu"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket sunucu parolasını düz metin olarak saklar. Obs-websocket tarafından oluşturulan bir parola kullanılması şiddetle tavsiye edilir."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Kendi parolanızı kullanmak istediğinizden emin misiniz?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Hata: Geçersiz Yapılandırma"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="6 veya daha fazla karakterden oluşan bir şifre kullanmalısınız."
|
||||||
|
OBSWebSocket.SessionTable.Title="Bağlı WebSocket Oturumları"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Uzaktaki Adres"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Oturum Süresi"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Gelen/Giden Mesajlar"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Tanımlandı"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Çıkarılsın mı?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Çıkar"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket Bağlanma Bilgileri"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Kopyala"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="Sunucu IP (En İyi Tahmin)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Sunucu Kapısı"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Sunucu Parolası"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Doğrulama Devre Dışı]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="Kare Kod ile Bağlan"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Yeni WebSocket Bağlantısı"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="%1 istemcisi tanımlandı."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket Kimlik Doğrulama Hatası"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 istemcisinin kimlik doğrulaması başarısız oldu."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket İstemcisinin Bağlantısı Kesildi"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="%1 istemcisinin bağlantısı kesildi."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket Sunucu Hatası"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket sunucusu başlatılamadı. %1 TCP kapısı bu sistemde başka bir yerde başka bir uygulama tarafından zaten kullanılıyor olabilir. WebSocket sunucu ayarlarında farklı bir TCP kapısı ayarlamayı deneyin, veya bu kapıyı kullanıyor olabilecek herhangi bir uygulamayı durdurun.\n Hata mesajı: %2"
|
43
data/locale/uk-UA.ini
Normal file
43
data/locale/uk-UA.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="Віддалене керування OBS Studio через WebSocket"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="Налаштування obs-websocket"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Налаштування плагіна"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Увімкнути сервер WebSocket"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="Увімкнути сповіщення у системному лотку"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="Увімкнути журнал налагодження"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="Вмикає журналювання налагодження для поточного екземпляра OBS. Не зберігається під час завантаження.\nВикористовуйте --websocket_debug для увімкнення під час завантаження."
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Налаштування сервера"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="Увімкнути автентифікацію"
|
||||||
|
OBSWebSocket.Settings.Password="Пароль сервера"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Згенерувати пароль"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Порт сервера"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Показати відомості про з'єднання"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Попередження: Трансляція наживо"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Схоже, що вивід (потік, запис тощо) зараз активний."
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ви впевнені, що хочете показати ваші відомості про з'єднання?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Попередження: Імовірна проблема безпеки"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket зберігає пароль сервера у вигляді звичайного тексту. Радимо використовувати пароль, згенерований в obs-websocket."
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ви впевнені, що хочете використовувати власний пароль?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Помилка: неправильна конфігурація"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Ви повинні використовувати пароль, що складається з 6 або більше символів."
|
||||||
|
OBSWebSocket.SessionTable.Title="Під'єднані сеанси WebSocket"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Віддалена адреса"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="Тривалість сеансу"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Повідомлення вводу/виводу"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="Визначені"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="Роз'єднати?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="Роз'єднати"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="Відомості про з'єднання WebSocket"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="Скопіювати"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="IP сервера (найкращий збіг)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="Порт сервера"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="Пароль сервера"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Автентифікацію вимкнено]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="QR-код під'єднання"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="Нове з'єднання WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="Ідентифікатор клієнта %1."
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Помилка автентифікації WebSocket"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Клієнт %1 не зміг автентифікуватися."
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="Клієнт WebSocket від'єднаний"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="Клієнт %1 від'єднаний."
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="Помилка сервера WebSocket"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="Не вдалося запустити сервер WebSocket. Порт TCP %1 може вже використовуватися в іншому місці цим системним інтерфейсом. Спробуйте встановити інший TCP порт в налаштуваннях WebSocket сервера або зупинити будь-які застосунки, які можуть використовувати цей порт.\n Повідомлення про помилку: %2"
|
7
data/locale/vi-VN.ini
Normal file
7
data/locale/vi-VN.ini
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="Thiết đặt trình cắm"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="Bật máy chủ WebSocket"
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="Thiết đặt máy chủ"
|
||||||
|
OBSWebSocket.Settings.Password="Mật khẩu máy chủ"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="Tạo mật khẩu"
|
||||||
|
OBSWebSocket.Settings.ServerPort="Cổng máy chủ"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="Hiện thông tin kết nối"
|
43
data/locale/zh-CN.ini
Normal file
43
data/locale/zh-CN.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="通过 WebSocket 远程控制 OBS Studio"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket 设置"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="插件设置"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="开启 WebSocket 服务器"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="开启系统托盘提醒"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="开启调试日志"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="启用当前 OBS 实例的调试日志。下次启动时需重新设置。\n使用 --websocket_debug 在启动 OBS 时启用日志。"
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="服务器设置"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="开启鉴权"
|
||||||
|
OBSWebSocket.Settings.Password="服务器密码"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="生成密码"
|
||||||
|
OBSWebSocket.Settings.ServerPort="服务器端口"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="显示连接信息"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="警告:正在直播"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="似乎正在输出(串流、录像等)。"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="您确定要显示您的连接信息吗?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="警告:潜在安全问题"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket 会以明文形式储存服务器密码。强烈建议使用 obs-websocket 生成的密码。"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="您确定要使用自定义密码吗?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="错误:配置无效"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="您的密码必须包含 6 个或以上的字符。"
|
||||||
|
OBSWebSocket.SessionTable.Title="已连接的 WebSocket 会话"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="远程地址"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="会话持续时间"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="消息传入/出"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="已识别"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="踢出?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="踢出"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket 连接信息"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="复制"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="服务器 IP(最佳猜测)"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="服务器端口"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="服务器密码"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[鉴权已停用]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="连接 QR 码"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="新 WebSocket 连接"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="已识别 %1 客户端。"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket 鉴权失败"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 客户端认证失败。"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket 客户端已断开"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="%1 客户端已断开。"
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket 服务器启动失败"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="WebSocket 服务器启动失败。TCP 端口 %1 可能已被其它程序占用。请尝试在 WebSocket 服务器设置中更改不同的 TCP 端口号,或者结束其它任何可能占用此端口的程序。\n错误信息:%2"
|
43
data/locale/zh-TW.ini
Normal file
43
data/locale/zh-TW.ini
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
OBSWebSocket.Plugin.Description="透過 WebSocket 遠端控制 OBS Studio"
|
||||||
|
OBSWebSocket.Settings.DialogTitle="obs-websocket 設定"
|
||||||
|
OBSWebSocket.Settings.PluginSettingsTitle="外掛程式設定"
|
||||||
|
OBSWebSocket.Settings.ServerEnable="啟用 WebSocket 伺服器"
|
||||||
|
OBSWebSocket.Settings.AlertsEnable="啟用系統匣通知"
|
||||||
|
OBSWebSocket.Settings.DebugEnable="啟用除錯日誌"
|
||||||
|
OBSWebSocket.Settings.DebugEnableHoverText="啟用目前 OBS 實體的除錯日誌。下次啟動時需重新設定。\n使用 --websocket_debug 在啟動 OBS 時啟用日誌。"
|
||||||
|
OBSWebSocket.Settings.ServerSettingsTitle="伺服器設定"
|
||||||
|
OBSWebSocket.Settings.AuthRequired="啟用認證"
|
||||||
|
OBSWebSocket.Settings.Password="伺服器密碼"
|
||||||
|
OBSWebSocket.Settings.GeneratePassword="產生密碼"
|
||||||
|
OBSWebSocket.Settings.ServerPort="伺服器連線埠"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfo="顯示連線資訊"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="警告:目前正在直播"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="似乎正在進行輸出(串流、錄影等等)。"
|
||||||
|
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="您確定要顯示連線資訊嗎?"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="警告:潛在安全問題"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket 會以明文方式儲存伺服器密碼。強烈建議使用 obs-websocket 產生的密碼。"
|
||||||
|
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="您確定要使用自己的密碼嗎?"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="錯誤:設定無效"
|
||||||
|
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="您必須使用 6 個字元以上的密碼。"
|
||||||
|
OBSWebSocket.SessionTable.Title="連線的 WebSocket 工作階段"
|
||||||
|
OBSWebSocket.SessionTable.RemoteAddressColumnTitle="遠端地址"
|
||||||
|
OBSWebSocket.SessionTable.SessionDurationColumnTitle="工作階段時長"
|
||||||
|
OBSWebSocket.SessionTable.MessagesInOutColumnTitle="訊息進出"
|
||||||
|
OBSWebSocket.SessionTable.IdentifiedTitle="已辨認階段"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonColumnTitle="驅逐?"
|
||||||
|
OBSWebSocket.SessionTable.KickButtonText="驅逐"
|
||||||
|
OBSWebSocket.ConnectInfo.DialogTitle="WebSocket 連線資訊"
|
||||||
|
OBSWebSocket.ConnectInfo.CopyText="複製"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerIp="(最可能的)伺服器 IP"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPort="伺服器連線埠"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPassword="伺服器密碼"
|
||||||
|
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[已停用認證]"
|
||||||
|
OBSWebSocket.ConnectInfo.QrTitle="連線 QR 碼"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Title="新的 WebSocket 工作階段"
|
||||||
|
OBSWebSocket.TrayNotification.Identified.Body="已辨認 %1 用戶端。"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket 認證失敗"
|
||||||
|
OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 用戶端無法進行認證。"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket 用戶端已斷線"
|
||||||
|
OBSWebSocket.TrayNotification.Disconnected.Body="%1 用戶端已斷線。"
|
||||||
|
OBSWebSocket.Server.StartFailed.Title="WebSocket 伺服器錯誤"
|
||||||
|
OBSWebSocket.Server.StartFailed.Message="無法啟動 WebSocket 伺服器。可能 TCP 連線埠 %1 已經被系統中的某個應用程式佔用。請嘗試在 WebSocket 伺服器設定更改不同的 TCP 連線埠,或停止任何可能正在使用這個連線埠的應用程式。\n錯誤訊息:%2"
|
2
deps/asio
vendored
2
deps/asio
vendored
Submodule deps/asio updated: 08a7029cb1...b73dc1d2c0
@ -1,11 +1,13 @@
|
|||||||
# obs-websocket documentation
|
# obs-websocket documentation
|
||||||
|
|
||||||
This is the documentation for obs-websocket. Run build_docs.sh to auto generate the latest docs from the `src` directory. There are 3 components to the docs generation:
|
This is the documentation for obs-websocket. Run `build_docs.sh` to auto generate the latest docs from the `src` directory. There are 3 components to the docs generation:
|
||||||
|
|
||||||
- `comments/comments.js`: Generates the `work/comments.json` file from the code comments in the src directory.
|
- `comments/comments.js`: Generates the `work/comments.json` file from the code comments in the src directory.
|
||||||
- `docs/process_comments.py`: Processes `work/comments.json` to create `generated/protocol.json`, which is a machine-readable documentation format that can be used to create obs-websocket client libraries.
|
- `docs/process_comments.py`: Processes `work/comments.json` to create `generated/protocol.json`, which is a machine-readable documentation format that can be used to create obs-websocket client libraries.
|
||||||
- `docs/generate_md.py`: Processes `generated/protocol.json` to create `generated/protocol.md`, which is the actual human-readable documentation.
|
- `docs/generate_md.py`: Processes `generated/protocol.json` to create `generated/protocol.md`, which is the actual human-readable documentation.
|
||||||
|
|
||||||
Some notes about documenting:
|
Some notes about documenting:
|
||||||
|
|
||||||
- The `complexity` comment line is a suggestion to the user about how much knowledge about OBS's inner workings is required to safely use the associated feature. `1` for easy, `5` for megadeath-expert.
|
- The `complexity` comment line is a suggestion to the user about how much knowledge about OBS's inner workings is required to safely use the associated feature. `1` for easy, `5` for megadeath-expert.
|
||||||
- The `rpcVersion` comment line is used to specify the latest available version that the feature is available in. If a feature is deprecated, then the placeholder value of `-1` should be replaced with the last RPC version that the feature will be available in. Manually specifying an RPC version automatically adds the `Deprecated` line to the entry in `generated/protocol.md`.
|
- The `rpcVersion` comment line is used to specify the latest available version that the feature is available in. If a feature is deprecated, then the placeholder value of `-1` should be replaced with the last RPC version that the feature will be available in. Manually specifying an RPC version automatically adds the `Deprecated` line to the entry in `generated/protocol.md`.
|
||||||
- The description can be multiple lines, but must be contained above the first documentation property (the lines starting with `@`).
|
- The description can be multiple lines, but must be contained above the first documentation property (the lines starting with `@`).
|
||||||
@ -13,13 +15,15 @@ Some notes about documenting:
|
|||||||
- `Array` types follow this format: `Array<subtype>`, for example `Array<String>` to specify an array of strings.
|
- `Array` types follow this format: `Array<subtype>`, for example `Array<String>` to specify an array of strings.
|
||||||
|
|
||||||
Formatting notes:
|
Formatting notes:
|
||||||
|
|
||||||
- Fields should have their columns aligned. So in a request, the columns of all `@requestField`s should be aligned.
|
- Fields should have their columns aligned. So in a request, the columns of all `@requestField`s should be aligned.
|
||||||
- We suggest looking at how other enums/events/requests have been documented before documenting one of your own, to get a general feel of how things have been formatted.
|
- We suggest looking at how other enums/events/requests have been documented before documenting one of your own, to get a general feel of how things have been formatted.
|
||||||
|
|
||||||
## Creating enum documentation
|
## Creating enum documentation
|
||||||
|
|
||||||
Enums follow this code comment format:
|
Enums follow this code comment format:
|
||||||
```
|
|
||||||
|
```js
|
||||||
/**
|
/**
|
||||||
* [description]
|
* [description]
|
||||||
*
|
*
|
||||||
@ -33,7 +37,8 @@ Enums follow this code comment format:
|
|||||||
```
|
```
|
||||||
|
|
||||||
Example code comment:
|
Example code comment:
|
||||||
```
|
|
||||||
|
```js
|
||||||
/**
|
/**
|
||||||
* The initial message sent by obs-websocket to newly connected clients.
|
* The initial message sent by obs-websocket to newly connected clients.
|
||||||
*
|
*
|
||||||
@ -45,12 +50,14 @@ Example code comment:
|
|||||||
* @api enums
|
* @api enums
|
||||||
*/
|
*/
|
||||||
```
|
```
|
||||||
|
|
||||||
- This is the documentation for the `WebSocketOpCode::Hello` enum identifier.
|
- This is the documentation for the `WebSocketOpCode::Hello` enum identifier.
|
||||||
|
|
||||||
## Creating event documentation
|
## Creating event documentation
|
||||||
|
|
||||||
Events follow this code comment format:
|
Events follow this code comment format:
|
||||||
```
|
|
||||||
|
```js
|
||||||
/**
|
/**
|
||||||
* [description]
|
* [description]
|
||||||
*
|
*
|
||||||
@ -68,7 +75,8 @@ Events follow this code comment format:
|
|||||||
```
|
```
|
||||||
|
|
||||||
Example code comment:
|
Example code comment:
|
||||||
```
|
|
||||||
|
```js
|
||||||
/**
|
/**
|
||||||
* Studio mode has been enabled or disabled.
|
* Studio mode has been enabled or disabled.
|
||||||
*
|
*
|
||||||
@ -87,7 +95,8 @@ Example code comment:
|
|||||||
## Creating request documentation
|
## Creating request documentation
|
||||||
|
|
||||||
Requests follow this code comment format:
|
Requests follow this code comment format:
|
||||||
```
|
|
||||||
|
```js
|
||||||
/**
|
/**
|
||||||
* [description]
|
* [description]
|
||||||
*
|
*
|
||||||
@ -105,10 +114,12 @@ Requests follow this code comment format:
|
|||||||
* @api requests
|
* @api requests
|
||||||
*/
|
*/
|
||||||
```
|
```
|
||||||
|
|
||||||
- The optional flag is a `?` that prefixes the field name, telling the docs processor that the field is optionally specified.
|
- The optional flag is a `?` that prefixes the field name, telling the docs processor that the field is optionally specified.
|
||||||
|
|
||||||
Example code comment:
|
Example code comment:
|
||||||
```
|
|
||||||
|
```js
|
||||||
/**
|
/**
|
||||||
* Gets the value of a "slot" from the selected persistent data realm.
|
* Gets the value of a "slot" from the selected persistent data realm.
|
||||||
*
|
*
|
||||||
|
@ -9,7 +9,9 @@ enumTypeOrder = [
|
|||||||
'WebSocketCloseCode',
|
'WebSocketCloseCode',
|
||||||
'RequestBatchExecutionType',
|
'RequestBatchExecutionType',
|
||||||
'RequestStatus',
|
'RequestStatus',
|
||||||
'EventSubscription'
|
'EventSubscription',
|
||||||
|
'ObsMediaInputAction',
|
||||||
|
'ObsOutputState'
|
||||||
]
|
]
|
||||||
|
|
||||||
categoryOrder = [
|
categoryOrder = [
|
||||||
@ -30,7 +32,6 @@ categoryOrder = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
requestFieldHeader = """
|
requestFieldHeader = """
|
||||||
|
|
||||||
**Request Fields:**
|
**Request Fields:**
|
||||||
|
|
||||||
| Name | Type | Description | Value Restrictions | ?Default Behavior |
|
| Name | Type | Description | Value Restrictions | ?Default Behavior |
|
||||||
@ -38,7 +39,6 @@ requestFieldHeader = """
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
responseFieldHeader = """
|
responseFieldHeader = """
|
||||||
|
|
||||||
**Response Fields:**
|
**Response Fields:**
|
||||||
|
|
||||||
| Name | Type | Description |
|
| Name | Type | Description |
|
||||||
@ -46,7 +46,6 @@ responseFieldHeader = """
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
dataFieldHeader = """
|
dataFieldHeader = """
|
||||||
|
|
||||||
**Data Fields:**
|
**Data Fields:**
|
||||||
|
|
||||||
| Name | Type | Description |
|
| Name | Type | Description |
|
||||||
@ -130,6 +129,8 @@ def get_enums(enums):
|
|||||||
ret += '- Added in v{}\n'.format(enumIdentifier['initialVersion'])
|
ret += '- Added in v{}\n'.format(enumIdentifier['initialVersion'])
|
||||||
if enumIdentifier != enum['enumIdentifiers'][-1]:
|
if enumIdentifier != enum['enumIdentifiers'][-1]:
|
||||||
ret += '\n---\n\n'
|
ret += '\n---\n\n'
|
||||||
|
else:
|
||||||
|
ret += '\n'
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def get_requests_toc(requests):
|
def get_requests_toc(requests):
|
||||||
@ -143,7 +144,7 @@ def get_requests_toc(requests):
|
|||||||
if not len(requestsOut):
|
if not len(requestsOut):
|
||||||
continue
|
continue
|
||||||
categoryFragment = get_fragment(category, False)
|
categoryFragment = get_fragment(category, False)
|
||||||
ret += '- [{}](#{})\n'.format(category, categoryFragment)
|
ret += '- [{} Requests](#{}-requests)\n'.format(category, categoryFragment)
|
||||||
for request in requestsOut:
|
for request in requestsOut:
|
||||||
requestType = request['requestType']
|
requestType = request['requestType']
|
||||||
requestTypeFragment = get_fragment(requestType, False)
|
requestTypeFragment = get_fragment(requestType, False)
|
||||||
@ -161,7 +162,7 @@ def get_requests(requests):
|
|||||||
if not len(requestsOut):
|
if not len(requestsOut):
|
||||||
continue
|
continue
|
||||||
categoryFragment = get_fragment(category)
|
categoryFragment = get_fragment(category)
|
||||||
ret += '\n\n## {}\n\n'.format(category)
|
ret += '## {} Requests\n\n'.format(category)
|
||||||
for request in requestsOut:
|
for request in requestsOut:
|
||||||
requestType = request['requestType']
|
requestType = request['requestType']
|
||||||
requestTypeFragment = get_fragment(requestType)
|
requestTypeFragment = get_fragment(requestType)
|
||||||
@ -193,6 +194,8 @@ def get_requests(requests):
|
|||||||
|
|
||||||
if request != requestsOut[-1]:
|
if request != requestsOut[-1]:
|
||||||
ret += '\n---\n\n'
|
ret += '\n---\n\n'
|
||||||
|
else:
|
||||||
|
ret += '\n'
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def get_events_toc(events):
|
def get_events_toc(events):
|
||||||
@ -206,7 +209,7 @@ def get_events_toc(events):
|
|||||||
if not len(eventsOut):
|
if not len(eventsOut):
|
||||||
continue
|
continue
|
||||||
categoryFragment = get_fragment(category, False)
|
categoryFragment = get_fragment(category, False)
|
||||||
ret += '- [{}](#{})\n'.format(category, categoryFragment)
|
ret += '- [{} Events](#{}-events)\n'.format(category, categoryFragment)
|
||||||
for event in eventsOut:
|
for event in eventsOut:
|
||||||
eventType = event['eventType']
|
eventType = event['eventType']
|
||||||
eventTypeFragment = get_fragment(eventType, False)
|
eventTypeFragment = get_fragment(eventType, False)
|
||||||
@ -224,7 +227,7 @@ def get_events(events):
|
|||||||
if not len(eventsOut):
|
if not len(eventsOut):
|
||||||
continue
|
continue
|
||||||
categoryFragment = get_fragment(category)
|
categoryFragment = get_fragment(category)
|
||||||
ret += '## {}\n\n'.format(category)
|
ret += '## {} Events\n\n'.format(category)
|
||||||
for event in eventsOut:
|
for event in eventsOut:
|
||||||
eventType = event['eventType']
|
eventType = event['eventType']
|
||||||
eventTypeFragment = get_fragment(eventType)
|
eventTypeFragment = get_fragment(eventType)
|
||||||
@ -247,6 +250,8 @@ def get_events(events):
|
|||||||
|
|
||||||
if event != eventsOut[-1]:
|
if event != eventsOut[-1]:
|
||||||
ret += '\n---\n\n'
|
ret += '\n---\n\n'
|
||||||
|
else:
|
||||||
|
ret += '\n'
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
# Actual code
|
# Actual code
|
||||||
@ -264,40 +269,41 @@ except IOError:
|
|||||||
with open('../generated/protocol.json', 'r') as f:
|
with open('../generated/protocol.json', 'r') as f:
|
||||||
protocol = json.load(f)
|
protocol = json.load(f)
|
||||||
|
|
||||||
output = "<!-- This file was automatically generated. Do not edit directly! -->\n\n"
|
output = "<!-- This file was automatically generated. Do not edit directly! -->\n"
|
||||||
|
output += "<!-- markdownlint-disable no-bare-urls -->\n"
|
||||||
|
|
||||||
# Insert introduction partial
|
# Insert introduction partial
|
||||||
output += read_file('partials/introduction.md')
|
output += read_file('partials/introduction.md')
|
||||||
logging.info('Inserted introduction section.')
|
logging.info('Inserted introduction section.')
|
||||||
|
|
||||||
output += '\n\n'
|
output += '\n'
|
||||||
|
|
||||||
# Generate enums MD
|
# Generate enums MD
|
||||||
output += read_file('partials/enumsHeader.md')
|
output += read_file('partials/enumsHeader.md')
|
||||||
|
output += '\n'
|
||||||
output += get_enums_toc(protocol['enums'])
|
output += get_enums_toc(protocol['enums'])
|
||||||
output += '\n\n'
|
output += '\n'
|
||||||
output += get_enums(protocol['enums'])
|
output += get_enums(protocol['enums'])
|
||||||
logging.info('Inserted enums section.')
|
logging.info('Inserted enums section.')
|
||||||
|
|
||||||
output += '\n\n'
|
|
||||||
|
|
||||||
# Generate events MD
|
# Generate events MD
|
||||||
output += read_file('partials/eventsHeader.md')
|
output += read_file('partials/eventsHeader.md')
|
||||||
|
output += '\n'
|
||||||
output += get_events_toc(protocol['events'])
|
output += get_events_toc(protocol['events'])
|
||||||
output += '\n\n'
|
output += '\n'
|
||||||
output += get_events(protocol['events'])
|
output += get_events(protocol['events'])
|
||||||
logging.info('Inserted events section.')
|
logging.info('Inserted events section.')
|
||||||
|
|
||||||
output += '\n\n'
|
|
||||||
|
|
||||||
# Generate requests MD
|
# Generate requests MD
|
||||||
output += read_file('partials/requestsHeader.md')
|
output += read_file('partials/requestsHeader.md')
|
||||||
|
output += '\n'
|
||||||
output += get_requests_toc(protocol['requests'])
|
output += get_requests_toc(protocol['requests'])
|
||||||
output += '\n\n'
|
output += '\n'
|
||||||
output += get_requests(protocol['requests'])
|
output += get_requests(protocol['requests'])
|
||||||
logging.info('Inserted requests section.')
|
logging.info('Inserted requests section.')
|
||||||
|
|
||||||
output += '\n\n'
|
if output.endswith('\n\n'):
|
||||||
|
output = output[:-1]
|
||||||
|
|
||||||
# Write new protocol MD
|
# Write new protocol MD
|
||||||
with open('../generated/protocol.md', 'w') as f:
|
with open('../generated/protocol.md', 'w') as f:
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
# Enums
|
# Enums
|
||||||
|
|
||||||
These are enumeration declarations, which are referenced throughout obs-websocket's protocol.
|
These are enumeration declarations, which are referenced throughout obs-websocket's protocol.
|
||||||
|
|
||||||
### Enumerations Table of Contents
|
## Enumerations Table of Contents
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
# Events
|
# Events
|
||||||
|
|
||||||
### Events Table of Contents
|
## Events Table of Contents
|
||||||
|
@ -1,28 +1,34 @@
|
|||||||
# Main Table of Contents
|
|
||||||
- [obs-websocket 5.0.0 Protocol](#obs-websocket-500-protocol)
|
# obs-websocket 5.1.0 Protocol
|
||||||
|
|
||||||
|
## Main Table of Contents
|
||||||
|
|
||||||
|
- [General Intro](#general-intro)
|
||||||
|
- [Design Goals](#design-goals)
|
||||||
- [Connecting to obs-websocket](#connecting-to-obs-websocket)
|
- [Connecting to obs-websocket](#connecting-to-obs-websocket)
|
||||||
- [Connection steps](#connection-steps)
|
- [Connection steps](#connection-steps)
|
||||||
|
- [Connection Notes](#connection-notes)
|
||||||
- [Creating an authentication string](#creating-an-authentication-string)
|
- [Creating an authentication string](#creating-an-authentication-string)
|
||||||
- [Base message types](#message-types)
|
- [Message Types (OpCodes)](#message-types-opcodes)
|
||||||
- [OpCode 0 Hello](#hello-opcode-0)
|
- [Hello (OpCode 0)](#hello-opcode-0)
|
||||||
- [OpCode 1 Identify](#identify-opcode-1)
|
- [Identify (OpCode 1)](#identify-opcode-1)
|
||||||
- [OpCode 2 Identified](#identified-opcode-2)
|
- [Identified (OpCode 2)](#identified-opcode-2)
|
||||||
- [OpCode 3 Reidentify](#reidentify-opcode-3)
|
- [Reidentify (OpCode 3)](#reidentify-opcode-3)
|
||||||
- [OpCode 5 Event](#event-opcode-5)
|
- [Event (OpCode 5)](#event-opcode-5)
|
||||||
- [OpCode 6 Request](#request-opcode-6)
|
- [Request (OpCode 6)](#request-opcode-6)
|
||||||
- [OpCode 7 RequestResponse](#requestresponse-opcode-7)
|
- [RequestResponse (OpCode 7)](#requestresponse-opcode-7)
|
||||||
- [OpCode 8 RequestBatch](#requestbatch-opcode-8)
|
- [RequestBatch (OpCode 8)](#requestbatch-opcode-8)
|
||||||
- [OpCode 9 RequestBatchResponse](#requestbatchresponse-opcode-9)
|
- [RequestBatchResponse (OpCode 9)](#requestbatchresponse-opcode-9)
|
||||||
- [Enums](#enums)
|
- [Enumerations](#enums)
|
||||||
- [Events](#events)
|
- [Events](#events)
|
||||||
- [Requests](#requests)
|
- [Requests](#requests)
|
||||||
|
|
||||||
# obs-websocket 5.0.0 Protocol
|
|
||||||
|
|
||||||
## General Intro
|
## General Intro
|
||||||
|
|
||||||
obs-websocket provides a feature-rich RPC communication protocol, giving access to much of OBS's feature set. This document contains everything you should know in order to make a connection and use obs-websocket's functionality to the fullest.
|
obs-websocket provides a feature-rich RPC communication protocol, giving access to much of OBS's feature set. This document contains everything you should know in order to make a connection and use obs-websocket's functionality to the fullest.
|
||||||
|
|
||||||
### Design Goals
|
### Design Goals
|
||||||
|
|
||||||
- Abstraction of identification, events, requests, and batch requests into dedicated message types
|
- Abstraction of identification, events, requests, and batch requests into dedicated message types
|
||||||
- Conformity of request naming using similar terms like `Get`, `Set`, `Get[x]List`, `Start[x]`, `Toggle[x]`
|
- Conformity of request naming using similar terms like `Get`, `Set`, `Get[x]List`, `Start[x]`, `Toggle[x]`
|
||||||
- Conformity of OBS data field names like `sourceName`, `sourceKind`, `sourceType`, `sceneName`, `sceneItemName`
|
- Conformity of OBS data field names like `sourceName`, `sourceKind`, `sourceType`, `sceneName`, `sceneItemName`
|
||||||
@ -31,13 +37,14 @@ obs-websocket provides a feature-rich RPC communication protocol, giving access
|
|||||||
- PubSub system - Allow clients to specify which events they do or don't want to receive from OBS
|
- PubSub system - Allow clients to specify which events they do or don't want to receive from OBS
|
||||||
- RPC versioning - Client and server negotiate the latest version of the obs-websocket protocol to communicate with.
|
- RPC versioning - Client and server negotiate the latest version of the obs-websocket protocol to communicate with.
|
||||||
|
|
||||||
|
|
||||||
## Connecting to obs-websocket
|
## Connecting to obs-websocket
|
||||||
|
|
||||||
Here's info on how to connect to obs-websocket
|
Here's info on how to connect to obs-websocket
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### Connection steps
|
### Connection steps
|
||||||
|
|
||||||
These steps should be followed precisely. Failure to connect to the server as instructed will likely result in your client being treated in an undefined way.
|
These steps should be followed precisely. Failure to connect to the server as instructed will likely result in your client being treated in an undefined way.
|
||||||
|
|
||||||
- Initial HTTP request made to the obs-websocket server.
|
- Initial HTTP request made to the obs-websocket server.
|
||||||
@ -64,6 +71,7 @@ These steps should be followed precisely. Failure to connect to the server as in
|
|||||||
- At any time after a client has been identified, it may send an [OpCode 3 `Reidentify`](#reidentify-opcode-3) message to update certain allowed session parameters. The server will respond in the same way it does during initial identification.
|
- At any time after a client has been identified, it may send an [OpCode 3 `Reidentify`](#reidentify-opcode-3) message to update certain allowed session parameters. The server will respond in the same way it does during initial identification.
|
||||||
|
|
||||||
#### Connection Notes
|
#### Connection Notes
|
||||||
|
|
||||||
- If a binary frame is received when using the `obswebsocket.json` (default) subprotocol, or a text frame is received while using the `obswebsocket.msgpack` subprotocol, the connection is closed with `WebSocketCloseCode::MessageDecodeError`.
|
- If a binary frame is received when using the `obswebsocket.json` (default) subprotocol, or a text frame is received while using the `obswebsocket.msgpack` subprotocol, the connection is closed with `WebSocketCloseCode::MessageDecodeError`.
|
||||||
- The obs-websocket server listens for any messages containing a `request-type` field in the first level JSON from unidentified clients. If a message matches, the connection is closed with `WebSocketCloseCode::UnsupportedRpcVersion` and a warning is logged.
|
- The obs-websocket server listens for any messages containing a `request-type` field in the first level JSON from unidentified clients. If a message matches, the connection is closed with `WebSocketCloseCode::UnsupportedRpcVersion` and a warning is logged.
|
||||||
- If a message with a `messageType` is not recognized to the obs-websocket server, the connection is closed with `WebSocketCloseCode::UnknownOpCode`.
|
- If a message with a `messageType` is not recognized to the obs-websocket server, the connection is closed with `WebSocketCloseCode::UnknownOpCode`.
|
||||||
@ -72,11 +80,13 @@ These steps should be followed precisely. Failure to connect to the server as in
|
|||||||
---
|
---
|
||||||
|
|
||||||
### Creating an authentication string
|
### Creating an authentication string
|
||||||
|
|
||||||
obs-websocket uses SHA256 to transmit authentication credentials. The server starts by sending an object in the `authentication` field of its `Hello` message data. The client processes the authentication challenge and responds via the `authentication` string in the `Identify` message data.
|
obs-websocket uses SHA256 to transmit authentication credentials. The server starts by sending an object in the `authentication` field of its `Hello` message data. The client processes the authentication challenge and responds via the `authentication` string in the `Identify` message data.
|
||||||
|
|
||||||
For this guide, we'll be using `supersecretpassword` as the password.
|
For this guide, we'll be using `supersecretpassword` as the password.
|
||||||
|
|
||||||
The `authentication` object in `Hello` looks like this (example):
|
The `authentication` object in `Hello` looks like this (example):
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"challenge": "+IxH4CnCiqpX1rM9scsNynZzbOe4KhDeYcTNS3PDaeY=",
|
"challenge": "+IxH4CnCiqpX1rM9scsNynZzbOe4KhDeYcTNS3PDaeY=",
|
||||||
@ -85,6 +95,7 @@ The `authentication` object in `Hello` looks like this (example):
|
|||||||
```
|
```
|
||||||
|
|
||||||
To generate the authentication string, follow these steps:
|
To generate the authentication string, follow these steps:
|
||||||
|
|
||||||
- Concatenate the websocket password with the `salt` provided by the server (`password + salt`)
|
- Concatenate the websocket password with the `salt` provided by the server (`password + salt`)
|
||||||
- Generate an SHA256 binary hash of the result and base64 encode it, known as a base64 secret.
|
- Generate an SHA256 binary hash of the result and base64 encode it, known as a base64 secret.
|
||||||
- Concatenate the base64 secret with the `challenge` sent by the server (`base64_secret + challenge`)
|
- Concatenate the base64 secret with the `challenge` sent by the server (`base64_secret + challenge`)
|
||||||
@ -92,44 +103,50 @@ To generate the authentication string, follow these steps:
|
|||||||
|
|
||||||
For real-world examples of the `authentication` string creation, refer to the obs-websocket client libraries listed on the [README](README.md).
|
For real-world examples of the `authentication` string creation, refer to the obs-websocket client libraries listed on the [README](README.md).
|
||||||
|
|
||||||
|
|
||||||
## Message Types (OpCodes)
|
## Message Types (OpCodes)
|
||||||
|
|
||||||
The following message types are the low-level message types which may be sent to and from obs-websocket.
|
The following message types are the low-level message types which may be sent to and from obs-websocket.
|
||||||
|
|
||||||
Messages sent from the obs-websocket server or client may contain these first-level fields, known as the base object:
|
Messages sent from the obs-websocket server or client may contain these first-level fields, known as the base object:
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"op": number,
|
"op": number,
|
||||||
"d": object
|
"d": object
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- `op` is a `WebSocketOpCode` OpCode.
|
- `op` is a `WebSocketOpCode` OpCode.
|
||||||
- `d` is an object of the data fields associated with the operation.
|
- `d` is an object of the data fields associated with the operation.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### Hello (OpCode 0)
|
### Hello (OpCode 0)
|
||||||
|
|
||||||
- Sent from: obs-websocket
|
- Sent from: obs-websocket
|
||||||
- Sent to: Freshly connected websocket client
|
- Sent to: Freshly connected websocket client
|
||||||
- Description: First message sent from the server immediately on client connection. Contains authentication information if auth is required. Also contains RPC version for version negotiation.
|
- Description: First message sent from the server immediately on client connection. Contains authentication information if auth is required. Also contains RPC version for version negotiation.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"obsWebSocketVersion": string,
|
"obsWebSocketVersion": string,
|
||||||
"rpcVersion": number,
|
"rpcVersion": number,
|
||||||
"authentication": object(optional)
|
"authentication": object(optional)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- `rpcVersion` is a version number which gets incremented on each **breaking change** to the obs-websocket protocol. Its usage in this context is to provide the current rpc version that the server would like to use.
|
- `rpcVersion` is a version number which gets incremented on each **breaking change** to the obs-websocket protocol. Its usage in this context is to provide the current rpc version that the server would like to use.
|
||||||
|
|
||||||
**Example Messages:**
|
**Example Messages:**
|
||||||
Authentication is required
|
Authentication is required
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 0,
|
"op": 0,
|
||||||
"d": {
|
"d": {
|
||||||
"obsWebSocketVersion": "5.0.0",
|
"obsWebSocketVersion": "5.1.0",
|
||||||
"rpcVersion": 1,
|
"rpcVersion": 1,
|
||||||
"authentication": {
|
"authentication": {
|
||||||
"challenge": "+IxH4CnCiqpX1rM9scsNynZzbOe4KhDeYcTNS3PDaeY=",
|
"challenge": "+IxH4CnCiqpX1rM9scsNynZzbOe4KhDeYcTNS3PDaeY=",
|
||||||
@ -140,11 +157,12 @@ Authentication is required
|
|||||||
```
|
```
|
||||||
|
|
||||||
Authentication is not required
|
Authentication is not required
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 0,
|
"op": 0,
|
||||||
"d": {
|
"d": {
|
||||||
"obsWebSocketVersion": "5.0.0",
|
"obsWebSocketVersion": "5.1.0",
|
||||||
"rpcVersion": 1
|
"rpcVersion": 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,22 +171,26 @@ Authentication is not required
|
|||||||
---
|
---
|
||||||
|
|
||||||
### Identify (OpCode 1)
|
### Identify (OpCode 1)
|
||||||
|
|
||||||
- Sent from: Freshly connected websocket client
|
- Sent from: Freshly connected websocket client
|
||||||
- Sent to: obs-websocket
|
- Sent to: obs-websocket
|
||||||
- Description: Response to `Hello` message, should contain authentication string if authentication is required, along with PubSub subscriptions and other session parameters.
|
- Description: Response to `Hello` message, should contain authentication string if authentication is required, along with PubSub subscriptions and other session parameters.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"rpcVersion": number,
|
"rpcVersion": number,
|
||||||
"authentication": string(optional),
|
"authentication": string(optional),
|
||||||
"eventSubscriptions": number(optional) = (EventSubscription::All)
|
"eventSubscriptions": number(optional) = (EventSubscription::All)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- `rpcVersion` is the version number that the client would like the obs-websocket server to use.
|
- `rpcVersion` is the version number that the client would like the obs-websocket server to use.
|
||||||
- `eventSubscriptions` is a bitmask of `EventSubscriptions` items to subscribe to events and event categories at will. By default, all event categories are subscribed, except for events marked as high volume. High volume events must be explicitly subscribed to.
|
- `eventSubscriptions` is a bitmask of `EventSubscriptions` items to subscribe to events and event categories at will. By default, all event categories are subscribed, except for events marked as high volume. High volume events must be explicitly subscribed to.
|
||||||
|
|
||||||
**Example Message:**
|
**Example Message:**
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 1,
|
"op": 1,
|
||||||
@ -183,19 +205,23 @@ Authentication is not required
|
|||||||
---
|
---
|
||||||
|
|
||||||
### Identified (OpCode 2)
|
### Identified (OpCode 2)
|
||||||
|
|
||||||
- Sent from: obs-websocket
|
- Sent from: obs-websocket
|
||||||
- Sent to: Freshly identified client
|
- Sent to: Freshly identified client
|
||||||
- Description: The identify request was received and validated, and the connection is now ready for normal operation.
|
- Description: The identify request was received and validated, and the connection is now ready for normal operation.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"negotiatedRpcVersion": number
|
"negotiatedRpcVersion": number
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- If rpc version negotiation succeeds, the server determines the RPC version to be used and gives it to the client as `negotiatedRpcVersion`
|
- If rpc version negotiation succeeds, the server determines the RPC version to be used and gives it to the client as `negotiatedRpcVersion`
|
||||||
|
|
||||||
**Example Message:**
|
**Example Message:**
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 2,
|
"op": 2,
|
||||||
@ -208,36 +234,43 @@ Authentication is not required
|
|||||||
---
|
---
|
||||||
|
|
||||||
### Reidentify (OpCode 3)
|
### Reidentify (OpCode 3)
|
||||||
|
|
||||||
- Sent from: Identified client
|
- Sent from: Identified client
|
||||||
- Sent to: obs-websocket
|
- Sent to: obs-websocket
|
||||||
- Description: Sent at any time after initial identification to update the provided session parameters.
|
- Description: Sent at any time after initial identification to update the provided session parameters.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"eventSubscriptions": number(optional) = (EventSubscription::All)
|
"eventSubscriptions": number(optional) = (EventSubscription::All)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- Only the listed parameters may be changed after initial identification. To change a parameter not listed, you must reconnect to the obs-websocket server.
|
- Only the listed parameters may be changed after initial identification. To change a parameter not listed, you must reconnect to the obs-websocket server.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### Event (OpCode 5)
|
### Event (OpCode 5)
|
||||||
|
|
||||||
- Sent from: obs-websocket
|
- Sent from: obs-websocket
|
||||||
- Sent to: All subscribed and identified clients
|
- Sent to: All subscribed and identified clients
|
||||||
- Description: An event coming from OBS has occured. Eg scene switched, source muted.
|
- Description: An event coming from OBS has occured. Eg scene switched, source muted.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"eventType": string,
|
"eventType": string,
|
||||||
"eventIntent": number,
|
"eventIntent": number,
|
||||||
"eventData": object(optional)
|
"eventData": object(optional)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- `eventIntent` is the original intent required to be subscribed to in order to receive the event.
|
- `eventIntent` is the original intent required to be subscribed to in order to receive the event.
|
||||||
|
|
||||||
**Example Message:**
|
**Example Message:**
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 5,
|
"op": 5,
|
||||||
@ -254,12 +287,14 @@ Authentication is not required
|
|||||||
---
|
---
|
||||||
|
|
||||||
### Request (OpCode 6)
|
### Request (OpCode 6)
|
||||||
|
|
||||||
- Sent from: Identified client
|
- Sent from: Identified client
|
||||||
- Sent to: obs-websocket
|
- Sent to: obs-websocket
|
||||||
- Description: Client is making a request to obs-websocket. Eg get current scene, create source.
|
- Description: Client is making a request to obs-websocket. Eg get current scene, create source.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"requestType": string,
|
"requestType": string,
|
||||||
"requestId": string,
|
"requestId": string,
|
||||||
@ -269,11 +304,12 @@ Authentication is not required
|
|||||||
```
|
```
|
||||||
|
|
||||||
**Example Message:**
|
**Example Message:**
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 6,
|
"op": 6,
|
||||||
"d": {
|
"d": {
|
||||||
"requestType": "SetCurrentScene",
|
"requestType": "SetCurrentProgramScene",
|
||||||
"requestId": "f819dcf0-89cc-11eb-8f0e-382c4ac93b9c",
|
"requestId": "f819dcf0-89cc-11eb-8f0e-382c4ac93b9c",
|
||||||
"requestData": {
|
"requestData": {
|
||||||
"sceneName": "Scene 12"
|
"sceneName": "Scene 12"
|
||||||
@ -285,12 +321,14 @@ Authentication is not required
|
|||||||
---
|
---
|
||||||
|
|
||||||
### RequestResponse (OpCode 7)
|
### RequestResponse (OpCode 7)
|
||||||
|
|
||||||
- Sent from: obs-websocket
|
- Sent from: obs-websocket
|
||||||
- Sent to: Identified client which made the request
|
- Sent to: Identified client which made the request
|
||||||
- Description: obs-websocket is responding to a request coming from a client.
|
- Description: obs-websocket is responding to a request coming from a client.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"requestType": string,
|
"requestType": string,
|
||||||
"requestId": string,
|
"requestId": string,
|
||||||
@ -298,27 +336,31 @@ Authentication is not required
|
|||||||
"responseData": object(optional)
|
"responseData": object(optional)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- The `requestType` and `requestId` are simply mirrors of what was sent by the client.
|
- The `requestType` and `requestId` are simply mirrors of what was sent by the client.
|
||||||
|
|
||||||
`requestStatus` object:
|
`requestStatus` object:
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"result": bool,
|
"result": bool,
|
||||||
"code": number,
|
"code": number,
|
||||||
"comment": string(optional)
|
"comment": string(optional)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- `result` is `true` if the request resulted in `RequestStatus::Success`. False if otherwise.
|
- `result` is `true` if the request resulted in `RequestStatus::Success`. False if otherwise.
|
||||||
- `code` is a `RequestStatus` code.
|
- `code` is a `RequestStatus` code.
|
||||||
- `comment` may be provided by the server on errors to offer further details on why a request failed.
|
- `comment` may be provided by the server on errors to offer further details on why a request failed.
|
||||||
|
|
||||||
**Example Messages:**
|
**Example Messages:**
|
||||||
Successful Response
|
Successful Response
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 7,
|
"op": 7,
|
||||||
"d": {
|
"d": {
|
||||||
"requestType": "SetCurrentScene",
|
"requestType": "SetCurrentProgramScene",
|
||||||
"requestId": "f819dcf0-89cc-11eb-8f0e-382c4ac93b9c",
|
"requestId": "f819dcf0-89cc-11eb-8f0e-382c4ac93b9c",
|
||||||
"requestStatus": {
|
"requestStatus": {
|
||||||
"result": true,
|
"result": true,
|
||||||
@ -329,11 +371,12 @@ Successful Response
|
|||||||
```
|
```
|
||||||
|
|
||||||
Failure Response
|
Failure Response
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"op": 7,
|
"op": 7,
|
||||||
"d": {
|
"d": {
|
||||||
"requestType": "SetCurrentScene",
|
"requestType": "SetCurrentProgramScene",
|
||||||
"requestId": "f819dcf0-89cc-11eb-8f0e-382c4ac93b9c",
|
"requestId": "f819dcf0-89cc-11eb-8f0e-382c4ac93b9c",
|
||||||
"requestStatus": {
|
"requestStatus": {
|
||||||
"result": false,
|
"result": false,
|
||||||
@ -347,12 +390,14 @@ Failure Response
|
|||||||
---
|
---
|
||||||
|
|
||||||
### RequestBatch (OpCode 8)
|
### RequestBatch (OpCode 8)
|
||||||
|
|
||||||
- Sent from: Identified client
|
- Sent from: Identified client
|
||||||
- Sent to: obs-websocket
|
- Sent to: obs-websocket
|
||||||
- Description: Client is making a batch of requests for obs-websocket. Requests are processed serially (in order) by the server.
|
- Description: Client is making a batch of requests for obs-websocket. Requests are processed serially (in order) by the server.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"requestId": string,
|
"requestId": string,
|
||||||
"haltOnFailure": bool(optional) = false,
|
"haltOnFailure": bool(optional) = false,
|
||||||
@ -360,18 +405,21 @@ Failure Response
|
|||||||
"requests": array<object>
|
"requests": array<object>
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- When `haltOnFailure` is `true`, the processing of requests will be halted on first failure. Returns only the processed requests in [`RequestBatchResponse`](#requestbatchresponse-opcode-9).
|
- When `haltOnFailure` is `true`, the processing of requests will be halted on first failure. Returns only the processed requests in [`RequestBatchResponse`](#requestbatchresponse-opcode-9).
|
||||||
- Requests in the `requests` array follow the same structure as the `Request` payload data format, however `requestId` is an optional field.
|
- Requests in the `requests` array follow the same structure as the `Request` payload data format, however `requestId` is an optional field.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### RequestBatchResponse (OpCode 9)
|
### RequestBatchResponse (OpCode 9)
|
||||||
|
|
||||||
- Sent from: obs-websocket
|
- Sent from: obs-websocket
|
||||||
- Sent to: Identified client which made the request
|
- Sent to: Identified client which made the request
|
||||||
- Description: obs-websocket is responding to a request batch coming from the client.
|
- Description: obs-websocket is responding to a request batch coming from the client.
|
||||||
|
|
||||||
**Data Keys:**
|
**Data Keys:**
|
||||||
```
|
|
||||||
|
```txt
|
||||||
{
|
{
|
||||||
"requestId": string,
|
"requestId": string,
|
||||||
"results": array<object>
|
"results": array<object>
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
# Requests
|
# Requests
|
||||||
|
|
||||||
### Requests Table of Contents
|
## Requests Table of Contents
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,74 +0,0 @@
|
|||||||
#define MyAppName "obs-websocket"
|
|
||||||
#define MyAppVersion "@OBS_WEBSOCKET_VERSION@"
|
|
||||||
#define MyAppPublisher "obs-websocket"
|
|
||||||
#define MyAppURL "http://github.com/obsproject/obs-websocket"
|
|
||||||
|
|
||||||
[Setup]
|
|
||||||
; NOTE: The value of AppId uniquely identifies this application.
|
|
||||||
; Do not use the same AppId value in installers for other applications.
|
|
||||||
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
|
|
||||||
AppId={{117EE44F-48E1-49E5-A381-CC8D9195CF35}
|
|
||||||
AppName={#MyAppName}
|
|
||||||
AppVersion={#MyAppVersion}
|
|
||||||
AppPublisher={#MyAppPublisher}
|
|
||||||
AppPublisherURL={#MyAppURL}
|
|
||||||
AppSupportURL={#MyAppURL}
|
|
||||||
AppUpdatesURL={#MyAppURL}
|
|
||||||
DefaultDirName={code:GetDirName}
|
|
||||||
DefaultGroupName={#MyAppName}
|
|
||||||
OutputBaseFilename=obs-websocket-{#MyAppVersion}-Windows-Installer
|
|
||||||
Compression=lzma
|
|
||||||
SolidCompression=yes
|
|
||||||
DirExistsWarning=no
|
|
||||||
|
|
||||||
[Languages]
|
|
||||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
|
||||||
|
|
||||||
[Files]
|
|
||||||
Source: "..\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
|
|
||||||
Source: "..\LICENSE"; Flags: dontcopy
|
|
||||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
|
||||||
|
|
||||||
[Icons]
|
|
||||||
Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
|
|
||||||
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
|
|
||||||
|
|
||||||
[Code]
|
|
||||||
procedure InitializeWizard();
|
|
||||||
var
|
|
||||||
GPLText: AnsiString;
|
|
||||||
Page: TOutputMsgMemoWizardPage;
|
|
||||||
begin
|
|
||||||
ExtractTemporaryFile('LICENSE');
|
|
||||||
LoadStringFromFile(ExpandConstant('{tmp}\LICENSE'), GPLText);
|
|
||||||
Page := CreateOutputMsgMemoPage(wpWelcome,
|
|
||||||
'License Information', 'Please review the license terms before installing obs-websocket',
|
|
||||||
'Press Page Down to see the rest of the agreement. Once you are aware of your rights, click Next to continue.',
|
|
||||||
String(GPLText)
|
|
||||||
);
|
|
||||||
end;
|
|
||||||
|
|
||||||
// Validate that obs-studio is installed before installing the plugin
|
|
||||||
function PrepareToInstall(var NeedsRestart: Boolean): String;
|
|
||||||
begin
|
|
||||||
Result := '';
|
|
||||||
|
|
||||||
if not DirExists(ExpandConstant('{app}\obs-plugins')) then
|
|
||||||
begin
|
|
||||||
Result := 'The selected install directory does not appear to be valid. Please install OBS Studio before installing {#MyAppName} or correct your install path.';
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
|
|
||||||
// credit where it's due :
|
|
||||||
// following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45
|
|
||||||
function GetDirName(Value: string): string;
|
|
||||||
var
|
|
||||||
InstallPath: string;
|
|
||||||
begin
|
|
||||||
// initialize default path, which will be returned when the following registry
|
|
||||||
// key queries fail due to missing keys or for some different reason
|
|
||||||
Result := '{commonpf}\obs-studio';
|
|
||||||
// query the first registry value; if this succeeds, return the obtained value
|
|
||||||
if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
|
|
||||||
Result := InstallPath
|
|
||||||
end;
|
|
@ -1,3 +1,24 @@
|
|||||||
|
/*
|
||||||
|
obs-websocket
|
||||||
|
Copyright (C) 2020-2021 Kyle Manning <tt2468@gmail.com>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program. If not, see <https://www.gnu.org/licenses/>
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Similar example code can be found in ../../src/obs-websocket.cpp
|
||||||
|
// You can test that sample code by specifying -DPLUGIN_TESTS=TRUE
|
||||||
|
|
||||||
#include <obs-module.h>
|
#include <obs-module.h>
|
||||||
|
|
||||||
#include "../obs-websocket-api.h"
|
#include "../obs-websocket-api.h"
|
||||||
@ -24,6 +45,24 @@ void obs_module_post_load(void)
|
|||||||
|
|
||||||
if (!obs_websocket_vendor_register_request(vendor, "example_request", example_request_cb, NULL))
|
if (!obs_websocket_vendor_register_request(vendor, "example_request", example_request_cb, NULL))
|
||||||
blog(LOG_ERROR, "Failed to register `example_request` request with obs-websocket.");
|
blog(LOG_ERROR, "Failed to register `example_request` request with obs-websocket.");
|
||||||
|
|
||||||
|
uint api_version = obs_websocket_get_api_version();
|
||||||
|
if (api_version == 0) {
|
||||||
|
blog(LOG_ERROR, "Unable to fetch obs-websocket plugin API version.");
|
||||||
|
return;
|
||||||
|
} else if (api_version == 1) {
|
||||||
|
blog(LOG_WARNING, "Unsupported obs-websocket plugin API version for calling requests.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct obs_websocket_request_response *response = obs_websocket_call_request("GetVersion");
|
||||||
|
if (!response) {
|
||||||
|
blog(LOG_ERROR, "Failed to call GetVersion due to obs-websocket not being installed.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
blog(LOG_INFO, "[obs_module_post_load] Called GetVersion. Status Code: %u | Comment: %s | Response Data: %s",
|
||||||
|
response->status_code, response->comment, response->response_data);
|
||||||
|
obs_websocket_request_response_free(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
void obs_module_unload(void)
|
void obs_module_unload(void)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
obs-websocket
|
obs-websocket
|
||||||
Copyright (C) 2016-2021 Stephane Lepin <stephane.lepin@gmail.com>
|
Copyright (C) 2016-2021 Stephane Lepin <stephane.lepin@gmail.com>
|
||||||
Copyright (C) 2020-2021 Kyle Manning <tt2468@gmail.com>
|
Copyright (C) 2020-2022 Kyle Manning <tt2468@gmail.com>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@ -22,6 +22,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#include <obs.h>
|
#include <obs.h>
|
||||||
|
|
||||||
|
#define OBS_WEBSOCKET_API_VERSION 2
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
@ -29,12 +31,22 @@ extern "C" {
|
|||||||
typedef void *obs_websocket_vendor;
|
typedef void *obs_websocket_vendor;
|
||||||
typedef void (*obs_websocket_request_callback_function)(obs_data_t *, obs_data_t *, void *);
|
typedef void (*obs_websocket_request_callback_function)(obs_data_t *, obs_data_t *, void *);
|
||||||
|
|
||||||
|
struct obs_websocket_request_response {
|
||||||
|
unsigned int status_code;
|
||||||
|
char *comment;
|
||||||
|
char *response_data; // JSON string, because obs_data_t* only supports array<object>, so conversions would break API.
|
||||||
|
};
|
||||||
|
|
||||||
|
/* ==================== INTERNAL DEFINITIONS ==================== */
|
||||||
|
|
||||||
struct obs_websocket_request_callback {
|
struct obs_websocket_request_callback {
|
||||||
obs_websocket_request_callback_function callback;
|
obs_websocket_request_callback_function callback;
|
||||||
void *priv_data;
|
void *priv_data;
|
||||||
};
|
};
|
||||||
|
|
||||||
inline proc_handler_t *ph;
|
inline proc_handler_t *_ph;
|
||||||
|
|
||||||
|
/* ==================== INTERNAL API FUNCTIONS ==================== */
|
||||||
|
|
||||||
static inline proc_handler_t *obs_websocket_get_ph(void)
|
static inline proc_handler_t *obs_websocket_get_ph(void)
|
||||||
{
|
{
|
||||||
@ -50,30 +62,98 @@ static inline proc_handler_t *obs_websocket_get_ph(void)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool obs_websocket_run_simple_proc(obs_websocket_vendor vendor, const char *proc_name, calldata_t *cd)
|
static inline bool obs_websocket_ensure_ph(void)
|
||||||
{
|
{
|
||||||
if (!ph || !vendor || !proc_name || !strlen(proc_name) || !cd)
|
if (!_ph)
|
||||||
|
_ph = obs_websocket_get_ph();
|
||||||
|
return _ph != NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool obs_websocket_vendor_run_simple_proc(obs_websocket_vendor vendor, const char *proc_name, calldata_t *cd)
|
||||||
|
{
|
||||||
|
if (!obs_websocket_ensure_ph())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!vendor || !proc_name || !strlen(proc_name) || !cd)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
calldata_set_ptr(cd, "vendor", vendor);
|
calldata_set_ptr(cd, "vendor", vendor);
|
||||||
|
|
||||||
proc_handler_call(ph, proc_name, cd);
|
proc_handler_call(_ph, proc_name, cd);
|
||||||
return calldata_bool(cd, "success");
|
return calldata_bool(cd, "success");
|
||||||
}
|
}
|
||||||
|
|
||||||
// ALWAYS CALL VIA `obs_module_post_load()` CALLBACK!
|
/* ==================== GENERAL API FUNCTIONS ==================== */
|
||||||
|
|
||||||
|
// Gets the API version built with the obs-websocket plugin
|
||||||
|
static inline unsigned int obs_websocket_get_api_version(void)
|
||||||
|
{
|
||||||
|
if (!obs_websocket_ensure_ph())
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
calldata_t cd = {0};
|
||||||
|
|
||||||
|
if (!proc_handler_call(_ph, "get_api_version", &cd))
|
||||||
|
return 1; // API v1 does not include get_api_version
|
||||||
|
|
||||||
|
unsigned int ret = (unsigned int)calldata_int(&cd, "version");
|
||||||
|
|
||||||
|
calldata_free(&cd);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calls an obs-websocket request. Free response with `obs_websocket_request_response_free()`
|
||||||
|
static inline obs_websocket_request_response *obs_websocket_call_request(const char *request_type, obs_data_t *request_data = NULL)
|
||||||
|
{
|
||||||
|
if (!obs_websocket_ensure_ph())
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
const char *request_data_string = NULL;
|
||||||
|
if (request_data)
|
||||||
|
request_data_string = obs_data_get_json(request_data);
|
||||||
|
|
||||||
|
calldata_t cd = {0};
|
||||||
|
|
||||||
|
calldata_set_string(&cd, "request_type", request_type);
|
||||||
|
calldata_set_string(&cd, "request_data", request_data_string);
|
||||||
|
|
||||||
|
proc_handler_call(_ph, "call_request", &cd);
|
||||||
|
|
||||||
|
auto ret = (struct obs_websocket_request_response *)calldata_ptr(&cd, "response");
|
||||||
|
|
||||||
|
calldata_free(&cd);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Free a request response object returned by `obs_websocket_call_request()`
|
||||||
|
static inline void obs_websocket_request_response_free(struct obs_websocket_request_response *response)
|
||||||
|
{
|
||||||
|
if (!response)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (response->comment)
|
||||||
|
bfree(response->comment);
|
||||||
|
if (response->response_data)
|
||||||
|
bfree(response->response_data);
|
||||||
|
bfree(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==================== VENDOR API FUNCTIONS ==================== */
|
||||||
|
|
||||||
|
// ALWAYS CALL ONLY VIA `obs_module_post_load()` CALLBACK!
|
||||||
// Registers a new "vendor" (Example: obs-ndi)
|
// Registers a new "vendor" (Example: obs-ndi)
|
||||||
static inline obs_websocket_vendor obs_websocket_register_vendor(const char *vendor_name)
|
static inline obs_websocket_vendor obs_websocket_register_vendor(const char *vendor_name)
|
||||||
{
|
{
|
||||||
ph = obs_websocket_get_ph();
|
if (!obs_websocket_ensure_ph())
|
||||||
if (!ph)
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
calldata_t cd = {0};
|
calldata_t cd = {0};
|
||||||
|
|
||||||
calldata_set_string(&cd, "name", vendor_name);
|
calldata_set_string(&cd, "name", vendor_name);
|
||||||
|
|
||||||
proc_handler_call(ph, "vendor_register", &cd);
|
proc_handler_call(_ph, "vendor_register", &cd);
|
||||||
obs_websocket_vendor ret = calldata_ptr(&cd, "vendor");
|
obs_websocket_vendor ret = calldata_ptr(&cd, "vendor");
|
||||||
calldata_free(&cd);
|
calldata_free(&cd);
|
||||||
|
|
||||||
@ -81,7 +161,8 @@ static inline obs_websocket_vendor obs_websocket_register_vendor(const char *ven
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Registers a new request for a vendor
|
// Registers a new request for a vendor
|
||||||
static inline bool obs_websocket_vendor_register_request(obs_websocket_vendor vendor, const char *request_type, obs_websocket_request_callback_function request_callback, void* priv_data)
|
static inline bool obs_websocket_vendor_register_request(obs_websocket_vendor vendor, const char *request_type,
|
||||||
|
obs_websocket_request_callback_function request_callback, void *priv_data)
|
||||||
{
|
{
|
||||||
calldata_t cd = {0};
|
calldata_t cd = {0};
|
||||||
|
|
||||||
@ -92,7 +173,7 @@ static inline bool obs_websocket_vendor_register_request(obs_websocket_vendor ve
|
|||||||
calldata_set_string(&cd, "type", request_type);
|
calldata_set_string(&cd, "type", request_type);
|
||||||
calldata_set_ptr(&cd, "callback", &cb);
|
calldata_set_ptr(&cd, "callback", &cb);
|
||||||
|
|
||||||
bool success = obs_websocket_run_simple_proc(vendor, "vendor_request_register", &cd);
|
bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_request_register", &cd);
|
||||||
calldata_free(&cd);
|
calldata_free(&cd);
|
||||||
|
|
||||||
return success;
|
return success;
|
||||||
@ -105,7 +186,7 @@ static inline bool obs_websocket_vendor_unregister_request(obs_websocket_vendor
|
|||||||
|
|
||||||
calldata_set_string(&cd, "type", request_type);
|
calldata_set_string(&cd, "type", request_type);
|
||||||
|
|
||||||
bool success = obs_websocket_run_simple_proc(vendor, "vendor_request_unregister", &cd);
|
bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_request_unregister", &cd);
|
||||||
calldata_free(&cd);
|
calldata_free(&cd);
|
||||||
|
|
||||||
return success;
|
return success;
|
||||||
@ -120,12 +201,14 @@ static inline bool obs_websocket_vendor_emit_event(obs_websocket_vendor vendor,
|
|||||||
calldata_set_string(&cd, "type", event_name);
|
calldata_set_string(&cd, "type", event_name);
|
||||||
calldata_set_ptr(&cd, "data", (void *)event_data);
|
calldata_set_ptr(&cd, "data", (void *)event_data);
|
||||||
|
|
||||||
bool success = obs_websocket_run_simple_proc(vendor, "vendor_event_emit", &cd);
|
bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_event_emit", &cd);
|
||||||
calldata_free(&cd);
|
calldata_free(&cd);
|
||||||
|
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ==================== END API FUNCTIONS ==================== */
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -33,15 +33,17 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#define PARAM_PASSWORD "ServerPassword"
|
#define PARAM_PASSWORD "ServerPassword"
|
||||||
|
|
||||||
#define CMDLINE_WEBSOCKET_PORT "websocket_port"
|
#define CMDLINE_WEBSOCKET_PORT "websocket_port"
|
||||||
|
#define CMDLINE_WEBSOCKET_IPV4_ONLY "websocket_ipv4_only"
|
||||||
#define CMDLINE_WEBSOCKET_PASSWORD "websocket_password"
|
#define CMDLINE_WEBSOCKET_PASSWORD "websocket_password"
|
||||||
#define CMDLINE_WEBSOCKET_DEBUG "websocket_debug"
|
#define CMDLINE_WEBSOCKET_DEBUG "websocket_debug"
|
||||||
|
|
||||||
Config::Config() :
|
Config::Config()
|
||||||
PortOverridden(false),
|
: PortOverridden(false),
|
||||||
PasswordOverridden(false),
|
PasswordOverridden(false),
|
||||||
FirstLoad(true),
|
FirstLoad(true),
|
||||||
ServerEnabled(true),
|
ServerEnabled(false),
|
||||||
ServerPort(4444),
|
ServerPort(4455),
|
||||||
|
Ipv4Only(false),
|
||||||
DebugEnabled(false),
|
DebugEnabled(false),
|
||||||
AlertsEnabled(false),
|
AlertsEnabled(false),
|
||||||
AuthRequired(true),
|
AuthRequired(true),
|
||||||
@ -93,6 +95,12 @@ void Config::Load()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Process `--websocket_ipv4_only` override
|
||||||
|
if (Utils::Platform::GetCommandLineFlagSet(CMDLINE_WEBSOCKET_IPV4_ONLY)) {
|
||||||
|
blog(LOG_INFO, "[Config::Load] --websocket_ipv4_only passed. Binding only to IPv4 interfaces.");
|
||||||
|
Ipv4Only = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Process `--websocket_password` override
|
// Process `--websocket_password` override
|
||||||
QString passwordArgument = Utils::Platform::GetCommandLineArgument(CMDLINE_WEBSOCKET_PASSWORD);
|
QString passwordArgument = Utils::Platform::GetCommandLineArgument(CMDLINE_WEBSOCKET_PASSWORD);
|
||||||
if (passwordArgument != "") {
|
if (passwordArgument != "") {
|
||||||
|
@ -38,6 +38,7 @@ struct Config {
|
|||||||
std::atomic<bool> FirstLoad;
|
std::atomic<bool> FirstLoad;
|
||||||
std::atomic<bool> ServerEnabled;
|
std::atomic<bool> ServerEnabled;
|
||||||
std::atomic<uint16_t> ServerPort;
|
std::atomic<uint16_t> ServerPort;
|
||||||
|
std::atomic<bool> Ipv4Only;
|
||||||
std::atomic<bool> DebugEnabled;
|
std::atomic<bool> DebugEnabled;
|
||||||
std::atomic<bool> AlertsEnabled;
|
std::atomic<bool> AlertsEnabled;
|
||||||
std::atomic<bool> AuthRequired;
|
std::atomic<bool> AuthRequired;
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
#include "WebSocketApi.h"
|
#include "WebSocketApi.h"
|
||||||
|
#include "requesthandler/RequestHandler.h"
|
||||||
#include "obs-websocket.h"
|
#include "obs-websocket.h"
|
||||||
|
#include "utils/Json.h"
|
||||||
|
|
||||||
#define RETURN_STATUS(status) { calldata_set_bool(cd, "success", status); return; }
|
#define RETURN_STATUS(status) \
|
||||||
|
{ \
|
||||||
|
calldata_set_bool(cd, "success", status); \
|
||||||
|
return; \
|
||||||
|
}
|
||||||
#define RETURN_SUCCESS() RETURN_STATUS(true);
|
#define RETURN_SUCCESS() RETURN_STATUS(true);
|
||||||
#define RETURN_FAILURE() RETURN_STATUS(false);
|
#define RETURN_FAILURE() RETURN_STATUS(false);
|
||||||
|
|
||||||
@ -22,10 +28,16 @@ WebSocketApi::WebSocketApi()
|
|||||||
|
|
||||||
_procHandler = proc_handler_create();
|
_procHandler = proc_handler_create();
|
||||||
|
|
||||||
|
proc_handler_add(_procHandler, "bool get_api_version(out int version)", &get_api_version, nullptr);
|
||||||
|
proc_handler_add(_procHandler, "bool call_request(in string request_type, in string request_data, out ptr response)",
|
||||||
|
&call_request, nullptr);
|
||||||
proc_handler_add(_procHandler, "bool vendor_register(in string name, out ptr vendor)", &vendor_register_cb, this);
|
proc_handler_add(_procHandler, "bool vendor_register(in string name, out ptr vendor)", &vendor_register_cb, this);
|
||||||
proc_handler_add(_procHandler, "bool vendor_request_register(in ptr vendor, in string type, in ptr callback)", &vendor_request_register_cb, this);
|
proc_handler_add(_procHandler, "bool vendor_request_register(in ptr vendor, in string type, in ptr callback)",
|
||||||
proc_handler_add(_procHandler, "bool vendor_request_unregister(in ptr vendor, in string type)", &vendor_request_unregister_cb, this);
|
&vendor_request_register_cb, this);
|
||||||
proc_handler_add(_procHandler, "bool vendor_event_emit(in ptr vendor, in string type, in ptr data)", &vendor_event_emit_cb, this);
|
proc_handler_add(_procHandler, "bool vendor_request_unregister(in ptr vendor, in string type)",
|
||||||
|
&vendor_request_unregister_cb, this);
|
||||||
|
proc_handler_add(_procHandler, "bool vendor_event_emit(in ptr vendor, in string type, in ptr data)", &vendor_event_emit_cb,
|
||||||
|
this);
|
||||||
|
|
||||||
proc_handler_t *ph = obs_get_proc_handler();
|
proc_handler_t *ph = obs_get_proc_handler();
|
||||||
assert(ph != NULL);
|
assert(ph != NULL);
|
||||||
@ -54,7 +66,8 @@ void WebSocketApi::SetEventCallback(EventCallback cb)
|
|||||||
_eventCallback = cb;
|
_eventCallback = cb;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum WebSocketApi::RequestReturnCode WebSocketApi::PerformVendorRequest(std::string vendorName, std::string requestType, obs_data_t *requestData, obs_data_t *responseData)
|
enum WebSocketApi::RequestReturnCode WebSocketApi::PerformVendorRequest(std::string vendorName, std::string requestType,
|
||||||
|
obs_data_t *requestData, obs_data_t *responseData)
|
||||||
{
|
{
|
||||||
std::shared_lock l(_mutex);
|
std::shared_lock l(_mutex);
|
||||||
|
|
||||||
@ -88,6 +101,49 @@ void WebSocketApi::get_ph_cb(void *priv_data, calldata_t *cd)
|
|||||||
RETURN_SUCCESS();
|
RETURN_SUCCESS();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WebSocketApi::get_api_version(void *, calldata_t *cd)
|
||||||
|
{
|
||||||
|
calldata_set_int(cd, "version", OBS_WEBSOCKET_API_VERSION);
|
||||||
|
|
||||||
|
RETURN_SUCCESS();
|
||||||
|
}
|
||||||
|
|
||||||
|
void WebSocketApi::call_request(void *, calldata_t *cd)
|
||||||
|
{
|
||||||
|
const char *request_type = calldata_string(cd, "request_type");
|
||||||
|
const char *request_data = calldata_string(cd, "request_data");
|
||||||
|
|
||||||
|
if (!request_type)
|
||||||
|
RETURN_FAILURE();
|
||||||
|
|
||||||
|
auto response = static_cast<obs_websocket_request_response *>(bzalloc(sizeof(struct obs_websocket_request_response)));
|
||||||
|
if (!response)
|
||||||
|
RETURN_FAILURE();
|
||||||
|
|
||||||
|
json requestData;
|
||||||
|
if (request_data)
|
||||||
|
requestData = json::parse(request_data);
|
||||||
|
|
||||||
|
RequestHandler requestHandler;
|
||||||
|
Request request(request_type, requestData);
|
||||||
|
RequestResult requestResult = requestHandler.ProcessRequest(request);
|
||||||
|
|
||||||
|
response->status_code = (unsigned int)requestResult.StatusCode;
|
||||||
|
if (!requestResult.Comment.empty())
|
||||||
|
response->comment = bstrdup(requestResult.Comment.c_str());
|
||||||
|
if (requestResult.ResponseData.is_object()) {
|
||||||
|
std::string responseData = requestResult.ResponseData.dump();
|
||||||
|
response->response_data = bstrdup(responseData.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
calldata_set_ptr(cd, "response", response);
|
||||||
|
|
||||||
|
blog_debug("[WebSocketApi::call_request] Request %s called, response status code is %u", request_type,
|
||||||
|
response->status_code);
|
||||||
|
|
||||||
|
RETURN_SUCCESS();
|
||||||
|
}
|
||||||
|
|
||||||
void WebSocketApi::vendor_register_cb(void *priv_data, calldata_t *cd)
|
void WebSocketApi::vendor_register_cb(void *priv_data, calldata_t *cd)
|
||||||
{
|
{
|
||||||
auto c = static_cast<WebSocketApi *>(priv_data);
|
auto c = static_cast<WebSocketApi *>(priv_data);
|
||||||
@ -102,7 +158,8 @@ void WebSocketApi::vendor_register_cb(void *priv_data, calldata_t *cd)
|
|||||||
std::unique_lock l(c->_mutex);
|
std::unique_lock l(c->_mutex);
|
||||||
|
|
||||||
if (c->_vendors.count(vendorName)) {
|
if (c->_vendors.count(vendorName)) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_register_cb] Failed because `%s` is already a registered vendor.", vendorName);
|
blog(LOG_WARNING, "[WebSocketApi::vendor_register_cb] Failed because `%s` is already a registered vendor.",
|
||||||
|
vendorName);
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,13 +183,17 @@ void WebSocketApi::vendor_request_register_cb(void *, calldata_t *cd)
|
|||||||
|
|
||||||
const char *requestType;
|
const char *requestType;
|
||||||
if (!calldata_get_string(cd, "type", &requestType) || strlen(requestType) == 0) {
|
if (!calldata_get_string(cd, "type", &requestType) || strlen(requestType) == 0) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed due to missing or empty `type` string.", v->_name.c_str());
|
blog(LOG_WARNING,
|
||||||
|
"[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed due to missing or empty `type` string.",
|
||||||
|
v->_name.c_str());
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
void *voidCallback;
|
void *voidCallback;
|
||||||
if (!calldata_get_ptr(cd, "callback", &voidCallback) || !voidCallback) {
|
if (!calldata_get_ptr(cd, "callback", &voidCallback) || !voidCallback) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed due to missing `callback` pointer.", v->_name.c_str());
|
blog(LOG_WARNING,
|
||||||
|
"[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed due to missing `callback` pointer.",
|
||||||
|
v->_name.c_str());
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,13 +202,16 @@ void WebSocketApi::vendor_request_register_cb(void *, calldata_t *cd)
|
|||||||
std::unique_lock l(v->_mutex);
|
std::unique_lock l(v->_mutex);
|
||||||
|
|
||||||
if (v->_requests.count(requestType)) {
|
if (v->_requests.count(requestType)) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed because `%s` is already a registered request.", v->_name.c_str(), requestType);
|
blog(LOG_WARNING,
|
||||||
|
"[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed because `%s` is already a registered request.",
|
||||||
|
v->_name.c_str(), requestType);
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
v->_requests[requestType] = *cb;
|
v->_requests[requestType] = *cb;
|
||||||
|
|
||||||
blog_debug("[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Registered new vendor request: %s", v->_name.c_str(), requestType);
|
blog_debug("[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Registered new vendor request: %s",
|
||||||
|
v->_name.c_str(), requestType);
|
||||||
|
|
||||||
RETURN_SUCCESS();
|
RETURN_SUCCESS();
|
||||||
}
|
}
|
||||||
@ -160,20 +224,25 @@ void WebSocketApi::vendor_request_unregister_cb(void *, calldata_t *cd)
|
|||||||
|
|
||||||
const char *requestType;
|
const char *requestType;
|
||||||
if (!calldata_get_string(cd, "type", &requestType) || strlen(requestType) == 0) {
|
if (!calldata_get_string(cd, "type", &requestType) || strlen(requestType) == 0) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_request_unregister_cb] [vendorName: %s] Failed due to missing `type` string.", v->_name.c_str());
|
blog(LOG_WARNING,
|
||||||
|
"[WebSocketApi::vendor_request_unregister_cb] [vendorName: %s] Failed due to missing `type` string.",
|
||||||
|
v->_name.c_str());
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_lock l(v->_mutex);
|
std::unique_lock l(v->_mutex);
|
||||||
|
|
||||||
if (!v->_requests.count(requestType)) {
|
if (!v->_requests.count(requestType)) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed because `%s` is not a registered request.", v->_name.c_str(), requestType);
|
blog(LOG_WARNING,
|
||||||
|
"[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Failed because `%s` is not a registered request.",
|
||||||
|
v->_name.c_str(), requestType);
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
v->_requests.erase(requestType);
|
v->_requests.erase(requestType);
|
||||||
|
|
||||||
blog_debug("[WebSocketApi::vendor_request_unregister_cb] [vendorName: %s] Unregistered vendor request: %s", v->_name.c_str(), requestType);
|
blog_debug("[WebSocketApi::vendor_request_unregister_cb] [vendorName: %s] Unregistered vendor request: %s",
|
||||||
|
v->_name.c_str(), requestType);
|
||||||
|
|
||||||
RETURN_SUCCESS();
|
RETURN_SUCCESS();
|
||||||
}
|
}
|
||||||
@ -188,13 +257,15 @@ void WebSocketApi::vendor_event_emit_cb(void *priv_data, calldata_t *cd)
|
|||||||
|
|
||||||
const char *eventType;
|
const char *eventType;
|
||||||
if (!calldata_get_string(cd, "type", &eventType) || strlen(eventType) == 0) {
|
if (!calldata_get_string(cd, "type", &eventType) || strlen(eventType) == 0) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_event_emit_cb] [vendorName: %s] Failed due to missing `type` string.", v->_name.c_str());
|
blog(LOG_WARNING, "[WebSocketApi::vendor_event_emit_cb] [vendorName: %s] Failed due to missing `type` string.",
|
||||||
|
v->_name.c_str());
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
void *voidEventData;
|
void *voidEventData;
|
||||||
if (!calldata_get_ptr(cd, "data", &voidEventData)) {
|
if (!calldata_get_ptr(cd, "data", &voidEventData)) {
|
||||||
blog(LOG_WARNING, "[WebSocketApi::vendor_event_emit_cb] [vendorName: %s] Failed due to missing `data` pointer.", v->_name.c_str());
|
blog(LOG_WARNING, "[WebSocketApi::vendor_event_emit_cb] [vendorName: %s] Failed due to missing `data` pointer.",
|
||||||
|
v->_name.c_str());
|
||||||
RETURN_FAILURE();
|
RETURN_FAILURE();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,9 +30,12 @@ class WebSocketApi {
|
|||||||
|
|
||||||
void SetEventCallback(EventCallback cb);
|
void SetEventCallback(EventCallback cb);
|
||||||
|
|
||||||
enum RequestReturnCode PerformVendorRequest(std::string vendorName, std::string requestName, obs_data_t *requestData, obs_data_t *responseData);
|
enum RequestReturnCode PerformVendorRequest(std::string vendorName, std::string requestName, obs_data_t *requestData,
|
||||||
|
obs_data_t *responseData);
|
||||||
|
|
||||||
static void get_ph_cb(void *priv_data, calldata_t *cd);
|
static void get_ph_cb(void *priv_data, calldata_t *cd);
|
||||||
|
static void get_api_version(void *, calldata_t *cd);
|
||||||
|
static void call_request(void *, calldata_t *cd);
|
||||||
static void vendor_register_cb(void *priv_data, calldata_t *cd);
|
static void vendor_register_cb(void *priv_data, calldata_t *cd);
|
||||||
static void vendor_request_register_cb(void *priv_data, calldata_t *cd);
|
static void vendor_request_register_cb(void *priv_data, calldata_t *cd);
|
||||||
static void vendor_request_unregister_cb(void *priv_data, calldata_t *cd);
|
static void vendor_request_unregister_cb(void *priv_data, calldata_t *cd);
|
||||||
|
@ -19,8 +19,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#include "EventHandler.h"
|
#include "EventHandler.h"
|
||||||
|
|
||||||
EventHandler::EventHandler() :
|
EventHandler::EventHandler()
|
||||||
_obsLoaded(false),
|
: _obsLoaded(false),
|
||||||
_inputVolumeMetersRef(0),
|
_inputVolumeMetersRef(0),
|
||||||
_inputActiveStateChangedRef(0),
|
_inputActiveStateChangedRef(0),
|
||||||
_inputShowStateChangedRef(0),
|
_inputShowStateChangedRef(0),
|
||||||
@ -80,7 +80,8 @@ void EventHandler::ProcessSubscription(uint64_t eventSubscriptions)
|
|||||||
if (_inputVolumeMetersHandler)
|
if (_inputVolumeMetersHandler)
|
||||||
blog(LOG_WARNING, "[EventHandler::ProcessSubscription] Input volume meter handler already exists!");
|
blog(LOG_WARNING, "[EventHandler::ProcessSubscription] Input volume meter handler already exists!");
|
||||||
else
|
else
|
||||||
_inputVolumeMetersHandler = std::make_unique<Utils::Obs::VolumeMeter::Handler>(std::bind(&EventHandler::HandleInputVolumeMeters, this, std::placeholders::_1));
|
_inputVolumeMetersHandler = std::make_unique<Utils::Obs::VolumeMeter::Handler>(
|
||||||
|
std::bind(&EventHandler::HandleInputVolumeMeters, this, std::placeholders::_1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((eventSubscriptions & EventSubscription::InputActiveStateChanged) != 0)
|
if ((eventSubscriptions & EventSubscription::InputActiveStateChanged) != 0)
|
||||||
@ -115,6 +116,7 @@ void EventHandler::BroadcastEvent(uint64_t requiredIntent, std::string eventType
|
|||||||
_broadcastCallback(requiredIntent, eventType, eventData, rpcVersion);
|
_broadcastCallback(requiredIntent, eventType, eventData, rpcVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Connect source signals for Inputs, Scenes, and Transitions. Filters are automatically connected.
|
||||||
void EventHandler::ConnectSourceSignals(obs_source_t *source) // Applies to inputs and scenes
|
void EventHandler::ConnectSourceSignals(obs_source_t *source) // Applies to inputs and scenes
|
||||||
{
|
{
|
||||||
if (!source || obs_source_removed(source))
|
if (!source || obs_source_removed(source))
|
||||||
@ -128,17 +130,17 @@ void EventHandler::ConnectSourceSignals(obs_source_t *source) // Applies to inpu
|
|||||||
obs_source_type sourceType = obs_source_get_type(source);
|
obs_source_type sourceType = obs_source_get_type(source);
|
||||||
|
|
||||||
// Inputs
|
// Inputs
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_INPUT) {
|
||||||
signal_handler_connect(sh, "activate", HandleInputActiveStateChanged, this);
|
signal_handler_connect(sh, "activate", HandleInputActiveStateChanged, this);
|
||||||
signal_handler_connect(sh, "deactivate", HandleInputActiveStateChanged, this);
|
signal_handler_connect(sh, "deactivate", HandleInputActiveStateChanged, this);
|
||||||
signal_handler_connect(sh, "show", HandleInputShowStateChanged, this);
|
signal_handler_connect(sh, "show", HandleInputShowStateChanged, this);
|
||||||
signal_handler_connect(sh, "hide", HandleInputShowStateChanged, this);
|
signal_handler_connect(sh, "hide", HandleInputShowStateChanged, this);
|
||||||
signal_handler_connect(sh, "mute", HandleInputMuteStateChanged, this);
|
signal_handler_connect(sh, "mute", HandleInputMuteStateChanged, this);
|
||||||
signal_handler_connect(sh, "volume", HandleInputVolumeChanged, this);
|
signal_handler_connect(sh, "volume", HandleInputVolumeChanged, this);
|
||||||
|
signal_handler_connect(sh, "audio_balance", HandleInputAudioBalanceChanged, this);
|
||||||
signal_handler_connect(sh, "audio_sync", HandleInputAudioSyncOffsetChanged, this);
|
signal_handler_connect(sh, "audio_sync", HandleInputAudioSyncOffsetChanged, this);
|
||||||
signal_handler_connect(sh, "audio_mixers", HandleInputAudioTracksChanged, this);
|
signal_handler_connect(sh, "audio_mixers", HandleInputAudioTracksChanged, this);
|
||||||
//signal_handler_connect(sh, "audio_monitoring", HandleInputAudioMonitorTypeChanged, this);
|
signal_handler_connect(sh, "audio_monitoring", HandleInputAudioMonitorTypeChanged, this);
|
||||||
|
|
||||||
if (sourceType == OBS_SOURCE_TYPE_INPUT) {
|
|
||||||
signal_handler_connect(sh, "media_started", HandleMediaInputPlaybackStarted, this);
|
signal_handler_connect(sh, "media_started", HandleMediaInputPlaybackStarted, this);
|
||||||
signal_handler_connect(sh, "media_ended", HandleMediaInputPlaybackEnded, this);
|
signal_handler_connect(sh, "media_ended", HandleMediaInputPlaybackEnded, this);
|
||||||
signal_handler_connect(sh, "media_pause", SourceMediaPauseMultiHandler, this);
|
signal_handler_connect(sh, "media_pause", SourceMediaPauseMultiHandler, this);
|
||||||
@ -156,10 +158,37 @@ void EventHandler::ConnectSourceSignals(obs_source_t *source) // Applies to inpu
|
|||||||
signal_handler_connect(sh, "reorder", HandleSceneItemListReindexed, this);
|
signal_handler_connect(sh, "reorder", HandleSceneItemListReindexed, this);
|
||||||
signal_handler_connect(sh, "item_visible", HandleSceneItemEnableStateChanged, this);
|
signal_handler_connect(sh, "item_visible", HandleSceneItemEnableStateChanged, this);
|
||||||
signal_handler_connect(sh, "item_locked", HandleSceneItemLockStateChanged, this);
|
signal_handler_connect(sh, "item_locked", HandleSceneItemLockStateChanged, this);
|
||||||
|
signal_handler_connect(sh, "item_select", HandleSceneItemSelected, this);
|
||||||
signal_handler_connect(sh, "item_transform", HandleSceneItemTransformChanged, this);
|
signal_handler_connect(sh, "item_transform", HandleSceneItemTransformChanged, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Scenes and Inputs
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_INPUT || sourceType == OBS_SOURCE_TYPE_SCENE) {
|
||||||
|
signal_handler_connect(sh, "reorder_filters", HandleSourceFilterListReindexed, this);
|
||||||
|
signal_handler_connect(sh, "filter_add", FilterAddMultiHandler, this);
|
||||||
|
signal_handler_connect(sh, "filter_remove", FilterRemoveMultiHandler, this);
|
||||||
|
auto enumFilters = [](obs_source_t *, obs_source_t *filter, void *param) {
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
eventHandler->ConnectSourceSignals(filter);
|
||||||
|
};
|
||||||
|
obs_source_enum_filters(source, enumFilters, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Transitions
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_TRANSITION) {
|
||||||
|
signal_handler_connect(sh, "transition_start", HandleSceneTransitionStarted, this);
|
||||||
|
signal_handler_connect(sh, "transition_stop", HandleSceneTransitionEnded, this);
|
||||||
|
signal_handler_connect(sh, "transition_video_stop", HandleSceneTransitionVideoEnded, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filters
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_FILTER) {
|
||||||
|
signal_handler_connect(sh, "enable", HandleSourceFilterEnableStateChanged, this);
|
||||||
|
signal_handler_connect(sh, "rename", HandleSourceFilterNameChanged, this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disconnect source signals for Inputs, Scenes, and Transitions. Filters are automatically disconnected.
|
||||||
void EventHandler::DisconnectSourceSignals(obs_source_t *source)
|
void EventHandler::DisconnectSourceSignals(obs_source_t *source)
|
||||||
{
|
{
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -167,16 +196,20 @@ void EventHandler::DisconnectSourceSignals(obs_source_t *source)
|
|||||||
|
|
||||||
signal_handler_t *sh = obs_source_get_signal_handler(source);
|
signal_handler_t *sh = obs_source_get_signal_handler(source);
|
||||||
|
|
||||||
|
obs_source_type sourceType = obs_source_get_type(source);
|
||||||
|
|
||||||
// Inputs
|
// Inputs
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_INPUT) {
|
||||||
signal_handler_disconnect(sh, "activate", HandleInputActiveStateChanged, this);
|
signal_handler_disconnect(sh, "activate", HandleInputActiveStateChanged, this);
|
||||||
signal_handler_disconnect(sh, "deactivate", HandleInputActiveStateChanged, this);
|
signal_handler_disconnect(sh, "deactivate", HandleInputActiveStateChanged, this);
|
||||||
signal_handler_disconnect(sh, "show", HandleInputShowStateChanged, this);
|
signal_handler_disconnect(sh, "show", HandleInputShowStateChanged, this);
|
||||||
signal_handler_disconnect(sh, "hide", HandleInputShowStateChanged, this);
|
signal_handler_disconnect(sh, "hide", HandleInputShowStateChanged, this);
|
||||||
signal_handler_disconnect(sh, "mute", HandleInputMuteStateChanged, this);
|
signal_handler_disconnect(sh, "mute", HandleInputMuteStateChanged, this);
|
||||||
signal_handler_disconnect(sh, "volume", HandleInputVolumeChanged, this);
|
signal_handler_disconnect(sh, "volume", HandleInputVolumeChanged, this);
|
||||||
|
signal_handler_disconnect(sh, "audio_balance", HandleInputAudioBalanceChanged, this);
|
||||||
signal_handler_disconnect(sh, "audio_sync", HandleInputAudioSyncOffsetChanged, this);
|
signal_handler_disconnect(sh, "audio_sync", HandleInputAudioSyncOffsetChanged, this);
|
||||||
signal_handler_disconnect(sh, "audio_mixers", HandleInputAudioTracksChanged, this);
|
signal_handler_disconnect(sh, "audio_mixers", HandleInputAudioTracksChanged, this);
|
||||||
//signal_handler_disconnect(sh, "audio_monitoring", HandleInputAudioMonitorTypeChanged, this);
|
signal_handler_disconnect(sh, "audio_monitoring", HandleInputAudioMonitorTypeChanged, this);
|
||||||
signal_handler_disconnect(sh, "media_started", HandleMediaInputPlaybackStarted, this);
|
signal_handler_disconnect(sh, "media_started", HandleMediaInputPlaybackStarted, this);
|
||||||
signal_handler_disconnect(sh, "media_ended", HandleMediaInputPlaybackEnded, this);
|
signal_handler_disconnect(sh, "media_ended", HandleMediaInputPlaybackEnded, this);
|
||||||
signal_handler_disconnect(sh, "media_pause", SourceMediaPauseMultiHandler, this);
|
signal_handler_disconnect(sh, "media_pause", SourceMediaPauseMultiHandler, this);
|
||||||
@ -185,97 +218,90 @@ void EventHandler::DisconnectSourceSignals(obs_source_t *source)
|
|||||||
signal_handler_disconnect(sh, "media_stopped", SourceMediaStopMultiHandler, this);
|
signal_handler_disconnect(sh, "media_stopped", SourceMediaStopMultiHandler, this);
|
||||||
signal_handler_disconnect(sh, "media_next", SourceMediaNextMultiHandler, this);
|
signal_handler_disconnect(sh, "media_next", SourceMediaNextMultiHandler, this);
|
||||||
signal_handler_disconnect(sh, "media_previous", SourceMediaPreviousMultiHandler, this);
|
signal_handler_disconnect(sh, "media_previous", SourceMediaPreviousMultiHandler, this);
|
||||||
|
}
|
||||||
|
|
||||||
// Scenes
|
// Scenes
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_SCENE) {
|
||||||
signal_handler_disconnect(sh, "item_add", HandleSceneItemCreated, this);
|
signal_handler_disconnect(sh, "item_add", HandleSceneItemCreated, this);
|
||||||
signal_handler_disconnect(sh, "item_remove", HandleSceneItemRemoved, this);
|
signal_handler_disconnect(sh, "item_remove", HandleSceneItemRemoved, this);
|
||||||
signal_handler_disconnect(sh, "reorder", HandleSceneItemListReindexed, this);
|
signal_handler_disconnect(sh, "reorder", HandleSceneItemListReindexed, this);
|
||||||
signal_handler_disconnect(sh, "item_visible", HandleSceneItemEnableStateChanged, this);
|
signal_handler_disconnect(sh, "item_visible", HandleSceneItemEnableStateChanged, this);
|
||||||
signal_handler_disconnect(sh, "item_locked", HandleSceneItemLockStateChanged, this);
|
signal_handler_disconnect(sh, "item_locked", HandleSceneItemLockStateChanged, this);
|
||||||
|
signal_handler_disconnect(sh, "item_select", HandleSceneItemSelected, this);
|
||||||
signal_handler_disconnect(sh, "item_transform", HandleSceneItemTransformChanged, this);
|
signal_handler_disconnect(sh, "item_transform", HandleSceneItemTransformChanged, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Inputs and Scenes
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_INPUT || sourceType == OBS_SOURCE_TYPE_SCENE) {
|
||||||
|
signal_handler_disconnect(sh, "reorder_filters", HandleSourceFilterListReindexed, this);
|
||||||
|
signal_handler_disconnect(sh, "filter_add", FilterAddMultiHandler, this);
|
||||||
|
signal_handler_disconnect(sh, "filter_remove", FilterRemoveMultiHandler, this);
|
||||||
|
auto enumFilters = [](obs_source_t *, obs_source_t *filter, void *param) {
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
eventHandler->DisconnectSourceSignals(filter);
|
||||||
|
};
|
||||||
|
obs_source_enum_filters(source, enumFilters, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Transitions
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_TRANSITION) {
|
||||||
|
signal_handler_disconnect(sh, "transition_start", HandleSceneTransitionStarted, this);
|
||||||
|
signal_handler_disconnect(sh, "transition_stop", HandleSceneTransitionEnded, this);
|
||||||
|
signal_handler_disconnect(sh, "transition_video_stop", HandleSceneTransitionVideoEnded, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filters
|
||||||
|
if (sourceType == OBS_SOURCE_TYPE_FILTER) {
|
||||||
|
signal_handler_disconnect(sh, "enable", HandleSourceFilterEnableStateChanged, this);
|
||||||
|
signal_handler_disconnect(sh, "rename", HandleSourceFilterNameChanged, this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_data)
|
void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(private_data);
|
auto eventHandler = static_cast<EventHandler *>(private_data);
|
||||||
|
|
||||||
if (!eventHandler->_obsLoaded.load()) {
|
if (!eventHandler->_obsLoaded.load() && event != OBS_FRONTEND_EVENT_FINISHED_LOADING)
|
||||||
if (event == OBS_FRONTEND_EVENT_FINISHED_LOADING) {
|
|
||||||
blog_debug("[EventHandler::OnFrontendEvent] OBS has finished loading. Connecting final handlers and enabling events...");
|
|
||||||
// Connect source signals and enable events only after OBS has fully loaded (to reduce extra logging).
|
|
||||||
eventHandler->_obsLoaded.store(true);
|
|
||||||
|
|
||||||
// In the case that plugins become hotloadable, this will have to go back into `EventHandler::EventHandler()`
|
|
||||||
// Enumerate inputs and connect each one
|
|
||||||
obs_enum_sources([](void* param, obs_source_t* source) {
|
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
|
||||||
eventHandler->ConnectSourceSignals(source);
|
|
||||||
return true;
|
|
||||||
}, private_data);
|
|
||||||
|
|
||||||
// Enumerate scenes and connect each one
|
|
||||||
obs_enum_scenes([](void* param, obs_source_t* source) {
|
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
|
||||||
eventHandler->ConnectSourceSignals(source);
|
|
||||||
return true;
|
|
||||||
}, private_data);
|
|
||||||
|
|
||||||
blog_debug("[EventHandler::OnFrontendEvent] Finished.");
|
|
||||||
|
|
||||||
if (eventHandler->_obsLoadedCallback)
|
|
||||||
eventHandler->_obsLoadedCallback();
|
|
||||||
} else {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
// General
|
// General
|
||||||
|
case OBS_FRONTEND_EVENT_FINISHED_LOADING:
|
||||||
|
eventHandler->FrontendFinishedLoadingMultiHandler();
|
||||||
|
break;
|
||||||
case OBS_FRONTEND_EVENT_EXIT:
|
case OBS_FRONTEND_EVENT_EXIT:
|
||||||
eventHandler->HandleExitStarted();
|
eventHandler->FrontendExitMultiHandler();
|
||||||
|
|
||||||
blog_debug("[EventHandler::OnFrontendEvent] OBS is unloading. Disabling events...");
|
|
||||||
// Disconnect source signals and disable events when OBS starts unloading (to reduce extra logging).
|
|
||||||
eventHandler->_obsLoaded.store(false);
|
|
||||||
|
|
||||||
// In the case that plugins become hotloadable, this will have to go back into `EventHandler::~EventHandler()`
|
|
||||||
// Enumerate inputs and disconnect each one
|
|
||||||
obs_enum_sources([](void* param, obs_source_t* source) {
|
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
|
||||||
eventHandler->DisconnectSourceSignals(source);
|
|
||||||
return true;
|
|
||||||
}, private_data);
|
|
||||||
|
|
||||||
// Enumerate scenes and disconnect each one
|
|
||||||
obs_enum_scenes([](void* param, obs_source_t* source) {
|
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
|
||||||
eventHandler->DisconnectSourceSignals(source);
|
|
||||||
return true;
|
|
||||||
}, private_data);
|
|
||||||
|
|
||||||
blog_debug("[EventHandler::OnFrontendEvent] Finished.");
|
|
||||||
|
|
||||||
break;
|
|
||||||
case OBS_FRONTEND_EVENT_STUDIO_MODE_ENABLED:
|
|
||||||
eventHandler->HandleStudioModeStateChanged(true);
|
|
||||||
break;
|
|
||||||
case OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED:
|
|
||||||
eventHandler->HandleStudioModeStateChanged(false);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Config
|
// Config
|
||||||
//case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING:
|
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING: {
|
||||||
// eventHandler->HandleCurrentSceneCollectionChanging();
|
obs_frontend_source_list transitions = {};
|
||||||
// break;
|
obs_frontend_get_transitions(&transitions);
|
||||||
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED:
|
for (size_t i = 0; i < transitions.sources.num; i++) {
|
||||||
|
obs_source_t *transition = transitions.sources.array[i];
|
||||||
|
eventHandler->DisconnectSourceSignals(transition);
|
||||||
|
}
|
||||||
|
obs_frontend_source_list_free(&transitions);
|
||||||
|
}
|
||||||
|
eventHandler->HandleCurrentSceneCollectionChanging();
|
||||||
|
break;
|
||||||
|
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED: {
|
||||||
|
obs_frontend_source_list transitions = {};
|
||||||
|
obs_frontend_get_transitions(&transitions);
|
||||||
|
for (size_t i = 0; i < transitions.sources.num; i++) {
|
||||||
|
obs_source_t *transition = transitions.sources.array[i];
|
||||||
|
eventHandler->ConnectSourceSignals(transition);
|
||||||
|
}
|
||||||
|
obs_frontend_source_list_free(&transitions);
|
||||||
|
}
|
||||||
eventHandler->HandleCurrentSceneCollectionChanged();
|
eventHandler->HandleCurrentSceneCollectionChanged();
|
||||||
break;
|
break;
|
||||||
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED:
|
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED:
|
||||||
eventHandler->HandleSceneCollectionListChanged();
|
eventHandler->HandleSceneCollectionListChanged();
|
||||||
break;
|
break;
|
||||||
//case OBS_FRONTEND_EVENT_PROFILE_CHANGING:
|
case OBS_FRONTEND_EVENT_PROFILE_CHANGING:
|
||||||
// eventHandler->HandleCurrentProfileChanging();
|
eventHandler->HandleCurrentProfileChanging();
|
||||||
// break;
|
break;
|
||||||
case OBS_FRONTEND_EVENT_PROFILE_CHANGED:
|
case OBS_FRONTEND_EVENT_PROFILE_CHANGED:
|
||||||
eventHandler->HandleCurrentProfileChanged();
|
eventHandler->HandleCurrentProfileChanged();
|
||||||
break;
|
break;
|
||||||
@ -296,21 +322,49 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
|
|||||||
|
|
||||||
// Transitions
|
// Transitions
|
||||||
case OBS_FRONTEND_EVENT_TRANSITION_CHANGED:
|
case OBS_FRONTEND_EVENT_TRANSITION_CHANGED:
|
||||||
|
eventHandler->HandleCurrentSceneTransitionChanged();
|
||||||
break;
|
break;
|
||||||
case OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED:
|
case OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED: {
|
||||||
break;
|
obs_frontend_source_list transitions = {};
|
||||||
|
obs_frontend_get_transitions(&transitions);
|
||||||
|
for (size_t i = 0; i < transitions.sources.num; i++) {
|
||||||
|
obs_source_t *transition = transitions.sources.array[i];
|
||||||
|
eventHandler->ConnectSourceSignals(transition);
|
||||||
|
}
|
||||||
|
obs_frontend_source_list_free(&transitions);
|
||||||
|
} break;
|
||||||
case OBS_FRONTEND_EVENT_TRANSITION_DURATION_CHANGED:
|
case OBS_FRONTEND_EVENT_TRANSITION_DURATION_CHANGED:
|
||||||
|
eventHandler->HandleCurrentSceneTransitionDurationChanged();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Outputs
|
// Outputs
|
||||||
case OBS_FRONTEND_EVENT_STREAMING_STARTING:
|
case OBS_FRONTEND_EVENT_STREAMING_STARTING:
|
||||||
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STARTING);
|
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STARTING);
|
||||||
|
{
|
||||||
|
// Connect signals for stream output reconnects (hacky)
|
||||||
|
OBSOutputAutoRelease streamOutput = obs_frontend_get_streaming_output();
|
||||||
|
if (streamOutput) {
|
||||||
|
signal_handler_t *sh = obs_output_get_signal_handler(streamOutput);
|
||||||
|
signal_handler_connect(sh, "reconnect", StreamOutputReconnectHandler, private_data);
|
||||||
|
signal_handler_connect(sh, "reconnect_success", StreamOutputReconnectSuccessHandler, private_data);
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case OBS_FRONTEND_EVENT_STREAMING_STARTED:
|
case OBS_FRONTEND_EVENT_STREAMING_STARTED:
|
||||||
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STARTED);
|
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STARTED);
|
||||||
break;
|
break;
|
||||||
case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
|
case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
|
||||||
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STOPPING);
|
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STOPPING);
|
||||||
|
{
|
||||||
|
// Disconnect signals for stream output reconnects
|
||||||
|
OBSOutputAutoRelease streamOutput = obs_frontend_get_streaming_output();
|
||||||
|
if (streamOutput) {
|
||||||
|
signal_handler_t *sh = obs_output_get_signal_handler(streamOutput);
|
||||||
|
signal_handler_disconnect(sh, "reconnect", StreamOutputReconnectHandler, private_data);
|
||||||
|
signal_handler_disconnect(sh, "reconnect_success", StreamOutputReconnectSuccessHandler,
|
||||||
|
private_data);
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
|
case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
|
||||||
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STOPPED);
|
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STOPPED);
|
||||||
@ -355,15 +409,116 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
|
|||||||
eventHandler->HandleReplayBufferSaved();
|
eventHandler->HandleReplayBufferSaved();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
// Ui
|
||||||
|
case OBS_FRONTEND_EVENT_STUDIO_MODE_ENABLED:
|
||||||
|
eventHandler->HandleStudioModeStateChanged(true);
|
||||||
|
break;
|
||||||
|
case OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED:
|
||||||
|
eventHandler->HandleStudioModeStateChanged(false);
|
||||||
|
break;
|
||||||
|
case OBS_FRONTEND_EVENT_SCREENSHOT_TAKEN:
|
||||||
|
eventHandler->HandleScreenshotSaved();
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EventHandler::FrontendFinishedLoadingMultiHandler()
|
||||||
|
{
|
||||||
|
blog_debug(
|
||||||
|
"[EventHandler::FrontendFinishedLoadingMultiHandler] OBS has finished loading. Connecting final handlers and enabling events...");
|
||||||
|
|
||||||
|
// Connect source signals and enable events only after OBS has fully loaded (to reduce extra logging).
|
||||||
|
_obsLoaded.store(true);
|
||||||
|
|
||||||
|
// In the case that plugins become hotloadable, this will have to go back into `EventHandler::EventHandler()`
|
||||||
|
// Enumerate inputs and connect each one
|
||||||
|
{
|
||||||
|
auto enumInputs = [](void *param, obs_source_t *source) {
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
eventHandler->ConnectSourceSignals(source);
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
obs_enum_sources(enumInputs, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enumerate scenes and connect each one
|
||||||
|
{
|
||||||
|
auto enumScenes = [](void *param, obs_source_t *source) {
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
eventHandler->ConnectSourceSignals(source);
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
obs_enum_scenes(enumScenes, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enumerate all scene transitions and connect each one
|
||||||
|
{
|
||||||
|
obs_frontend_source_list transitions = {};
|
||||||
|
obs_frontend_get_transitions(&transitions);
|
||||||
|
for (size_t i = 0; i < transitions.sources.num; i++) {
|
||||||
|
obs_source_t *transition = transitions.sources.array[i];
|
||||||
|
ConnectSourceSignals(transition);
|
||||||
|
}
|
||||||
|
obs_frontend_source_list_free(&transitions);
|
||||||
|
}
|
||||||
|
|
||||||
|
blog_debug("[EventHandler::FrontendFinishedLoadingMultiHandler] Finished.");
|
||||||
|
|
||||||
|
if (_obsLoadedCallback)
|
||||||
|
_obsLoadedCallback();
|
||||||
|
}
|
||||||
|
|
||||||
|
void EventHandler::FrontendExitMultiHandler()
|
||||||
|
{
|
||||||
|
HandleExitStarted();
|
||||||
|
|
||||||
|
blog_debug("[EventHandler::FrontendExitMultiHandler] OBS is unloading. Disabling events...");
|
||||||
|
|
||||||
|
// Disconnect source signals and disable events when OBS starts unloading (to reduce extra logging).
|
||||||
|
_obsLoaded.store(false);
|
||||||
|
|
||||||
|
// In the case that plugins become hotloadable, this will have to go back into `EventHandler::~EventHandler()`
|
||||||
|
// Enumerate inputs and disconnect each one
|
||||||
|
{
|
||||||
|
auto enumInputs = [](void *param, obs_source_t *source) {
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
eventHandler->DisconnectSourceSignals(source);
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
obs_enum_sources(enumInputs, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enumerate scenes and disconnect each one
|
||||||
|
{
|
||||||
|
auto enumScenes = [](void *param, obs_source_t *source) {
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
eventHandler->DisconnectSourceSignals(source);
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
obs_enum_scenes(enumScenes, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enumerate all scene transitions and disconnect each one
|
||||||
|
{
|
||||||
|
obs_frontend_source_list transitions = {};
|
||||||
|
obs_frontend_get_transitions(&transitions);
|
||||||
|
for (size_t i = 0; i < transitions.sources.num; i++) {
|
||||||
|
obs_source_t *transition = transitions.sources.array[i];
|
||||||
|
DisconnectSourceSignals(transition);
|
||||||
|
}
|
||||||
|
obs_frontend_source_list_free(&transitions);
|
||||||
|
}
|
||||||
|
|
||||||
|
blog_debug("[EventHandler::FrontendExitMultiHandler] Finished.");
|
||||||
|
}
|
||||||
|
|
||||||
// Only called for creation of a public source
|
// Only called for creation of a public source
|
||||||
void EventHandler::SourceCreatedMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceCreatedMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
// Don't react to signals until OBS has finished loading
|
// Don't react to signals until OBS has finished loading
|
||||||
if (!eventHandler->_obsLoaded.load())
|
if (!eventHandler->_obsLoaded.load())
|
||||||
@ -387,10 +542,11 @@ void EventHandler::SourceCreatedMultiHandler(void *param, calldata_t *data)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only called for destruction of a public source
|
// Only called for destruction of a public sourcs
|
||||||
|
// Used as a fallback if an input/scene is not explicitly removed
|
||||||
void EventHandler::SourceDestroyedMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceDestroyedMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
// We can't use any smart types here because releasing the source will cause infinite recursion
|
// We can't use any smart types here because releasing the source will cause infinite recursion
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
@ -406,19 +562,25 @@ void EventHandler::SourceDestroyedMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
switch (obs_source_get_type(source)) {
|
switch (obs_source_get_type(source)) {
|
||||||
case OBS_SOURCE_TYPE_INPUT:
|
case OBS_SOURCE_TYPE_INPUT:
|
||||||
// We have to call `InputRemoved` with source_destroy because source_removed is not called when an input's last scene item is removed
|
// Only emit removed if the input has not already been removed. This is the case when removing the last scene item of an input.
|
||||||
|
if (!obs_source_removed(source))
|
||||||
eventHandler->HandleInputRemoved(source);
|
eventHandler->HandleInputRemoved(source);
|
||||||
break;
|
break;
|
||||||
case OBS_SOURCE_TYPE_SCENE:
|
case OBS_SOURCE_TYPE_SCENE:
|
||||||
|
// Only emit removed if the scene has not already been removed.
|
||||||
|
if (!obs_source_removed(source))
|
||||||
|
eventHandler->HandleSceneRemoved(source);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We prefer remove signals over destroy signals because they are more time-accurate.
|
||||||
|
// For example, if an input is "removed" but there is a dangling ref, you still want to know that it shouldn't exist, but it's not guaranteed to be destroyed.
|
||||||
void EventHandler::SourceRemovedMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceRemovedMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
if (!eventHandler->_obsLoaded.load())
|
if (!eventHandler->_obsLoaded.load())
|
||||||
return;
|
return;
|
||||||
@ -429,9 +591,9 @@ void EventHandler::SourceRemovedMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
switch (obs_source_get_type(source)) {
|
switch (obs_source_get_type(source)) {
|
||||||
case OBS_SOURCE_TYPE_INPUT:
|
case OBS_SOURCE_TYPE_INPUT:
|
||||||
|
eventHandler->HandleInputRemoved(source);
|
||||||
break;
|
break;
|
||||||
case OBS_SOURCE_TYPE_SCENE:
|
case OBS_SOURCE_TYPE_SCENE:
|
||||||
// Scenes emit the `removed` signal when they are removed from OBS, as expected
|
|
||||||
eventHandler->HandleSceneRemoved(source);
|
eventHandler->HandleSceneRemoved(source);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -441,7 +603,7 @@ void EventHandler::SourceRemovedMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
void EventHandler::SourceRenamedMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceRenamedMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
if (!eventHandler->_obsLoaded.load())
|
if (!eventHandler->_obsLoaded.load())
|
||||||
return;
|
return;
|
||||||
@ -459,8 +621,6 @@ void EventHandler::SourceRenamedMultiHandler(void *param, calldata_t *data)
|
|||||||
case OBS_SOURCE_TYPE_INPUT:
|
case OBS_SOURCE_TYPE_INPUT:
|
||||||
eventHandler->HandleInputNameChanged(source, oldSourceName, sourceName);
|
eventHandler->HandleInputNameChanged(source, oldSourceName, sourceName);
|
||||||
break;
|
break;
|
||||||
case OBS_SOURCE_TYPE_FILTER:
|
|
||||||
break;
|
|
||||||
case OBS_SOURCE_TYPE_TRANSITION:
|
case OBS_SOURCE_TYPE_TRANSITION:
|
||||||
break;
|
break;
|
||||||
case OBS_SOURCE_TYPE_SCENE:
|
case OBS_SOURCE_TYPE_SCENE:
|
||||||
@ -470,3 +630,17 @@ void EventHandler::SourceRenamedMultiHandler(void *param, calldata_t *data)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EventHandler::StreamOutputReconnectHandler(void *param, calldata_t *)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_RECONNECTING);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EventHandler::StreamOutputReconnectSuccessHandler(void *param, calldata_t *)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_RECONNECTED);
|
||||||
|
}
|
||||||
|
@ -29,8 +29,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#include "../utils/Obs_VolumeMeter.h"
|
#include "../utils/Obs_VolumeMeter.h"
|
||||||
#include "../plugin-macros.generated.h"
|
#include "../plugin-macros.generated.h"
|
||||||
|
|
||||||
class EventHandler
|
class EventHandler {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
EventHandler();
|
EventHandler();
|
||||||
~EventHandler();
|
~EventHandler();
|
||||||
@ -62,6 +61,8 @@ class EventHandler
|
|||||||
|
|
||||||
// Signal handler: frontend
|
// Signal handler: frontend
|
||||||
static void OnFrontendEvent(enum obs_frontend_event event, void *private_data);
|
static void OnFrontendEvent(enum obs_frontend_event event, void *private_data);
|
||||||
|
void FrontendFinishedLoadingMultiHandler();
|
||||||
|
void FrontendExitMultiHandler();
|
||||||
|
|
||||||
// Signal handler: libobs
|
// Signal handler: libobs
|
||||||
static void SourceCreatedMultiHandler(void *param, calldata_t *data);
|
static void SourceCreatedMultiHandler(void *param, calldata_t *data);
|
||||||
@ -77,10 +78,12 @@ class EventHandler
|
|||||||
static void SourceMediaNextMultiHandler(void *param, calldata_t *data);
|
static void SourceMediaNextMultiHandler(void *param, calldata_t *data);
|
||||||
static void SourceMediaPreviousMultiHandler(void *param, calldata_t *data);
|
static void SourceMediaPreviousMultiHandler(void *param, calldata_t *data);
|
||||||
|
|
||||||
|
// Signal handler: output
|
||||||
|
static void StreamOutputReconnectHandler(void *param, calldata_t *data);
|
||||||
|
static void StreamOutputReconnectSuccessHandler(void *param, calldata_t *data);
|
||||||
|
|
||||||
// General
|
// General
|
||||||
void HandleExitStarted();
|
void HandleExitStarted();
|
||||||
void HandleStudioModeStateChanged(bool enabled);
|
|
||||||
|
|
||||||
// Config
|
// Config
|
||||||
void HandleCurrentSceneCollectionChanging();
|
void HandleCurrentSceneCollectionChanging();
|
||||||
@ -103,13 +106,45 @@ class EventHandler
|
|||||||
void HandleInputRemoved(obs_source_t *source);
|
void HandleInputRemoved(obs_source_t *source);
|
||||||
void HandleInputNameChanged(obs_source_t *source, std::string oldInputName, std::string inputName);
|
void HandleInputNameChanged(obs_source_t *source, std::string oldInputName, std::string inputName);
|
||||||
void HandleInputVolumeMeters(std::vector<json> inputs); // AudioMeter::Handler callback
|
void HandleInputVolumeMeters(std::vector<json> inputs); // AudioMeter::Handler callback
|
||||||
static void HandleInputActiveStateChanged(void *param, calldata_t *data); // Direct callback
|
static void HandleInputActiveStateChanged(void *param,
|
||||||
static void HandleInputShowStateChanged(void *param, calldata_t *data); // Direct callback
|
calldata_t *data); // Direct callback
|
||||||
static void HandleInputMuteStateChanged(void *param, calldata_t *data); // Direct callback
|
static void HandleInputShowStateChanged(void *param,
|
||||||
static void HandleInputVolumeChanged(void *param, calldata_t *data); // Direct callback
|
calldata_t *data); // Direct callback
|
||||||
static void HandleInputAudioSyncOffsetChanged(void *param, calldata_t *data); // Direct callback
|
static void HandleInputMuteStateChanged(void *param,
|
||||||
static void HandleInputAudioTracksChanged(void *param, calldata_t *data); // Direct callback
|
calldata_t *data); // Direct callback
|
||||||
static void HandleInputAudioMonitorTypeChanged(void *param, calldata_t *data); // Direct callback
|
static void HandleInputVolumeChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleInputAudioBalanceChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleInputAudioSyncOffsetChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleInputAudioTracksChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleInputAudioMonitorTypeChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
|
||||||
|
// Transitions
|
||||||
|
void HandleCurrentSceneTransitionChanged();
|
||||||
|
void HandleCurrentSceneTransitionDurationChanged();
|
||||||
|
static void HandleSceneTransitionStarted(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSceneTransitionEnded(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSceneTransitionVideoEnded(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
|
||||||
|
// Filters
|
||||||
|
static void FilterAddMultiHandler(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void FilterRemoveMultiHandler(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSourceFilterListReindexed(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
void HandleSourceFilterCreated(obs_source_t *source, obs_source_t *filter);
|
||||||
|
void HandleSourceFilterRemoved(obs_source_t *source, obs_source_t *filter);
|
||||||
|
static void HandleSourceFilterNameChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSourceFilterEnableStateChanged(void *param, calldata_t *data); // Direct callback
|
||||||
|
|
||||||
// Outputs
|
// Outputs
|
||||||
void HandleStreamStateChanged(ObsOutputState state);
|
void HandleStreamStateChanged(ObsOutputState state);
|
||||||
@ -119,15 +154,29 @@ class EventHandler
|
|||||||
void HandleReplayBufferSaved();
|
void HandleReplayBufferSaved();
|
||||||
|
|
||||||
// Scene Items
|
// Scene Items
|
||||||
static void HandleSceneItemCreated(void *param, calldata_t *data); // Direct callback
|
static void HandleSceneItemCreated(void *param,
|
||||||
static void HandleSceneItemRemoved(void *param, calldata_t *data); // Direct callback
|
calldata_t *data); // Direct callback
|
||||||
static void HandleSceneItemListReindexed(void *param, calldata_t *data); // Direct callback
|
static void HandleSceneItemRemoved(void *param,
|
||||||
static void HandleSceneItemEnableStateChanged(void *param, calldata_t *data); // Direct callback
|
calldata_t *data); // Direct callback
|
||||||
static void HandleSceneItemLockStateChanged(void *param, calldata_t *data); // Direct callback
|
static void HandleSceneItemListReindexed(void *param,
|
||||||
static void HandleSceneItemTransformChanged(void *param, calldata_t *data); // Direct callback
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSceneItemEnableStateChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSceneItemLockStateChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSceneItemSelected(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleSceneItemTransformChanged(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
|
|
||||||
// Media Inputs
|
// Media Inputs
|
||||||
static void HandleMediaInputPlaybackStarted(void *param, calldata_t *data); // Direct callback
|
static void HandleMediaInputPlaybackStarted(void *param,
|
||||||
static void HandleMediaInputPlaybackEnded(void *param, calldata_t *data); // Direct callback
|
calldata_t *data); // Direct callback
|
||||||
|
static void HandleMediaInputPlaybackEnded(void *param,
|
||||||
|
calldata_t *data); // Direct callback
|
||||||
void HandleMediaInputActionTriggered(obs_source_t *source, ObsMediaInputAction action);
|
void HandleMediaInputActionTriggered(obs_source_t *source, ObsMediaInputAction action);
|
||||||
|
|
||||||
|
// Ui
|
||||||
|
void HandleStudioModeStateChanged(bool enabled);
|
||||||
|
void HandleScreenshotSaved();
|
||||||
};
|
};
|
||||||
|
@ -18,3 +18,184 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "EventHandler.h"
|
#include "EventHandler.h"
|
||||||
|
|
||||||
|
void EventHandler::FilterAddMultiHandler(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
obs_source_t *filter = GetCalldataPointer<obs_source_t>(data, "filter");
|
||||||
|
|
||||||
|
if (!(source && filter))
|
||||||
|
return;
|
||||||
|
|
||||||
|
eventHandler->ConnectSourceSignals(filter);
|
||||||
|
|
||||||
|
eventHandler->HandleSourceFilterCreated(source, filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EventHandler::FilterRemoveMultiHandler(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
obs_source_t *filter = GetCalldataPointer<obs_source_t>(data, "filter");
|
||||||
|
|
||||||
|
if (!(source && filter))
|
||||||
|
return;
|
||||||
|
|
||||||
|
eventHandler->DisconnectSourceSignals(filter);
|
||||||
|
|
||||||
|
eventHandler->HandleSourceFilterRemoved(source, filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A source's filter list has been reindexed.
|
||||||
|
*
|
||||||
|
* @dataField sourceName | String | Name of the source
|
||||||
|
* @dataField filters | Array<Object> | Array of filter objects
|
||||||
|
*
|
||||||
|
* @eventType SourceFilterListReindexed
|
||||||
|
* @eventSubscription Filters
|
||||||
|
* @complexity 3
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSourceFilterListReindexed(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
if (!source)
|
||||||
|
return;
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["sourceName"] = obs_source_get_name(source);
|
||||||
|
eventData["filters"] = Utils::Obs::ArrayHelper::GetSourceFilterList(source);
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::Filters, "SourceFilterListReindexed", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A filter has been added to a source.
|
||||||
|
*
|
||||||
|
* @dataField sourceName | String | Name of the source the filter was added to
|
||||||
|
* @dataField filterName | String | Name of the filter
|
||||||
|
* @dataField filterKind | String | The kind of the filter
|
||||||
|
* @dataField filterIndex | Number | Index position of the filter
|
||||||
|
* @dataField filterSettings | Object | The settings configured to the filter when it was created
|
||||||
|
* @dataField defaultFilterSettings | Object | The default settings for the filter
|
||||||
|
*
|
||||||
|
* @eventType SourceFilterCreated
|
||||||
|
* @eventSubscription Filters
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSourceFilterCreated(obs_source_t *source, obs_source_t *filter)
|
||||||
|
{
|
||||||
|
std::string filterKind = obs_source_get_id(filter);
|
||||||
|
OBSDataAutoRelease filterSettings = obs_source_get_settings(filter);
|
||||||
|
OBSDataAutoRelease defaultFilterSettings = obs_get_source_defaults(filterKind.c_str());
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["sourceName"] = obs_source_get_name(source);
|
||||||
|
eventData["filterName"] = obs_source_get_name(filter);
|
||||||
|
eventData["filterKind"] = filterKind;
|
||||||
|
eventData["filterIndex"] = Utils::Obs::NumberHelper::GetSourceFilterIndex(source, filter);
|
||||||
|
eventData["filterSettings"] = Utils::Json::ObsDataToJson(filterSettings);
|
||||||
|
eventData["defaultFilterSettings"] = Utils::Json::ObsDataToJson(defaultFilterSettings, true);
|
||||||
|
BroadcastEvent(EventSubscription::Filters, "SourceFilterCreated", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A filter has been removed from a source.
|
||||||
|
*
|
||||||
|
* @dataField sourceName | String | Name of the source the filter was on
|
||||||
|
* @dataField filterName | String | Name of the filter
|
||||||
|
*
|
||||||
|
* @eventType SourceFilterRemoved
|
||||||
|
* @eventSubscription Filters
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSourceFilterRemoved(obs_source_t *source, obs_source_t *filter)
|
||||||
|
{
|
||||||
|
json eventData;
|
||||||
|
eventData["sourceName"] = obs_source_get_name(source);
|
||||||
|
eventData["filterName"] = obs_source_get_name(filter);
|
||||||
|
BroadcastEvent(EventSubscription::Filters, "SourceFilterRemoved", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The name of a source filter has changed.
|
||||||
|
*
|
||||||
|
* @dataField sourceName | String | The source the filter is on
|
||||||
|
* @dataField oldFilterName | String | Old name of the filter
|
||||||
|
* @dataField filterName | String | New name of the filter
|
||||||
|
*
|
||||||
|
* @eventType SourceFilterNameChanged
|
||||||
|
* @eventSubscription Filters
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSourceFilterNameChanged(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *filter = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
if (!filter)
|
||||||
|
return;
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["sourceName"] = obs_source_get_name(obs_filter_get_parent(filter));
|
||||||
|
eventData["oldFilterName"] = calldata_string(data, "prev_name");
|
||||||
|
eventData["filterName"] = calldata_string(data, "new_name");
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::Filters, "SourceFilterNameChanged", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A source filter's enable state has changed.
|
||||||
|
*
|
||||||
|
* @dataField sourceName | String | Name of the source the filter is on
|
||||||
|
* @dataField filterName | String | Name of the filter
|
||||||
|
* @dataField filterEnabled | Boolean | Whether the filter is enabled
|
||||||
|
*
|
||||||
|
* @eventType SourceFilterEnableStateChanged
|
||||||
|
* @eventSubscription Filters
|
||||||
|
* @complexity 3
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSourceFilterEnableStateChanged(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *filter = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
if (!filter)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Not OBSSourceAutoRelease as get_parent doesn't increment refcount
|
||||||
|
obs_source_t *source = obs_filter_get_parent(filter);
|
||||||
|
if (!source)
|
||||||
|
return;
|
||||||
|
|
||||||
|
bool filterEnabled = calldata_bool(data, "enabled");
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["sourceName"] = obs_source_get_name(source);
|
||||||
|
eventData["filterName"] = obs_source_get_name(filter);
|
||||||
|
eventData["filterEnabled"] = filterEnabled;
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::Filters, "SourceFilterEnableStateChanged", eventData);
|
||||||
|
}
|
||||||
|
@ -111,7 +111,7 @@ void EventHandler::HandleInputNameChanged(obs_source_t *, std::string oldInputNa
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleInputActiveStateChanged(void *param, calldata_t *data)
|
void EventHandler::HandleInputActiveStateChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
if (!eventHandler->_inputActiveStateChangedRef.load())
|
if (!eventHandler->_inputActiveStateChangedRef.load())
|
||||||
return;
|
return;
|
||||||
@ -147,7 +147,7 @@ void EventHandler::HandleInputActiveStateChanged(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleInputShowStateChanged(void *param, calldata_t *data)
|
void EventHandler::HandleInputShowStateChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
if (!eventHandler->_inputShowStateChangedRef.load())
|
if (!eventHandler->_inputShowStateChangedRef.load())
|
||||||
return;
|
return;
|
||||||
@ -181,7 +181,7 @@ void EventHandler::HandleInputShowStateChanged(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleInputMuteStateChanged(void *param, calldata_t *data)
|
void EventHandler::HandleInputMuteStateChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -200,7 +200,7 @@ void EventHandler::HandleInputMuteStateChanged(void *param, calldata_t *data)
|
|||||||
* An input's volume level has changed.
|
* An input's volume level has changed.
|
||||||
*
|
*
|
||||||
* @dataField inputName | String | Name of the input
|
* @dataField inputName | String | Name of the input
|
||||||
* @dataField inputVolumeMul | Number | New volume level in multimap
|
* @dataField inputVolumeMul | Number | New volume level multiplier
|
||||||
* @dataField inputVolumeDb | Number | New volume level in dB
|
* @dataField inputVolumeDb | Number | New volume level in dB
|
||||||
*
|
*
|
||||||
* @eventType InputVolumeChanged
|
* @eventType InputVolumeChanged
|
||||||
@ -213,7 +213,7 @@ void EventHandler::HandleInputMuteStateChanged(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleInputVolumeChanged(void *param, calldata_t *data)
|
void EventHandler::HandleInputVolumeChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -225,7 +225,7 @@ void EventHandler::HandleInputVolumeChanged(void *param, calldata_t *data)
|
|||||||
// Volume must be grabbed from the calldata. Running obs_source_get_volume() will return the previous value.
|
// Volume must be grabbed from the calldata. Running obs_source_get_volume() will return the previous value.
|
||||||
double inputVolumeMul = calldata_float(data, "volume");
|
double inputVolumeMul = calldata_float(data, "volume");
|
||||||
|
|
||||||
double inputVolumeDb = obs_mul_to_db(inputVolumeMul);
|
double inputVolumeDb = obs_mul_to_db((float)inputVolumeMul);
|
||||||
if (inputVolumeDb == -INFINITY)
|
if (inputVolumeDb == -INFINITY)
|
||||||
inputVolumeDb = -100;
|
inputVolumeDb = -100;
|
||||||
|
|
||||||
@ -236,6 +236,39 @@ void EventHandler::HandleInputVolumeChanged(void *param, calldata_t *data)
|
|||||||
eventHandler->BroadcastEvent(EventSubscription::Inputs, "InputVolumeChanged", eventData);
|
eventHandler->BroadcastEvent(EventSubscription::Inputs, "InputVolumeChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The audio balance value of an input has changed.
|
||||||
|
*
|
||||||
|
* @dataField inputName | String | Name of the affected input
|
||||||
|
* @dataField inputAudioBalance | Number | New audio balance value of the input
|
||||||
|
*
|
||||||
|
* @eventType InputAudioBalanceChanged
|
||||||
|
* @eventSubscription Inputs
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @category inputs
|
||||||
|
* @api events
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleInputAudioBalanceChanged(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
if (!source)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (obs_source_get_type(source) != OBS_SOURCE_TYPE_INPUT)
|
||||||
|
return;
|
||||||
|
|
||||||
|
float inputAudioBalance = (float)calldata_float(data, "balance");
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["inputName"] = obs_source_get_name(source);
|
||||||
|
eventData["inputAudioBalance"] = inputAudioBalance;
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::Inputs, "InputAudioBalanceChanged", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The sync offset of an input has changed.
|
* The sync offset of an input has changed.
|
||||||
*
|
*
|
||||||
@ -252,7 +285,7 @@ void EventHandler::HandleInputVolumeChanged(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleInputAudioSyncOffsetChanged(void *param, calldata_t *data)
|
void EventHandler::HandleInputAudioSyncOffsetChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -273,7 +306,7 @@ void EventHandler::HandleInputAudioSyncOffsetChanged(void *param, calldata_t *da
|
|||||||
* The audio tracks of an input have changed.
|
* The audio tracks of an input have changed.
|
||||||
*
|
*
|
||||||
* @dataField inputName | String | Name of the input
|
* @dataField inputName | String | Name of the input
|
||||||
* @dataField inputAudioTracks | Array<Boolean> | Array of audio tracks along with their associated enable states
|
* @dataField inputAudioTracks | Object | Object of audio tracks along with their associated enable states
|
||||||
*
|
*
|
||||||
* @eventType InputAudioTracksChanged
|
* @eventType InputAudioTracksChanged
|
||||||
* @eventSubscription Inputs
|
* @eventSubscription Inputs
|
||||||
@ -285,7 +318,7 @@ void EventHandler::HandleInputAudioSyncOffsetChanged(void *param, calldata_t *da
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleInputAudioTracksChanged(void *param, calldata_t *data)
|
void EventHandler::HandleInputAudioTracksChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -311,6 +344,7 @@ void EventHandler::HandleInputAudioTracksChanged(void *param, calldata_t *data)
|
|||||||
* The monitor type of an input has changed.
|
* The monitor type of an input has changed.
|
||||||
*
|
*
|
||||||
* Available types are:
|
* Available types are:
|
||||||
|
*
|
||||||
* - `OBS_MONITORING_TYPE_NONE`
|
* - `OBS_MONITORING_TYPE_NONE`
|
||||||
* - `OBS_MONITORING_TYPE_MONITOR_ONLY`
|
* - `OBS_MONITORING_TYPE_MONITOR_ONLY`
|
||||||
* - `OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT`
|
* - `OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT`
|
||||||
@ -328,7 +362,7 @@ void EventHandler::HandleInputAudioTracksChanged(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleInputAudioMonitorTypeChanged(void *param, calldata_t *data)
|
void EventHandler::HandleInputAudioMonitorTypeChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -339,11 +373,9 @@ void EventHandler::HandleInputAudioMonitorTypeChanged(void *param, calldata_t *d
|
|||||||
|
|
||||||
enum obs_monitoring_type monitorType = (obs_monitoring_type)calldata_int(data, "type");
|
enum obs_monitoring_type monitorType = (obs_monitoring_type)calldata_int(data, "type");
|
||||||
|
|
||||||
std::string monitorTypeString = Utils::Obs::StringHelper::GetInputMonitorType(monitorType);
|
|
||||||
|
|
||||||
json eventData;
|
json eventData;
|
||||||
eventData["inputName"] = obs_source_get_name(source);
|
eventData["inputName"] = obs_source_get_name(source);
|
||||||
eventData["monitorType"] = monitorTypeString;
|
eventData["monitorType"] = monitorType;
|
||||||
eventHandler->BroadcastEvent(EventSubscription::Inputs, "InputAudioMonitorTypeChanged", eventData);
|
eventHandler->BroadcastEvent(EventSubscription::Inputs, "InputAudioMonitorTypeChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,9 +19,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#include "EventHandler.h"
|
#include "EventHandler.h"
|
||||||
|
|
||||||
#define CASE(x) case x: return #x;
|
#define CASE(x) \
|
||||||
|
case x: \
|
||||||
|
return #x;
|
||||||
|
|
||||||
std::string GetMediaInputActionString(ObsMediaInputAction action) {
|
std::string GetMediaInputActionString(ObsMediaInputAction action)
|
||||||
|
{
|
||||||
switch (action) {
|
switch (action) {
|
||||||
default:
|
default:
|
||||||
CASE(OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE)
|
CASE(OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE)
|
||||||
@ -35,7 +38,7 @@ std::string GetMediaInputActionString(ObsMediaInputAction action) {
|
|||||||
|
|
||||||
void EventHandler::SourceMediaPauseMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceMediaPauseMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -49,7 +52,7 @@ void EventHandler::SourceMediaPauseMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
void EventHandler::SourceMediaPlayMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceMediaPlayMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -63,7 +66,7 @@ void EventHandler::SourceMediaPlayMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
void EventHandler::SourceMediaRestartMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceMediaRestartMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -77,7 +80,7 @@ void EventHandler::SourceMediaRestartMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
void EventHandler::SourceMediaStopMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceMediaStopMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -91,7 +94,7 @@ void EventHandler::SourceMediaStopMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
void EventHandler::SourceMediaNextMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceMediaNextMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -105,7 +108,7 @@ void EventHandler::SourceMediaNextMultiHandler(void *param, calldata_t *data)
|
|||||||
|
|
||||||
void EventHandler::SourceMediaPreviousMultiHandler(void *param, calldata_t *data)
|
void EventHandler::SourceMediaPreviousMultiHandler(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -132,7 +135,7 @@ void EventHandler::SourceMediaPreviousMultiHandler(void *param, calldata_t *data
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleMediaInputPlaybackStarted(void *param, calldata_t *data)
|
void EventHandler::HandleMediaInputPlaybackStarted(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
@ -161,7 +164,7 @@ void EventHandler::HandleMediaInputPlaybackStarted(void *param, calldata_t *data
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleMediaInputPlaybackEnded(void *param, calldata_t *data)
|
void EventHandler::HandleMediaInputPlaybackEnded(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
if (!source)
|
if (!source)
|
||||||
|
@ -19,14 +19,17 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#include "EventHandler.h"
|
#include "EventHandler.h"
|
||||||
|
|
||||||
static bool GetOutputStateActive(ObsOutputState state) {
|
static bool GetOutputStateActive(ObsOutputState state)
|
||||||
|
{
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case OBS_WEBSOCKET_OUTPUT_STARTED:
|
case OBS_WEBSOCKET_OUTPUT_STARTED:
|
||||||
case OBS_WEBSOCKET_OUTPUT_RESUMED:
|
case OBS_WEBSOCKET_OUTPUT_RESUMED:
|
||||||
|
case OBS_WEBSOCKET_OUTPUT_RECONNECTED:
|
||||||
return true;
|
return true;
|
||||||
case OBS_WEBSOCKET_OUTPUT_STARTING:
|
case OBS_WEBSOCKET_OUTPUT_STARTING:
|
||||||
case OBS_WEBSOCKET_OUTPUT_STOPPING:
|
case OBS_WEBSOCKET_OUTPUT_STOPPING:
|
||||||
case OBS_WEBSOCKET_OUTPUT_STOPPED:
|
case OBS_WEBSOCKET_OUTPUT_STOPPED:
|
||||||
|
case OBS_WEBSOCKET_OUTPUT_RECONNECTING:
|
||||||
case OBS_WEBSOCKET_OUTPUT_PAUSED:
|
case OBS_WEBSOCKET_OUTPUT_PAUSED:
|
||||||
return false;
|
return false;
|
||||||
default:
|
default:
|
||||||
@ -52,7 +55,7 @@ void EventHandler::HandleStreamStateChanged(ObsOutputState state)
|
|||||||
{
|
{
|
||||||
json eventData;
|
json eventData;
|
||||||
eventData["outputActive"] = GetOutputStateActive(state);
|
eventData["outputActive"] = GetOutputStateActive(state);
|
||||||
eventData["outputState"] = Utils::Obs::StringHelper::GetOutputState(state);
|
eventData["outputState"] = state;
|
||||||
BroadcastEvent(EventSubscription::Outputs, "StreamStateChanged", eventData);
|
BroadcastEvent(EventSubscription::Outputs, "StreamStateChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,6 +64,7 @@ void EventHandler::HandleStreamStateChanged(ObsOutputState state)
|
|||||||
*
|
*
|
||||||
* @dataField outputActive | Boolean | Whether the output is active
|
* @dataField outputActive | Boolean | Whether the output is active
|
||||||
* @dataField outputState | String | The specific state of the output
|
* @dataField outputState | String | The specific state of the output
|
||||||
|
* @dataField outputPath | String | File name for the saved recording, if record stopped. `null` otherwise
|
||||||
*
|
*
|
||||||
* @eventType RecordStateChanged
|
* @eventType RecordStateChanged
|
||||||
* @eventSubscription Outputs
|
* @eventSubscription Outputs
|
||||||
@ -74,7 +78,12 @@ void EventHandler::HandleRecordStateChanged(ObsOutputState state)
|
|||||||
{
|
{
|
||||||
json eventData;
|
json eventData;
|
||||||
eventData["outputActive"] = GetOutputStateActive(state);
|
eventData["outputActive"] = GetOutputStateActive(state);
|
||||||
eventData["outputState"] = Utils::Obs::StringHelper::GetOutputState(state);
|
eventData["outputState"] = state;
|
||||||
|
if (state == OBS_WEBSOCKET_OUTPUT_STOPPED || state == OBS_WEBSOCKET_OUTPUT_STARTED) {
|
||||||
|
eventData["outputPath"] = Utils::Obs::StringHelper::GetLastRecordFileName();
|
||||||
|
} else {
|
||||||
|
eventData["outputPath"] = nullptr;
|
||||||
|
}
|
||||||
BroadcastEvent(EventSubscription::Outputs, "RecordStateChanged", eventData);
|
BroadcastEvent(EventSubscription::Outputs, "RecordStateChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,7 +105,7 @@ void EventHandler::HandleReplayBufferStateChanged(ObsOutputState state)
|
|||||||
{
|
{
|
||||||
json eventData;
|
json eventData;
|
||||||
eventData["outputActive"] = GetOutputStateActive(state);
|
eventData["outputActive"] = GetOutputStateActive(state);
|
||||||
eventData["outputState"] = Utils::Obs::StringHelper::GetOutputState(state);
|
eventData["outputState"] = state;
|
||||||
BroadcastEvent(EventSubscription::Outputs, "ReplayBufferStateChanged", eventData);
|
BroadcastEvent(EventSubscription::Outputs, "ReplayBufferStateChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,7 +127,7 @@ void EventHandler::HandleVirtualcamStateChanged(ObsOutputState state)
|
|||||||
{
|
{
|
||||||
json eventData;
|
json eventData;
|
||||||
eventData["outputActive"] = GetOutputStateActive(state);
|
eventData["outputActive"] = GetOutputStateActive(state);
|
||||||
eventData["outputState"] = Utils::Obs::StringHelper::GetOutputState(state);
|
eventData["outputState"] = state;
|
||||||
BroadcastEvent(EventSubscription::Outputs, "VirtualcamStateChanged", eventData);
|
BroadcastEvent(EventSubscription::Outputs, "VirtualcamStateChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,6 +147,6 @@ void EventHandler::HandleVirtualcamStateChanged(ObsOutputState state)
|
|||||||
void EventHandler::HandleReplayBufferSaved()
|
void EventHandler::HandleReplayBufferSaved()
|
||||||
{
|
{
|
||||||
json eventData;
|
json eventData;
|
||||||
eventData["savedReplayPath"] = Utils::Obs::StringHelper::GetLastReplayBufferFilePath();
|
eventData["savedReplayPath"] = Utils::Obs::StringHelper::GetLastReplayBufferFileName();
|
||||||
BroadcastEvent(EventSubscription::Outputs, "ReplayBufferSaved", eventData);
|
BroadcastEvent(EventSubscription::Outputs, "ReplayBufferSaved", eventData);
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleSceneItemCreated(void *param, calldata_t *data)
|
void EventHandler::HandleSceneItemCreated(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
||||||
if (!scene)
|
if (!scene)
|
||||||
@ -74,7 +74,7 @@ void EventHandler::HandleSceneItemCreated(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleSceneItemRemoved(void *param, calldata_t *data)
|
void EventHandler::HandleSceneItemRemoved(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
||||||
if (!scene)
|
if (!scene)
|
||||||
@ -107,7 +107,7 @@ void EventHandler::HandleSceneItemRemoved(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleSceneItemListReindexed(void *param, calldata_t *data)
|
void EventHandler::HandleSceneItemListReindexed(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
||||||
if (!scene)
|
if (!scene)
|
||||||
@ -136,7 +136,7 @@ void EventHandler::HandleSceneItemListReindexed(void *param, calldata_t *data)
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleSceneItemEnableStateChanged(void *param, calldata_t *data)
|
void EventHandler::HandleSceneItemEnableStateChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
||||||
if (!scene)
|
if (!scene)
|
||||||
@ -160,7 +160,7 @@ void EventHandler::HandleSceneItemEnableStateChanged(void *param, calldata_t *da
|
|||||||
*
|
*
|
||||||
* @dataField sceneName | String | Name of the scene the item is in
|
* @dataField sceneName | String | Name of the scene the item is in
|
||||||
* @dataField sceneItemId | Number | Numeric ID of the scene item
|
* @dataField sceneItemId | Number | Numeric ID of the scene item
|
||||||
* @dataField sceneItemEnabled | Boolean | Whether the scene item is locked
|
* @dataField sceneItemLocked | Boolean | Whether the scene item is locked
|
||||||
*
|
*
|
||||||
* @eventType SceneItemLockStateChanged
|
* @eventType SceneItemLockStateChanged
|
||||||
* @eventSubscription SceneItems
|
* @eventSubscription SceneItems
|
||||||
@ -172,7 +172,7 @@ void EventHandler::HandleSceneItemEnableStateChanged(void *param, calldata_t *da
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleSceneItemLockStateChanged(void *param, calldata_t *data)
|
void EventHandler::HandleSceneItemLockStateChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
||||||
if (!scene)
|
if (!scene)
|
||||||
@ -191,6 +191,38 @@ void EventHandler::HandleSceneItemLockStateChanged(void *param, calldata_t *data
|
|||||||
eventHandler->BroadcastEvent(EventSubscription::SceneItems, "SceneItemLockStateChanged", eventData);
|
eventHandler->BroadcastEvent(EventSubscription::SceneItems, "SceneItemLockStateChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A scene item has been selected in the Ui.
|
||||||
|
*
|
||||||
|
* @dataField sceneName | String | Name of the scene the item is in
|
||||||
|
* @dataField sceneItemId | Number | Numeric ID of the scene item
|
||||||
|
*
|
||||||
|
* @eventType SceneItemSelected
|
||||||
|
* @eventSubscription SceneItems
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category scene items
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSceneItemSelected(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
|
||||||
|
if (!scene)
|
||||||
|
return;
|
||||||
|
|
||||||
|
obs_sceneitem_t *sceneItem = GetCalldataPointer<obs_sceneitem_t>(data, "item");
|
||||||
|
if (!sceneItem)
|
||||||
|
return;
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["sceneName"] = obs_source_get_name(obs_scene_get_source(scene));
|
||||||
|
eventData["sceneItemId"] = obs_sceneitem_get_id(sceneItem);
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::SceneItems, "SceneItemSelected", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The transform/crop of a scene item has changed.
|
* The transform/crop of a scene item has changed.
|
||||||
*
|
*
|
||||||
@ -208,7 +240,7 @@ void EventHandler::HandleSceneItemLockStateChanged(void *param, calldata_t *data
|
|||||||
*/
|
*/
|
||||||
void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data)
|
void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data)
|
||||||
{
|
{
|
||||||
auto eventHandler = reinterpret_cast<EventHandler*>(param);
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
if (!eventHandler->_sceneItemTransformChangedRef.load())
|
if (!eventHandler->_sceneItemTransformChangedRef.load())
|
||||||
return;
|
return;
|
||||||
|
@ -18,3 +18,130 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "EventHandler.h"
|
#include "EventHandler.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The current scene transition has changed.
|
||||||
|
*
|
||||||
|
* @dataField transitionName | String | Name of the new transition
|
||||||
|
*
|
||||||
|
* @eventType CurrentSceneTransitionChanged
|
||||||
|
* @eventSubscription Transitions
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category transitions
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleCurrentSceneTransitionChanged()
|
||||||
|
{
|
||||||
|
OBSSourceAutoRelease transition = obs_frontend_get_current_transition();
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["transitionName"] = obs_source_get_name(transition);
|
||||||
|
BroadcastEvent(EventSubscription::Transitions, "CurrentSceneTransitionChanged", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The current scene transition duration has changed.
|
||||||
|
*
|
||||||
|
* @dataField transitionDuration | Number | Transition duration in milliseconds
|
||||||
|
*
|
||||||
|
* @eventType CurrentSceneTransitionDurationChanged
|
||||||
|
* @eventSubscription Transitions
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category transitions
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleCurrentSceneTransitionDurationChanged()
|
||||||
|
{
|
||||||
|
json eventData;
|
||||||
|
eventData["transitionDuration"] = obs_frontend_get_transition_duration();
|
||||||
|
BroadcastEvent(EventSubscription::Transitions, "CurrentSceneTransitionDurationChanged", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A scene transition has started.
|
||||||
|
*
|
||||||
|
* @dataField transitionName | String | Scene transition name
|
||||||
|
*
|
||||||
|
* @eventType SceneTransitionStarted
|
||||||
|
* @eventSubscription Transitions
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category transitions
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSceneTransitionStarted(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
if (!source)
|
||||||
|
return;
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["transitionName"] = obs_source_get_name(source);
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::Transitions, "SceneTransitionStarted", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A scene transition has completed fully.
|
||||||
|
*
|
||||||
|
* Note: Does not appear to trigger when the transition is interrupted by the user.
|
||||||
|
*
|
||||||
|
* @dataField transitionName | String | Scene transition name
|
||||||
|
*
|
||||||
|
* @eventType SceneTransitionEnded
|
||||||
|
* @eventSubscription Transitions
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category transitions
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSceneTransitionEnded(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
if (!source)
|
||||||
|
return;
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["transitionName"] = obs_source_get_name(source);
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::Transitions, "SceneTransitionEnded", eventData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A scene transition's video has completed fully.
|
||||||
|
*
|
||||||
|
* Useful for stinger transitions to tell when the video *actually* ends.
|
||||||
|
* `SceneTransitionEnded` only signifies the cut point, not the completion of transition playback.
|
||||||
|
*
|
||||||
|
* Note: Appears to be called by every transition, regardless of relevance.
|
||||||
|
*
|
||||||
|
* @dataField transitionName | String | Scene transition name
|
||||||
|
*
|
||||||
|
* @eventType SceneTransitionVideoEnded
|
||||||
|
* @eventSubscription Transitions
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api events
|
||||||
|
* @category transitions
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleSceneTransitionVideoEnded(void *param, calldata_t *data)
|
||||||
|
{
|
||||||
|
auto eventHandler = static_cast<EventHandler *>(param);
|
||||||
|
|
||||||
|
obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
|
||||||
|
if (!source)
|
||||||
|
return;
|
||||||
|
|
||||||
|
json eventData;
|
||||||
|
eventData["transitionName"] = obs_source_get_name(source);
|
||||||
|
eventHandler->BroadcastEvent(EventSubscription::Transitions, "SceneTransitionVideoEnded", eventData);
|
||||||
|
}
|
||||||
|
@ -38,3 +38,27 @@ void EventHandler::HandleStudioModeStateChanged(bool enabled)
|
|||||||
eventData["studioModeEnabled"] = enabled;
|
eventData["studioModeEnabled"] = enabled;
|
||||||
BroadcastEvent(EventSubscription::Ui, "StudioModeStateChanged", eventData);
|
BroadcastEvent(EventSubscription::Ui, "StudioModeStateChanged", eventData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A screenshot has been saved.
|
||||||
|
*
|
||||||
|
* Note: Triggered for the screenshot feature available in `Settings -> Hotkeys -> Screenshot Output` ONLY.
|
||||||
|
* Applications using `Get/SaveSourceScreenshot` should implement a `CustomEvent` if this kind of inter-client
|
||||||
|
* communication is desired.
|
||||||
|
*
|
||||||
|
* @dataField savedScreenshotPath | String | Path of the saved image file
|
||||||
|
*
|
||||||
|
* @eventType ScreenshotSaved
|
||||||
|
* @eventSubscription Ui
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.1.0
|
||||||
|
* @api events
|
||||||
|
* @category ui
|
||||||
|
*/
|
||||||
|
void EventHandler::HandleScreenshotSaved()
|
||||||
|
{
|
||||||
|
json eventData;
|
||||||
|
eventData["savedScreenshotPath"] = Utils::Obs::StringHelper::GetLastScreenshotFileName();
|
||||||
|
BroadcastEvent(EventSubscription::Ui, "ScreenshotSaved", eventData);
|
||||||
|
}
|
||||||
|
@ -157,13 +157,14 @@ namespace EventSubscription {
|
|||||||
* Helper to receive all non-high-volume events.
|
* Helper to receive all non-high-volume events.
|
||||||
*
|
*
|
||||||
* @enumIdentifier All
|
* @enumIdentifier All
|
||||||
* @enumValue (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors)
|
* @enumValue (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors | Ui)
|
||||||
* @enumType EventSubscription
|
* @enumType EventSubscription
|
||||||
* @rpcVersion -1
|
* @rpcVersion -1
|
||||||
* @initialVersion 5.0.0
|
* @initialVersion 5.0.0
|
||||||
* @api enums
|
* @api enums
|
||||||
*/
|
*/
|
||||||
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Ui | Vendors),
|
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors |
|
||||||
|
Ui),
|
||||||
/**
|
/**
|
||||||
* Subscription value to receive the `InputVolumeMeters` high-volume event.
|
* Subscription value to receive the `InputVolumeMeters` high-volume event.
|
||||||
*
|
*
|
||||||
|
@ -28,18 +28,13 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#include "../Config.h"
|
#include "../Config.h"
|
||||||
#include "../utils/Platform.h"
|
#include "../utils/Platform.h"
|
||||||
|
|
||||||
ConnectInfo::ConnectInfo(QWidget* parent) :
|
ConnectInfo::ConnectInfo(QWidget *parent) : QDialog(parent, Qt::Dialog), ui(new Ui::ConnectInfo)
|
||||||
QDialog(parent, Qt::Dialog),
|
|
||||||
ui(new Ui::ConnectInfo)
|
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
connect(ui->copyServerIpButton, &QPushButton::clicked,
|
connect(ui->copyServerIpButton, &QPushButton::clicked, this, &ConnectInfo::CopyServerIpButtonClicked);
|
||||||
this, &ConnectInfo::CopyServerIpButtonClicked);
|
connect(ui->copyServerPortButton, &QPushButton::clicked, this, &ConnectInfo::CopyServerPortButtonClicked);
|
||||||
connect(ui->copyServerPortButton, &QPushButton::clicked,
|
connect(ui->copyServerPasswordButton, &QPushButton::clicked, this, &ConnectInfo::CopyServerPasswordButtonClicked);
|
||||||
this, &ConnectInfo::CopyServerPortButtonClicked);
|
|
||||||
connect(ui->copyServerPasswordButton, &QPushButton::clicked,
|
|
||||||
this, &ConnectInfo::CopyServerPasswordButtonClicked);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ConnectInfo::~ConnectInfo()
|
ConnectInfo::~ConnectInfo()
|
||||||
@ -110,7 +105,7 @@ void ConnectInfo::SetClipboardText(QString text)
|
|||||||
|
|
||||||
void ConnectInfo::DrawQr(QString qrText)
|
void ConnectInfo::DrawQr(QString qrText)
|
||||||
{
|
{
|
||||||
QPixmap map(230, 230);
|
QPixmap map(236, 236);
|
||||||
map.fill(Qt::white);
|
map.fill(Qt::white);
|
||||||
QPainter painter(&map);
|
QPainter painter(&map);
|
||||||
|
|
||||||
|
@ -25,8 +25,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#include "ui_ConnectInfo.h"
|
#include "ui_ConnectInfo.h"
|
||||||
|
|
||||||
class ConnectInfo : public QDialog
|
class ConnectInfo : public QDialog {
|
||||||
{
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>451</width>
|
<width>451</width>
|
||||||
<height>412</height>
|
<height>432</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
@ -19,7 +19,7 @@
|
|||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>451</width>
|
<width>451</width>
|
||||||
<height>412</height>
|
<height>432</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -31,12 +31,21 @@
|
|||||||
<x>10</x>
|
<x>10</x>
|
||||||
<y>10</y>
|
<y>10</y>
|
||||||
<width>431</width>
|
<width>431</width>
|
||||||
<height>101</height>
|
<height>121</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QFormLayout" name="formLayout">
|
<layout class="QFormLayout" name="formLayout">
|
||||||
|
<property name="formAlignment">
|
||||||
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="serverIpLabel">
|
<widget class="QLabel" name="serverIpLabel">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>200</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OBSWebSocket.ConnectInfo.ServerIp</string>
|
<string>OBSWebSocket.ConnectInfo.ServerIp</string>
|
||||||
</property>
|
</property>
|
||||||
@ -46,6 +55,12 @@
|
|||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="serverIpLineEdit">
|
<widget class="QLineEdit" name="serverIpLineEdit">
|
||||||
|
<property name="focusPolicy">
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
|
||||||
|
</property>
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
@ -53,6 +68,12 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="copyServerIpButton">
|
<widget class="QPushButton" name="copyServerIpButton">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>75</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OBSWebSocket.ConnectInfo.CopyText</string>
|
<string>OBSWebSocket.ConnectInfo.CopyText</string>
|
||||||
</property>
|
</property>
|
||||||
@ -62,6 +83,12 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="serverPortLabel">
|
<widget class="QLabel" name="serverPortLabel">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>200</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OBSWebSocket.ConnectInfo.ServerPort</string>
|
<string>OBSWebSocket.ConnectInfo.ServerPort</string>
|
||||||
</property>
|
</property>
|
||||||
@ -71,6 +98,12 @@
|
|||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="serverPortLineEdit">
|
<widget class="QLineEdit" name="serverPortLineEdit">
|
||||||
|
<property name="focusPolicy">
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
|
||||||
|
</property>
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
@ -78,6 +111,12 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="copyServerPortButton">
|
<widget class="QPushButton" name="copyServerPortButton">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>75</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OBSWebSocket.ConnectInfo.CopyText</string>
|
<string>OBSWebSocket.ConnectInfo.CopyText</string>
|
||||||
</property>
|
</property>
|
||||||
@ -87,6 +126,12 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="serverPasswordLabel">
|
<widget class="QLabel" name="serverPasswordLabel">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>200</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OBSWebSocket.ConnectInfo.ServerPassword</string>
|
<string>OBSWebSocket.ConnectInfo.ServerPassword</string>
|
||||||
</property>
|
</property>
|
||||||
@ -96,9 +141,15 @@
|
|||||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="serverPasswordLineEdit">
|
<widget class="QLineEdit" name="serverPasswordLineEdit">
|
||||||
|
<property name="focusPolicy">
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText</string>
|
<string>OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
|
||||||
|
</property>
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
@ -106,6 +157,12 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="copyServerPasswordButton">
|
<widget class="QPushButton" name="copyServerPasswordButton">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>75</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OBSWebSocket.ConnectInfo.CopyText</string>
|
<string>OBSWebSocket.ConnectInfo.CopyText</string>
|
||||||
</property>
|
</property>
|
||||||
@ -119,7 +176,7 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>10</x>
|
<x>10</x>
|
||||||
<y>120</y>
|
<y>140</y>
|
||||||
<width>431</width>
|
<width>431</width>
|
||||||
<height>281</height>
|
<height>281</height>
|
||||||
</rect>
|
</rect>
|
||||||
@ -131,9 +188,9 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>100</x>
|
<x>100</x>
|
||||||
<y>40</y>
|
<y>30</y>
|
||||||
<width>230</width>
|
<width>236</width>
|
||||||
<height>230</height>
|
<height>236</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -37,8 +37,8 @@ QString GetToolTipIconHtml()
|
|||||||
return iconTemplate.arg(iconFile);
|
return iconTemplate.arg(iconFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingsDialog::SettingsDialog(QWidget* parent) :
|
SettingsDialog::SettingsDialog(QWidget *parent)
|
||||||
QDialog(parent, Qt::Dialog),
|
: QDialog(parent, Qt::Dialog),
|
||||||
ui(new Ui::SettingsDialog),
|
ui(new Ui::SettingsDialog),
|
||||||
connectInfo(new ConnectInfo),
|
connectInfo(new ConnectInfo),
|
||||||
sessionTableTimer(new QTimer),
|
sessionTableTimer(new QTimer),
|
||||||
@ -54,18 +54,13 @@ SettingsDialog::SettingsDialog(QWidget* parent) :
|
|||||||
// Set the appropriate tooltip icon for the theme
|
// Set the appropriate tooltip icon for the theme
|
||||||
ui->enableDebugLoggingToolTipLabel->setText(GetToolTipIconHtml());
|
ui->enableDebugLoggingToolTipLabel->setText(GetToolTipIconHtml());
|
||||||
|
|
||||||
connect(sessionTableTimer, &QTimer::timeout,
|
connect(sessionTableTimer, &QTimer::timeout, this, &SettingsDialog::FillSessionTable);
|
||||||
this, &SettingsDialog::FillSessionTable);
|
connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &SettingsDialog::DialogButtonClicked);
|
||||||
connect(ui->buttonBox, &QDialogButtonBox::clicked,
|
connect(ui->enableAuthenticationCheckBox, &QCheckBox::stateChanged, this,
|
||||||
this, &SettingsDialog::DialogButtonClicked);
|
&SettingsDialog::EnableAuthenticationCheckBoxChanged);
|
||||||
connect(ui->enableAuthenticationCheckBox, &QCheckBox::stateChanged,
|
connect(ui->generatePasswordButton, &QPushButton::clicked, this, &SettingsDialog::GeneratePasswordButtonClicked);
|
||||||
this, &SettingsDialog::EnableAuthenticationCheckBoxChanged);
|
connect(ui->showConnectInfoButton, &QPushButton::clicked, this, &SettingsDialog::ShowConnectInfoButtonClicked);
|
||||||
connect(ui->generatePasswordButton, &QPushButton::clicked,
|
connect(ui->serverPasswordLineEdit, &QLineEdit::textEdited, this, &SettingsDialog::PasswordEdited);
|
||||||
this, &SettingsDialog::GeneratePasswordButtonClicked);
|
|
||||||
connect(ui->showConnectInfoButton, &QPushButton::clicked,
|
|
||||||
this, &SettingsDialog::ShowConnectInfoButtonClicked);
|
|
||||||
connect(ui->serverPasswordLineEdit, &QLineEdit::textEdited,
|
|
||||||
this, &SettingsDialog::PasswordEdited);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingsDialog::~SettingsDialog()
|
SettingsDialog::~SettingsDialog()
|
||||||
@ -83,18 +78,8 @@ void SettingsDialog::showEvent(QShowEvent *)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->enableWebSocketServerCheckBox->setChecked(conf->ServerEnabled);
|
if (conf->PortOverridden)
|
||||||
ui->enableSystemTrayAlertsCheckBox->setChecked(conf->AlertsEnabled);
|
|
||||||
ui->enableDebugLoggingCheckBox->setChecked(conf->DebugEnabled);
|
|
||||||
ui->enableAuthenticationCheckBox->setChecked(conf->AuthRequired);
|
|
||||||
ui->serverPasswordLineEdit->setText(conf->ServerPassword);
|
|
||||||
ui->serverPasswordLineEdit->setEnabled(conf->AuthRequired);
|
|
||||||
ui->generatePasswordButton->setEnabled(conf->AuthRequired);
|
|
||||||
ui->serverPortSpinBox->setValue(conf->ServerPort);
|
|
||||||
|
|
||||||
if (conf->PortOverridden) {
|
|
||||||
ui->serverPortSpinBox->setEnabled(false);
|
ui->serverPortSpinBox->setEnabled(false);
|
||||||
}
|
|
||||||
|
|
||||||
if (conf->PasswordOverridden) {
|
if (conf->PasswordOverridden) {
|
||||||
ui->enableAuthenticationCheckBox->setEnabled(false);
|
ui->enableAuthenticationCheckBox->setEnabled(false);
|
||||||
@ -104,7 +89,7 @@ void SettingsDialog::showEvent(QShowEvent *)
|
|||||||
|
|
||||||
passwordManuallyEdited = false;
|
passwordManuallyEdited = false;
|
||||||
|
|
||||||
FillSessionTable();
|
RefreshData();
|
||||||
|
|
||||||
sessionTableTimer->start(1000);
|
sessionTableTimer->start(1000);
|
||||||
}
|
}
|
||||||
@ -125,6 +110,27 @@ void SettingsDialog::ToggleShowHide()
|
|||||||
setVisible(false);
|
setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SettingsDialog::RefreshData()
|
||||||
|
{
|
||||||
|
auto conf = GetConfig();
|
||||||
|
if (!conf) {
|
||||||
|
blog(LOG_ERROR, "[SettingsDialog::RefreshData] Unable to retreive config!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ui->enableWebSocketServerCheckBox->setChecked(conf->ServerEnabled);
|
||||||
|
ui->enableSystemTrayAlertsCheckBox->setChecked(conf->AlertsEnabled);
|
||||||
|
ui->enableDebugLoggingCheckBox->setChecked(conf->DebugEnabled);
|
||||||
|
ui->serverPortSpinBox->setValue(conf->ServerPort);
|
||||||
|
ui->enableAuthenticationCheckBox->setChecked(conf->AuthRequired);
|
||||||
|
ui->serverPasswordLineEdit->setText(conf->ServerPassword);
|
||||||
|
|
||||||
|
ui->serverPasswordLineEdit->setEnabled(conf->AuthRequired);
|
||||||
|
ui->generatePasswordButton->setEnabled(conf->AuthRequired);
|
||||||
|
|
||||||
|
FillSessionTable();
|
||||||
|
}
|
||||||
|
|
||||||
void SettingsDialog::DialogButtonClicked(QAbstractButton *button)
|
void SettingsDialog::DialogButtonClicked(QAbstractButton *button)
|
||||||
{
|
{
|
||||||
if (button == ui->buttonBox->button(QDialogButtonBox::Ok)) {
|
if (button == ui->buttonBox->button(QDialogButtonBox::Ok)) {
|
||||||
@ -171,19 +177,21 @@ void SettingsDialog::SaveFormData()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool needsRestart = (conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) ||
|
bool needsRestart =
|
||||||
(ui->enableAuthenticationCheckBox->isChecked() && conf->ServerPassword != ui->serverPasswordLineEdit->text()) ||
|
(conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) ||
|
||||||
(conf->ServerPort != ui->serverPortSpinBox->value());
|
(conf->ServerPort != ui->serverPortSpinBox->value()) ||
|
||||||
|
(ui->enableAuthenticationCheckBox->isChecked() && conf->ServerPassword != ui->serverPasswordLineEdit->text());
|
||||||
|
|
||||||
conf->ServerEnabled = ui->enableWebSocketServerCheckBox->isChecked();
|
conf->ServerEnabled = ui->enableWebSocketServerCheckBox->isChecked();
|
||||||
conf->AlertsEnabled = ui->enableSystemTrayAlertsCheckBox->isChecked();
|
conf->AlertsEnabled = ui->enableSystemTrayAlertsCheckBox->isChecked();
|
||||||
conf->DebugEnabled = ui->enableDebugLoggingCheckBox->isChecked();
|
conf->DebugEnabled = ui->enableDebugLoggingCheckBox->isChecked();
|
||||||
|
conf->ServerPort = ui->serverPortSpinBox->value();
|
||||||
conf->AuthRequired = ui->enableAuthenticationCheckBox->isChecked();
|
conf->AuthRequired = ui->enableAuthenticationCheckBox->isChecked();
|
||||||
conf->ServerPassword = ui->serverPasswordLineEdit->text();
|
conf->ServerPassword = ui->serverPasswordLineEdit->text();
|
||||||
conf->ServerPort = ui->serverPortSpinBox->value();
|
|
||||||
|
|
||||||
conf->Save();
|
conf->Save();
|
||||||
|
|
||||||
|
RefreshData();
|
||||||
connectInfo->RefreshData();
|
connectInfo->RefreshData();
|
||||||
|
|
||||||
if (needsRestart) {
|
if (needsRestart) {
|
||||||
@ -226,7 +234,8 @@ void SettingsDialog::FillSessionTable()
|
|||||||
QTableWidgetItem *durationItem = new QTableWidgetItem(QTime(0, 0, sessionDuration).toString("hh:mm:ss"));
|
QTableWidgetItem *durationItem = new QTableWidgetItem(QTime(0, 0, sessionDuration).toString("hh:mm:ss"));
|
||||||
ui->websocketSessionTable->setItem(i, 1, durationItem);
|
ui->websocketSessionTable->setItem(i, 1, durationItem);
|
||||||
|
|
||||||
QTableWidgetItem *statsItem = new QTableWidgetItem(QString("%1/%2").arg(session.incomingMessages).arg(session.outgoingMessages));
|
QTableWidgetItem *statsItem =
|
||||||
|
new QTableWidgetItem(QString("%1/%2").arg(session.incomingMessages).arg(session.outgoingMessages));
|
||||||
ui->websocketSessionTable->setItem(i, 2, statsItem);
|
ui->websocketSessionTable->setItem(i, 2, statsItem);
|
||||||
|
|
||||||
QLabel *identifiedLabel = new QLabel();
|
QLabel *identifiedLabel = new QLabel();
|
||||||
@ -246,9 +255,7 @@ void SettingsDialog::FillSessionTable()
|
|||||||
invalidateButtonLayout->setContentsMargins(0, 0, 0, 0);
|
invalidateButtonLayout->setContentsMargins(0, 0, 0, 0);
|
||||||
invalidateButtonWidget->setLayout(invalidateButtonLayout);
|
invalidateButtonWidget->setLayout(invalidateButtonLayout);
|
||||||
ui->websocketSessionTable->setCellWidget(i, 4, invalidateButtonWidget);
|
ui->websocketSessionTable->setCellWidget(i, 4, invalidateButtonWidget);
|
||||||
connect(invalidateButton, &QPushButton::clicked, [=]() {
|
connect(invalidateButton, &QPushButton::clicked, [=]() { webSocketServer->InvalidateSession(session.hdl); });
|
||||||
webSocketServer->InvalidateSession(session.hdl);
|
|
||||||
});
|
|
||||||
|
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
@ -27,8 +27,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#include "ui_SettingsDialog.h"
|
#include "ui_SettingsDialog.h"
|
||||||
|
|
||||||
class SettingsDialog : public QDialog
|
class SettingsDialog : public QDialog {
|
||||||
{
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@ -37,6 +36,7 @@ public:
|
|||||||
void showEvent(QShowEvent *event);
|
void showEvent(QShowEvent *event);
|
||||||
void hideEvent(QHideEvent *event);
|
void hideEvent(QHideEvent *event);
|
||||||
void ToggleShowHide();
|
void ToggleShowHide();
|
||||||
|
void RefreshData();
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void DialogButtonClicked(QAbstractButton *button);
|
void DialogButtonClicked(QAbstractButton *button);
|
||||||
|
@ -80,7 +80,7 @@
|
|||||||
<item row="3" column="1">
|
<item row="3" column="1">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>0</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="enableDebugLoggingCheckBox">
|
<widget class="QCheckBox" name="enableDebugLoggingCheckBox">
|
||||||
@ -97,6 +97,12 @@
|
|||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>OBSWebSocket.Settings.DebugEnableHoverText</string>
|
<string>OBSWebSocket.Settings.DebugEnableHoverText</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="scaledContents">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -151,7 +157,7 @@
|
|||||||
<number>65534</number>
|
<number>65534</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="value">
|
<property name="value">
|
||||||
<number>4444</number>
|
<number>4455</number>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -32,8 +32,14 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
OBS_DECLARE_MODULE()
|
OBS_DECLARE_MODULE()
|
||||||
OBS_MODULE_USE_DEFAULT_LOCALE("obs-websocket", "en-US")
|
OBS_MODULE_USE_DEFAULT_LOCALE("obs-websocket", "en-US")
|
||||||
OBS_MODULE_AUTHOR("OBSProject")
|
OBS_MODULE_AUTHOR("OBSProject")
|
||||||
const char *obs_module_name(void) { return "obs-websocket"; }
|
const char *obs_module_name(void)
|
||||||
const char *obs_module_description(void) { return obs_module_text("OBSWebSocket.Plugin.Description"); }
|
{
|
||||||
|
return "obs-websocket";
|
||||||
|
}
|
||||||
|
const char *obs_module_description(void)
|
||||||
|
{
|
||||||
|
return obs_module_text("OBSWebSocket.Plugin.Description");
|
||||||
|
}
|
||||||
|
|
||||||
os_cpu_usage_info_t *_cpuUsageInfo;
|
os_cpu_usage_info_t *_cpuUsageInfo;
|
||||||
ConfigPtr _config;
|
ConfigPtr _config;
|
||||||
@ -46,8 +52,10 @@ void WebSocketApiEventCallback(std::string vendorName, std::string eventType, ob
|
|||||||
|
|
||||||
bool obs_module_load(void)
|
bool obs_module_load(void)
|
||||||
{
|
{
|
||||||
blog(LOG_INFO, "[obs_module_load] you can haz websockets (Version: %s | RPC Version: %d)", OBS_WEBSOCKET_VERSION, OBS_WEBSOCKET_RPC_VERSION);
|
blog(LOG_INFO, "[obs_module_load] you can haz websockets (Version: %s | RPC Version: %d)", OBS_WEBSOCKET_VERSION,
|
||||||
|
OBS_WEBSOCKET_RPC_VERSION);
|
||||||
blog(LOG_INFO, "[obs_module_load] Qt version (compile-time): %s | Qt version (run-time): %s", QT_VERSION_STR, qVersion());
|
blog(LOG_INFO, "[obs_module_load] Qt version (compile-time): %s | Qt version (run-time): %s", QT_VERSION_STR, qVersion());
|
||||||
|
blog(LOG_INFO, "[obs_module_load] Linked ASIO Version: %d", ASIO_VERSION);
|
||||||
|
|
||||||
// Initialize the cpu stats
|
// Initialize the cpu stats
|
||||||
_cpuUsageInfo = os_cpu_usage_info_start();
|
_cpuUsageInfo = os_cpu_usage_info_start();
|
||||||
@ -68,7 +76,7 @@ bool obs_module_load(void)
|
|||||||
|
|
||||||
// Initialize the settings dialog
|
// Initialize the settings dialog
|
||||||
obs_frontend_push_ui_translation(obs_module_get_string);
|
obs_frontend_push_ui_translation(obs_module_get_string);
|
||||||
QMainWindow* mainWindow = reinterpret_cast<QMainWindow*>(obs_frontend_get_main_window());
|
QMainWindow *mainWindow = static_cast<QMainWindow *>(obs_frontend_get_main_window());
|
||||||
_settingsDialog = new SettingsDialog(mainWindow);
|
_settingsDialog = new SettingsDialog(mainWindow);
|
||||||
obs_frontend_pop_ui_translation();
|
obs_frontend_pop_ui_translation();
|
||||||
|
|
||||||
@ -189,12 +197,26 @@ void obs_module_post_load()
|
|||||||
{
|
{
|
||||||
blog(LOG_INFO, "[obs_module_post_load] Post load started.");
|
blog(LOG_INFO, "[obs_module_post_load] Post load started.");
|
||||||
|
|
||||||
|
// Test plugin API version fetch
|
||||||
|
uint apiVersion = obs_websocket_get_api_version();
|
||||||
|
blog(LOG_INFO, "[obs_module_post_load] obs-websocket plugin API version: %u", apiVersion);
|
||||||
|
|
||||||
|
// Test calling obs-websocket requests
|
||||||
|
struct obs_websocket_request_response *response = obs_websocket_call_request("GetVersion");
|
||||||
|
if (response) {
|
||||||
|
blog(LOG_INFO, "[obs_module_post_load] Called GetVersion. Status Code: %u | Comment: %s | Response Data: %s",
|
||||||
|
response->status_code, response->comment, response->response_data);
|
||||||
|
obs_websocket_request_response_free(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test vendor creation
|
||||||
auto vendor = obs_websocket_register_vendor("obs-websocket-test");
|
auto vendor = obs_websocket_register_vendor("obs-websocket-test");
|
||||||
if (!vendor) {
|
if (!vendor) {
|
||||||
blog(LOG_WARNING, "[obs_module_post_load] Failed to create vendor!");
|
blog(LOG_WARNING, "[obs_module_post_load] Failed to create vendor!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test vendor request registration
|
||||||
if (!obs_websocket_vendor_register_request(vendor, "TestRequest", test_vendor_request_cb, vendor)) {
|
if (!obs_websocket_vendor_register_request(vendor, "TestRequest", test_vendor_request_cb, vendor)) {
|
||||||
blog(LOG_WARNING, "[obs_module_post_load] Failed to register vendor request!");
|
blog(LOG_WARNING, "[obs_module_post_load] Failed to register vendor request!");
|
||||||
return;
|
return;
|
||||||
|
@ -21,18 +21,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <obs.hpp>
|
#include <obs.hpp>
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma push_macro("strtoll")
|
|
||||||
#endif
|
|
||||||
#include <util/platform.h>
|
#include <util/platform.h>
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma pop_macro("strtoll")
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "utils/Obs.h"
|
#include "utils/Obs.h"
|
||||||
#include "plugin-macros.generated.h"
|
#include "plugin-macros.generated.h"
|
||||||
|
|
||||||
class Config;
|
struct Config;
|
||||||
typedef std::shared_ptr<Config> ConfigPtr;
|
typedef std::shared_ptr<Config> ConfigPtr;
|
||||||
|
|
||||||
class EventHandler;
|
class EventHandler;
|
||||||
|
@ -24,7 +24,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#define blog_debug(msg, ...) if (IsDebugEnabled()) blog(LOG_INFO, "[debug] " msg, ##__VA_ARGS__)
|
#define blog_debug(msg, ...) if (IsDebugEnabled()) blog(LOG_INFO, "[debug] " msg, ##__VA_ARGS__)
|
||||||
|
|
||||||
#define OBS_WEBSOCKET_VERSION "@OBS_WEBSOCKET_VERSION@"
|
#define OBS_WEBSOCKET_VERSION "@obs-websocket_VERSION@"
|
||||||
|
|
||||||
#define OBS_WEBSOCKET_RPC_VERSION @OBS_WEBSOCKET_RPC_VERSION@
|
#define OBS_WEBSOCKET_RPC_VERSION @OBS_WEBSOCKET_RPC_VERSION@
|
||||||
|
|
||||||
|
@ -24,8 +24,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#include "../utils/Compat.h"
|
#include "../utils/Compat.h"
|
||||||
#include "../obs-websocket.h"
|
#include "../obs-websocket.h"
|
||||||
|
|
||||||
struct SerialFrameBatch
|
struct SerialFrameBatch {
|
||||||
{
|
|
||||||
RequestHandler &requestHandler;
|
RequestHandler &requestHandler;
|
||||||
std::queue<RequestBatchRequest> requests;
|
std::queue<RequestBatchRequest> requests;
|
||||||
std::vector<RequestResult> results;
|
std::vector<RequestResult> results;
|
||||||
@ -37,43 +36,46 @@ struct SerialFrameBatch
|
|||||||
std::mutex conditionMutex;
|
std::mutex conditionMutex;
|
||||||
std::condition_variable condition;
|
std::condition_variable condition;
|
||||||
|
|
||||||
SerialFrameBatch(RequestHandler &requestHandler, json &variables, bool haltOnFailure) :
|
SerialFrameBatch(RequestHandler &requestHandler, json &variables, bool haltOnFailure)
|
||||||
requestHandler(requestHandler),
|
: requestHandler(requestHandler),
|
||||||
variables(variables),
|
variables(variables),
|
||||||
haltOnFailure(haltOnFailure),
|
haltOnFailure(haltOnFailure),
|
||||||
frameCount(0),
|
frameCount(0),
|
||||||
sleepUntilFrame(0)
|
sleepUntilFrame(0)
|
||||||
{}
|
{
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ParallelBatchResults
|
struct ParallelBatchResults {
|
||||||
{
|
|
||||||
RequestHandler &requestHandler;
|
RequestHandler &requestHandler;
|
||||||
std::vector<RequestResult> results;
|
std::vector<RequestResult> results;
|
||||||
|
|
||||||
std::mutex conditionMutex;
|
std::mutex conditionMutex;
|
||||||
std::condition_variable condition;
|
std::condition_variable condition;
|
||||||
|
|
||||||
ParallelBatchResults(RequestHandler &requestHandler) :
|
ParallelBatchResults(RequestHandler &requestHandler) : requestHandler(requestHandler) {}
|
||||||
requestHandler(requestHandler)
|
|
||||||
{}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// `{"inputName": "inputNameVariable"}` is essentially `inputName = inputNameVariable`
|
// `{"inputName": "inputNameVariable"}` is essentially `inputName = inputNameVariable`
|
||||||
static void PreProcessVariables(const json &variables, RequestBatchRequest &request)
|
static void PreProcessVariables(const json &variables, RequestBatchRequest &request)
|
||||||
{
|
{
|
||||||
if (variables.empty() || !request.InputVariables.is_object() || request.InputVariables.empty() || !request.RequestData.is_object())
|
if (variables.empty() || !request.InputVariables.is_object() || request.InputVariables.empty() ||
|
||||||
|
!request.RequestData.is_object())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (auto &[key, value] : request.InputVariables.items()) {
|
for (auto &[key, value] : request.InputVariables.items()) {
|
||||||
if (!value.is_string()) {
|
if (!value.is_string()) {
|
||||||
blog_debug("[WebSocketServer::ProcessRequestBatch] Value of field `%s` in `inputVariables `is not a string. Skipping!", key.c_str());
|
blog_debug(
|
||||||
|
"[WebSocketServer::ProcessRequestBatch] Value of field `%s` in `inputVariables `is not a string. Skipping!",
|
||||||
|
key.c_str());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string valueString = value;
|
std::string valueString = value;
|
||||||
if (!variables.contains(valueString)) {
|
if (!variables.contains(valueString)) {
|
||||||
blog_debug("[WebSocketServer::ProcessRequestBatch] `inputVariables` requested variable `%s`, but it does not exist. Skipping!", valueString.c_str());
|
blog_debug(
|
||||||
|
"[WebSocketServer::ProcessRequestBatch] `inputVariables` requested variable `%s`, but it does not exist. Skipping!",
|
||||||
|
valueString.c_str());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,13 +93,17 @@ static void PostProcessVariables(json &variables, const RequestBatchRequest &req
|
|||||||
|
|
||||||
for (auto &[key, value] : request.OutputVariables.items()) {
|
for (auto &[key, value] : request.OutputVariables.items()) {
|
||||||
if (!value.is_string()) {
|
if (!value.is_string()) {
|
||||||
blog_debug("[WebSocketServer::ProcessRequestBatch] Value of field `%s` in `outputVariables` is not a string. Skipping!", key.c_str());
|
blog_debug(
|
||||||
|
"[WebSocketServer::ProcessRequestBatch] Value of field `%s` in `outputVariables` is not a string. Skipping!",
|
||||||
|
key.c_str());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string valueString = value;
|
std::string valueString = value;
|
||||||
if (!requestResult.ResponseData.contains(valueString)) {
|
if (!requestResult.ResponseData.contains(valueString)) {
|
||||||
blog_debug("[WebSocketServer::ProcessRequestBatch] `outputVariables` requested responseData field `%s`, but it does not exist. Skipping!", valueString.c_str());
|
blog_debug(
|
||||||
|
"[WebSocketServer::ProcessRequestBatch] `outputVariables` requested responseData field `%s`, but it does not exist. Skipping!",
|
||||||
|
valueString.c_str());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,7 +115,7 @@ static void ObsTickCallback(void *param, float)
|
|||||||
{
|
{
|
||||||
ScopeProfiler prof{"obs_websocket_request_batch_frame_tick"};
|
ScopeProfiler prof{"obs_websocket_request_batch_frame_tick"};
|
||||||
|
|
||||||
auto serialFrameBatch = reinterpret_cast<SerialFrameBatch*>(param);
|
auto serialFrameBatch = static_cast<SerialFrameBatch *>(param);
|
||||||
|
|
||||||
// Increment frame count
|
// Increment frame count
|
||||||
serialFrameBatch->frameCount++;
|
serialFrameBatch->frameCount++;
|
||||||
@ -156,7 +162,10 @@ static void ObsTickCallback(void *param, float)
|
|||||||
serialFrameBatch->condition.notify_one();
|
serialFrameBatch->condition.notify_one();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<RequestResult> RequestBatchHandler::ProcessRequestBatch(QThreadPool &threadPool, SessionPtr session, RequestBatchExecutionType::RequestBatchExecutionType executionType, std::vector<RequestBatchRequest> &requests, json &variables, bool haltOnFailure)
|
std::vector<RequestResult>
|
||||||
|
RequestBatchHandler::ProcessRequestBatch(QThreadPool &threadPool, SessionPtr session,
|
||||||
|
RequestBatchExecutionType::RequestBatchExecutionType executionType,
|
||||||
|
std::vector<RequestBatchRequest> &requests, json &variables, bool haltOnFailure)
|
||||||
{
|
{
|
||||||
RequestHandler requestHandler(session);
|
RequestHandler requestHandler(session);
|
||||||
if (executionType == RequestBatchExecutionType::SerialRealtime) {
|
if (executionType == RequestBatchExecutionType::SerialRealtime) {
|
||||||
@ -215,7 +224,9 @@ std::vector<RequestResult> RequestBatchHandler::ProcessRequestBatch(QThreadPool
|
|||||||
|
|
||||||
// Wait for the last request to finish processing
|
// Wait for the last request to finish processing
|
||||||
size_t requestCount = requests.size();
|
size_t requestCount = requests.size();
|
||||||
parallelResults.condition.wait(lock, [¶llelResults, requestCount]{return parallelResults.results.size() == requestCount;});
|
parallelResults.condition.wait(lock, [¶llelResults, requestCount] {
|
||||||
|
return parallelResults.results.size() == requestCount;
|
||||||
|
});
|
||||||
|
|
||||||
return parallelResults.results;
|
return parallelResults.results;
|
||||||
}
|
}
|
||||||
|
@ -24,5 +24,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#include "rpc/RequestBatchRequest.h"
|
#include "rpc/RequestBatchRequest.h"
|
||||||
|
|
||||||
namespace RequestBatchHandler {
|
namespace RequestBatchHandler {
|
||||||
std::vector<RequestResult> ProcessRequestBatch(QThreadPool &threadPool, SessionPtr session, RequestBatchExecutionType::RequestBatchExecutionType executionType, std::vector<RequestBatchRequest> &requests, json &variables, bool haltOnFailure);
|
std::vector<RequestResult> ProcessRequestBatch(QThreadPool &threadPool, SessionPtr session,
|
||||||
|
RequestBatchExecutionType::RequestBatchExecutionType executionType,
|
||||||
|
std::vector<RequestBatchRequest> &requests, json &variables,
|
||||||
|
bool haltOnFailure);
|
||||||
}
|
}
|
||||||
|
@ -17,10 +17,13 @@ You should have received a copy of the GNU General Public License along
|
|||||||
with this program. If not, see <https://www.gnu.org/licenses/>
|
with this program. If not, see <https://www.gnu.org/licenses/>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef PLUGIN_TESTS
|
||||||
|
#include <util/profiler.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "RequestHandler.h"
|
#include "RequestHandler.h"
|
||||||
|
|
||||||
const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
const std::unordered_map<std::string, RequestMethodHandler> RequestHandler::_handlerMap{
|
||||||
{
|
|
||||||
// General
|
// General
|
||||||
{"GetVersion", &RequestHandler::GetVersion},
|
{"GetVersion", &RequestHandler::GetVersion},
|
||||||
{"GetStats", &RequestHandler::GetStats},
|
{"GetStats", &RequestHandler::GetStats},
|
||||||
@ -47,14 +50,18 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
|||||||
{"SetVideoSettings", &RequestHandler::SetVideoSettings},
|
{"SetVideoSettings", &RequestHandler::SetVideoSettings},
|
||||||
{"GetStreamServiceSettings", &RequestHandler::GetStreamServiceSettings},
|
{"GetStreamServiceSettings", &RequestHandler::GetStreamServiceSettings},
|
||||||
{"SetStreamServiceSettings", &RequestHandler::SetStreamServiceSettings},
|
{"SetStreamServiceSettings", &RequestHandler::SetStreamServiceSettings},
|
||||||
|
{"GetRecordDirectory", &RequestHandler::GetRecordDirectory},
|
||||||
|
|
||||||
// Sources
|
// Sources
|
||||||
{"GetSourceActive", &RequestHandler::GetSourceActive},
|
{"GetSourceActive", &RequestHandler::GetSourceActive},
|
||||||
{"GetSourceScreenshot", &RequestHandler::GetSourceScreenshot},
|
{"GetSourceScreenshot", &RequestHandler::GetSourceScreenshot},
|
||||||
{"SaveSourceScreenshot", &RequestHandler::SaveSourceScreenshot},
|
{"SaveSourceScreenshot", &RequestHandler::SaveSourceScreenshot},
|
||||||
|
{"GetSourcePrivateSettings", &RequestHandler::GetSourcePrivateSettings},
|
||||||
|
{"SetSourcePrivateSettings", &RequestHandler::SetSourcePrivateSettings},
|
||||||
|
|
||||||
// Scenes
|
// Scenes
|
||||||
{"GetSceneList", &RequestHandler::GetSceneList},
|
{"GetSceneList", &RequestHandler::GetSceneList},
|
||||||
|
{"GetGroupList", &RequestHandler::GetGroupList},
|
||||||
{"GetCurrentProgramScene", &RequestHandler::GetCurrentProgramScene},
|
{"GetCurrentProgramScene", &RequestHandler::GetCurrentProgramScene},
|
||||||
{"SetCurrentProgramScene", &RequestHandler::SetCurrentProgramScene},
|
{"SetCurrentProgramScene", &RequestHandler::SetCurrentProgramScene},
|
||||||
{"GetCurrentPreviewScene", &RequestHandler::GetCurrentPreviewScene},
|
{"GetCurrentPreviewScene", &RequestHandler::GetCurrentPreviewScene},
|
||||||
@ -62,12 +69,15 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
|||||||
{"CreateScene", &RequestHandler::CreateScene},
|
{"CreateScene", &RequestHandler::CreateScene},
|
||||||
{"RemoveScene", &RequestHandler::RemoveScene},
|
{"RemoveScene", &RequestHandler::RemoveScene},
|
||||||
{"SetSceneName", &RequestHandler::SetSceneName},
|
{"SetSceneName", &RequestHandler::SetSceneName},
|
||||||
|
{"GetSceneSceneTransitionOverride", &RequestHandler::GetSceneSceneTransitionOverride},
|
||||||
|
{"SetSceneSceneTransitionOverride", &RequestHandler::SetSceneSceneTransitionOverride},
|
||||||
|
|
||||||
// Inputs
|
// Inputs
|
||||||
{"GetInputList", &RequestHandler::GetInputList},
|
{"GetInputList", &RequestHandler::GetInputList},
|
||||||
{"GetInputKindList", &RequestHandler::GetInputKindList},
|
{"GetInputKindList", &RequestHandler::GetInputKindList},
|
||||||
|
{"GetSpecialInputs", &RequestHandler::GetSpecialInputs},
|
||||||
{"CreateInput", &RequestHandler::CreateInput},
|
{"CreateInput", &RequestHandler::CreateInput},
|
||||||
//{"RemoveInput", &RequestHandler::RemoveInput}, // Disabled for now. Pending obs-studio#5276
|
{"RemoveInput", &RequestHandler::RemoveInput},
|
||||||
{"SetInputName", &RequestHandler::SetInputName},
|
{"SetInputName", &RequestHandler::SetInputName},
|
||||||
{"GetInputDefaultSettings", &RequestHandler::GetInputDefaultSettings},
|
{"GetInputDefaultSettings", &RequestHandler::GetInputDefaultSettings},
|
||||||
{"GetInputSettings", &RequestHandler::GetInputSettings},
|
{"GetInputSettings", &RequestHandler::GetInputSettings},
|
||||||
@ -77,10 +87,14 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
|||||||
{"ToggleInputMute", &RequestHandler::ToggleInputMute},
|
{"ToggleInputMute", &RequestHandler::ToggleInputMute},
|
||||||
{"GetInputVolume", &RequestHandler::GetInputVolume},
|
{"GetInputVolume", &RequestHandler::GetInputVolume},
|
||||||
{"SetInputVolume", &RequestHandler::SetInputVolume},
|
{"SetInputVolume", &RequestHandler::SetInputVolume},
|
||||||
|
{"GetInputAudioBalance", &RequestHandler::GetInputAudioBalance},
|
||||||
|
{"SetInputAudioBalance", &RequestHandler::SetInputAudioBalance},
|
||||||
{"GetInputAudioSyncOffset", &RequestHandler::GetInputAudioSyncOffset},
|
{"GetInputAudioSyncOffset", &RequestHandler::GetInputAudioSyncOffset},
|
||||||
{"SetInputAudioSyncOffset", &RequestHandler::SetInputAudioSyncOffset},
|
{"SetInputAudioSyncOffset", &RequestHandler::SetInputAudioSyncOffset},
|
||||||
{"GetInputAudioMonitorType", &RequestHandler::GetInputAudioMonitorType},
|
{"GetInputAudioMonitorType", &RequestHandler::GetInputAudioMonitorType},
|
||||||
{"SetInputAudioMonitorType", &RequestHandler::SetInputAudioMonitorType},
|
{"SetInputAudioMonitorType", &RequestHandler::SetInputAudioMonitorType},
|
||||||
|
{"GetInputAudioTracks", &RequestHandler::GetInputAudioTracks},
|
||||||
|
{"SetInputAudioTracks", &RequestHandler::SetInputAudioTracks},
|
||||||
{"GetInputPropertiesListPropertyItems", &RequestHandler::GetInputPropertiesListPropertyItems},
|
{"GetInputPropertiesListPropertyItems", &RequestHandler::GetInputPropertiesListPropertyItems},
|
||||||
{"PressInputPropertiesButton", &RequestHandler::PressInputPropertiesButton},
|
{"PressInputPropertiesButton", &RequestHandler::PressInputPropertiesButton},
|
||||||
|
|
||||||
@ -91,7 +105,20 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
|||||||
{"SetCurrentSceneTransition", &RequestHandler::SetCurrentSceneTransition},
|
{"SetCurrentSceneTransition", &RequestHandler::SetCurrentSceneTransition},
|
||||||
{"SetCurrentSceneTransitionDuration", &RequestHandler::SetCurrentSceneTransitionDuration},
|
{"SetCurrentSceneTransitionDuration", &RequestHandler::SetCurrentSceneTransitionDuration},
|
||||||
{"SetCurrentSceneTransitionSettings", &RequestHandler::SetCurrentSceneTransitionSettings},
|
{"SetCurrentSceneTransitionSettings", &RequestHandler::SetCurrentSceneTransitionSettings},
|
||||||
|
{"GetCurrentSceneTransitionCursor", &RequestHandler::GetCurrentSceneTransitionCursor},
|
||||||
{"TriggerStudioModeTransition", &RequestHandler::TriggerStudioModeTransition},
|
{"TriggerStudioModeTransition", &RequestHandler::TriggerStudioModeTransition},
|
||||||
|
{"SetTBarPosition", &RequestHandler::SetTBarPosition},
|
||||||
|
|
||||||
|
// Filters
|
||||||
|
{"GetSourceFilterList", &RequestHandler::GetSourceFilterList},
|
||||||
|
{"GetSourceFilterDefaultSettings", &RequestHandler::GetSourceFilterDefaultSettings},
|
||||||
|
{"CreateSourceFilter", &RequestHandler::CreateSourceFilter},
|
||||||
|
{"RemoveSourceFilter", &RequestHandler::RemoveSourceFilter},
|
||||||
|
{"SetSourceFilterName", &RequestHandler::SetSourceFilterName},
|
||||||
|
{"GetSourceFilter", &RequestHandler::GetSourceFilter},
|
||||||
|
{"SetSourceFilterIndex", &RequestHandler::SetSourceFilterIndex},
|
||||||
|
{"SetSourceFilterSettings", &RequestHandler::SetSourceFilterSettings},
|
||||||
|
{"SetSourceFilterEnabled", &RequestHandler::SetSourceFilterEnabled},
|
||||||
|
|
||||||
// Scene Items
|
// Scene Items
|
||||||
{"GetSceneItemList", &RequestHandler::GetSceneItemList},
|
{"GetSceneItemList", &RequestHandler::GetSceneItemList},
|
||||||
@ -108,12 +135,36 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
|||||||
{"SetSceneItemLocked", &RequestHandler::SetSceneItemLocked},
|
{"SetSceneItemLocked", &RequestHandler::SetSceneItemLocked},
|
||||||
{"GetSceneItemIndex", &RequestHandler::GetSceneItemIndex},
|
{"GetSceneItemIndex", &RequestHandler::GetSceneItemIndex},
|
||||||
{"SetSceneItemIndex", &RequestHandler::SetSceneItemIndex},
|
{"SetSceneItemIndex", &RequestHandler::SetSceneItemIndex},
|
||||||
|
{"GetSceneItemBlendMode", &RequestHandler::GetSceneItemBlendMode},
|
||||||
|
{"SetSceneItemBlendMode", &RequestHandler::SetSceneItemBlendMode},
|
||||||
|
{"GetSceneItemPrivateSettings", &RequestHandler::GetSceneItemPrivateSettings},
|
||||||
|
{"SetSceneItemPrivateSettings", &RequestHandler::SetSceneItemPrivateSettings},
|
||||||
|
|
||||||
|
// Outputs
|
||||||
|
{"GetVirtualCamStatus", &RequestHandler::GetVirtualCamStatus},
|
||||||
|
{"ToggleVirtualCam", &RequestHandler::ToggleVirtualCam},
|
||||||
|
{"StartVirtualCam", &RequestHandler::StartVirtualCam},
|
||||||
|
{"StopVirtualCam", &RequestHandler::StopVirtualCam},
|
||||||
|
{"GetReplayBufferStatus", &RequestHandler::GetReplayBufferStatus},
|
||||||
|
{"ToggleReplayBuffer", &RequestHandler::ToggleReplayBuffer},
|
||||||
|
{"StartReplayBuffer", &RequestHandler::StartReplayBuffer},
|
||||||
|
{"StopReplayBuffer", &RequestHandler::StopReplayBuffer},
|
||||||
|
{"SaveReplayBuffer", &RequestHandler::SaveReplayBuffer},
|
||||||
|
{"GetLastReplayBufferReplay", &RequestHandler::GetLastReplayBufferReplay},
|
||||||
|
{"GetOutputList", &RequestHandler::GetOutputList},
|
||||||
|
{"GetOutputStatus", &RequestHandler::GetOutputStatus},
|
||||||
|
{"ToggleOutput", &RequestHandler::ToggleOutput},
|
||||||
|
{"StartOutput", &RequestHandler::StartOutput},
|
||||||
|
{"StopOutput", &RequestHandler::StopOutput},
|
||||||
|
{"GetOutputSettings", &RequestHandler::GetOutputSettings},
|
||||||
|
{"SetOutputSettings", &RequestHandler::SetOutputSettings},
|
||||||
|
|
||||||
// Stream
|
// Stream
|
||||||
{"GetStreamStatus", &RequestHandler::GetStreamStatus},
|
{"GetStreamStatus", &RequestHandler::GetStreamStatus},
|
||||||
{"ToggleStream", &RequestHandler::ToggleStream},
|
{"ToggleStream", &RequestHandler::ToggleStream},
|
||||||
{"StartStream", &RequestHandler::StartStream},
|
{"StartStream", &RequestHandler::StartStream},
|
||||||
{"StopStream", &RequestHandler::StopStream},
|
{"StopStream", &RequestHandler::StopStream},
|
||||||
|
{"SendStreamCaption", &RequestHandler::SendStreamCaption},
|
||||||
|
|
||||||
// Record
|
// Record
|
||||||
{"GetRecordStatus", &RequestHandler::GetRecordStatus},
|
{"GetRecordStatus", &RequestHandler::GetRecordStatus},
|
||||||
@ -123,7 +174,6 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
|||||||
{"ToggleRecordPause", &RequestHandler::ToggleRecordPause},
|
{"ToggleRecordPause", &RequestHandler::ToggleRecordPause},
|
||||||
{"PauseRecord", &RequestHandler::PauseRecord},
|
{"PauseRecord", &RequestHandler::PauseRecord},
|
||||||
{"ResumeRecord", &RequestHandler::ResumeRecord},
|
{"ResumeRecord", &RequestHandler::ResumeRecord},
|
||||||
//{"GetRecordDirectory", &RequestHandler::GetRecordDirectory},
|
|
||||||
|
|
||||||
// Media Inputs
|
// Media Inputs
|
||||||
{"GetMediaInputStatus", &RequestHandler::GetMediaInputStatus},
|
{"GetMediaInputStatus", &RequestHandler::GetMediaInputStatus},
|
||||||
@ -134,25 +184,33 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
|
|||||||
// Ui
|
// Ui
|
||||||
{"GetStudioModeEnabled", &RequestHandler::GetStudioModeEnabled},
|
{"GetStudioModeEnabled", &RequestHandler::GetStudioModeEnabled},
|
||||||
{"SetStudioModeEnabled", &RequestHandler::SetStudioModeEnabled},
|
{"SetStudioModeEnabled", &RequestHandler::SetStudioModeEnabled},
|
||||||
|
{"OpenInputPropertiesDialog", &RequestHandler::OpenInputPropertiesDialog},
|
||||||
|
{"OpenInputFiltersDialog", &RequestHandler::OpenInputFiltersDialog},
|
||||||
|
{"OpenInputInteractDialog", &RequestHandler::OpenInputInteractDialog},
|
||||||
|
{"GetMonitorList", &RequestHandler::GetMonitorList},
|
||||||
|
{"OpenVideoMixProjector", &RequestHandler::OpenVideoMixProjector},
|
||||||
|
{"OpenSourceProjector", &RequestHandler::OpenSourceProjector},
|
||||||
};
|
};
|
||||||
|
|
||||||
RequestHandler::RequestHandler(SessionPtr session) :
|
RequestHandler::RequestHandler(SessionPtr session) : _session(session) {}
|
||||||
_session(session)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
RequestResult RequestHandler::ProcessRequest(const Request &request)
|
RequestResult RequestHandler::ProcessRequest(const Request &request)
|
||||||
{
|
{
|
||||||
|
#ifdef PLUGIN_TESTS
|
||||||
|
ScopeProfiler prof{"obs_websocket_request_processing"};
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!request.RequestData.is_object() && !request.RequestData.is_null())
|
if (!request.RequestData.is_object() && !request.RequestData.is_null())
|
||||||
return RequestResult::Error(RequestStatus::InvalidRequestFieldType, "Your request data is not an object.");
|
return RequestResult::Error(RequestStatus::InvalidRequestFieldType, "Your request data is not an object.");
|
||||||
|
|
||||||
if (request.RequestType.empty())
|
if (request.RequestType.empty())
|
||||||
return RequestResult::Error(RequestStatus::MissingRequestType, "Your request is missing a `requestType`");
|
return RequestResult::Error(RequestStatus::MissingRequestType, "Your request's `requestType` may not be empty.");
|
||||||
|
|
||||||
RequestMethodHandler handler;
|
RequestMethodHandler handler;
|
||||||
try {
|
try {
|
||||||
handler = _handlerMap.at(request.RequestType);
|
handler = _handlerMap.at(request.RequestType);
|
||||||
} catch (const std::out_of_range &oor) {
|
} catch (const std::out_of_range &oor) {
|
||||||
|
UNUSED_PARAMETER(oor);
|
||||||
return RequestResult::Error(RequestStatus::UnknownRequestType, "Your request type is not valid.");
|
return RequestResult::Error(RequestStatus::UnknownRequestType, "Your request type is not valid.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <map>
|
#include <unordered_map>
|
||||||
#include <obs.hpp>
|
#include <obs.hpp>
|
||||||
#include <obs-frontend-api.h>
|
#include <obs-frontend-api.h>
|
||||||
|
|
||||||
@ -37,7 +37,7 @@ typedef RequestResult(RequestHandler::*RequestMethodHandler)(const Request&);
|
|||||||
|
|
||||||
class RequestHandler {
|
class RequestHandler {
|
||||||
public:
|
public:
|
||||||
RequestHandler(SessionPtr session);
|
RequestHandler(SessionPtr session = nullptr);
|
||||||
|
|
||||||
RequestResult ProcessRequest(const Request &request);
|
RequestResult ProcessRequest(const Request &request);
|
||||||
std::vector<std::string> GetRequestList();
|
std::vector<std::string> GetRequestList();
|
||||||
@ -69,14 +69,18 @@ class RequestHandler {
|
|||||||
RequestResult SetVideoSettings(const Request &);
|
RequestResult SetVideoSettings(const Request &);
|
||||||
RequestResult GetStreamServiceSettings(const Request &);
|
RequestResult GetStreamServiceSettings(const Request &);
|
||||||
RequestResult SetStreamServiceSettings(const Request &);
|
RequestResult SetStreamServiceSettings(const Request &);
|
||||||
|
RequestResult GetRecordDirectory(const Request &);
|
||||||
|
|
||||||
// Sources
|
// Sources
|
||||||
RequestResult GetSourceActive(const Request &);
|
RequestResult GetSourceActive(const Request &);
|
||||||
RequestResult GetSourceScreenshot(const Request &);
|
RequestResult GetSourceScreenshot(const Request &);
|
||||||
RequestResult SaveSourceScreenshot(const Request &);
|
RequestResult SaveSourceScreenshot(const Request &);
|
||||||
|
RequestResult GetSourcePrivateSettings(const Request &);
|
||||||
|
RequestResult SetSourcePrivateSettings(const Request &);
|
||||||
|
|
||||||
// Scenes
|
// Scenes
|
||||||
RequestResult GetSceneList(const Request &);
|
RequestResult GetSceneList(const Request &);
|
||||||
|
RequestResult GetGroupList(const Request &);
|
||||||
RequestResult GetCurrentProgramScene(const Request &);
|
RequestResult GetCurrentProgramScene(const Request &);
|
||||||
RequestResult SetCurrentProgramScene(const Request &);
|
RequestResult SetCurrentProgramScene(const Request &);
|
||||||
RequestResult GetCurrentPreviewScene(const Request &);
|
RequestResult GetCurrentPreviewScene(const Request &);
|
||||||
@ -84,10 +88,13 @@ class RequestHandler {
|
|||||||
RequestResult CreateScene(const Request &);
|
RequestResult CreateScene(const Request &);
|
||||||
RequestResult RemoveScene(const Request &);
|
RequestResult RemoveScene(const Request &);
|
||||||
RequestResult SetSceneName(const Request &);
|
RequestResult SetSceneName(const Request &);
|
||||||
|
RequestResult GetSceneSceneTransitionOverride(const Request &);
|
||||||
|
RequestResult SetSceneSceneTransitionOverride(const Request &);
|
||||||
|
|
||||||
// Inputs
|
// Inputs
|
||||||
RequestResult GetInputList(const Request &);
|
RequestResult GetInputList(const Request &);
|
||||||
RequestResult GetInputKindList(const Request &);
|
RequestResult GetInputKindList(const Request &);
|
||||||
|
RequestResult GetSpecialInputs(const Request &);
|
||||||
RequestResult CreateInput(const Request &);
|
RequestResult CreateInput(const Request &);
|
||||||
RequestResult RemoveInput(const Request &);
|
RequestResult RemoveInput(const Request &);
|
||||||
RequestResult SetInputName(const Request &);
|
RequestResult SetInputName(const Request &);
|
||||||
@ -99,10 +106,14 @@ class RequestHandler {
|
|||||||
RequestResult ToggleInputMute(const Request &);
|
RequestResult ToggleInputMute(const Request &);
|
||||||
RequestResult GetInputVolume(const Request &);
|
RequestResult GetInputVolume(const Request &);
|
||||||
RequestResult SetInputVolume(const Request &);
|
RequestResult SetInputVolume(const Request &);
|
||||||
|
RequestResult GetInputAudioBalance(const Request &);
|
||||||
|
RequestResult SetInputAudioBalance(const Request &);
|
||||||
RequestResult GetInputAudioSyncOffset(const Request &);
|
RequestResult GetInputAudioSyncOffset(const Request &);
|
||||||
RequestResult SetInputAudioSyncOffset(const Request &);
|
RequestResult SetInputAudioSyncOffset(const Request &);
|
||||||
RequestResult GetInputAudioMonitorType(const Request &);
|
RequestResult GetInputAudioMonitorType(const Request &);
|
||||||
RequestResult SetInputAudioMonitorType(const Request &);
|
RequestResult SetInputAudioMonitorType(const Request &);
|
||||||
|
RequestResult GetInputAudioTracks(const Request &);
|
||||||
|
RequestResult SetInputAudioTracks(const Request &);
|
||||||
RequestResult GetInputPropertiesListPropertyItems(const Request &);
|
RequestResult GetInputPropertiesListPropertyItems(const Request &);
|
||||||
RequestResult PressInputPropertiesButton(const Request &);
|
RequestResult PressInputPropertiesButton(const Request &);
|
||||||
|
|
||||||
@ -113,7 +124,20 @@ class RequestHandler {
|
|||||||
RequestResult SetCurrentSceneTransition(const Request &);
|
RequestResult SetCurrentSceneTransition(const Request &);
|
||||||
RequestResult SetCurrentSceneTransitionDuration(const Request &);
|
RequestResult SetCurrentSceneTransitionDuration(const Request &);
|
||||||
RequestResult SetCurrentSceneTransitionSettings(const Request &);
|
RequestResult SetCurrentSceneTransitionSettings(const Request &);
|
||||||
|
RequestResult GetCurrentSceneTransitionCursor(const Request &);
|
||||||
RequestResult TriggerStudioModeTransition(const Request &);
|
RequestResult TriggerStudioModeTransition(const Request &);
|
||||||
|
RequestResult SetTBarPosition(const Request &);
|
||||||
|
|
||||||
|
// Filters
|
||||||
|
RequestResult GetSourceFilterList(const Request &);
|
||||||
|
RequestResult GetSourceFilterDefaultSettings(const Request &);
|
||||||
|
RequestResult CreateSourceFilter(const Request &);
|
||||||
|
RequestResult RemoveSourceFilter(const Request &);
|
||||||
|
RequestResult SetSourceFilterName(const Request &);
|
||||||
|
RequestResult GetSourceFilter(const Request &);
|
||||||
|
RequestResult SetSourceFilterIndex(const Request &);
|
||||||
|
RequestResult SetSourceFilterSettings(const Request &);
|
||||||
|
RequestResult SetSourceFilterEnabled(const Request &);
|
||||||
|
|
||||||
// Scene Items
|
// Scene Items
|
||||||
RequestResult GetSceneItemList(const Request &);
|
RequestResult GetSceneItemList(const Request &);
|
||||||
@ -130,12 +154,36 @@ class RequestHandler {
|
|||||||
RequestResult SetSceneItemLocked(const Request &);
|
RequestResult SetSceneItemLocked(const Request &);
|
||||||
RequestResult GetSceneItemIndex(const Request &);
|
RequestResult GetSceneItemIndex(const Request &);
|
||||||
RequestResult SetSceneItemIndex(const Request &);
|
RequestResult SetSceneItemIndex(const Request &);
|
||||||
|
RequestResult GetSceneItemBlendMode(const Request &);
|
||||||
|
RequestResult SetSceneItemBlendMode(const Request &);
|
||||||
|
RequestResult GetSceneItemPrivateSettings(const Request &);
|
||||||
|
RequestResult SetSceneItemPrivateSettings(const Request &);
|
||||||
|
|
||||||
|
// Outputs
|
||||||
|
RequestResult GetVirtualCamStatus(const Request &);
|
||||||
|
RequestResult ToggleVirtualCam(const Request &);
|
||||||
|
RequestResult StartVirtualCam(const Request &);
|
||||||
|
RequestResult StopVirtualCam(const Request &);
|
||||||
|
RequestResult GetReplayBufferStatus(const Request &);
|
||||||
|
RequestResult ToggleReplayBuffer(const Request &);
|
||||||
|
RequestResult StartReplayBuffer(const Request &);
|
||||||
|
RequestResult StopReplayBuffer(const Request &);
|
||||||
|
RequestResult SaveReplayBuffer(const Request &);
|
||||||
|
RequestResult GetLastReplayBufferReplay(const Request &);
|
||||||
|
RequestResult GetOutputList(const Request &);
|
||||||
|
RequestResult GetOutputStatus(const Request &);
|
||||||
|
RequestResult ToggleOutput(const Request &);
|
||||||
|
RequestResult StartOutput(const Request &);
|
||||||
|
RequestResult StopOutput(const Request &);
|
||||||
|
RequestResult GetOutputSettings(const Request &);
|
||||||
|
RequestResult SetOutputSettings(const Request &);
|
||||||
|
|
||||||
// Stream
|
// Stream
|
||||||
RequestResult GetStreamStatus(const Request &);
|
RequestResult GetStreamStatus(const Request &);
|
||||||
RequestResult ToggleStream(const Request &);
|
RequestResult ToggleStream(const Request &);
|
||||||
RequestResult StartStream(const Request &);
|
RequestResult StartStream(const Request &);
|
||||||
RequestResult StopStream(const Request &);
|
RequestResult StopStream(const Request &);
|
||||||
|
RequestResult SendStreamCaption(const Request &);
|
||||||
|
|
||||||
// Record
|
// Record
|
||||||
RequestResult GetRecordStatus(const Request &);
|
RequestResult GetRecordStatus(const Request &);
|
||||||
@ -145,7 +193,6 @@ class RequestHandler {
|
|||||||
RequestResult ToggleRecordPause(const Request &);
|
RequestResult ToggleRecordPause(const Request &);
|
||||||
RequestResult PauseRecord(const Request &);
|
RequestResult PauseRecord(const Request &);
|
||||||
RequestResult ResumeRecord(const Request &);
|
RequestResult ResumeRecord(const Request &);
|
||||||
RequestResult GetRecordDirectory(const Request&);
|
|
||||||
|
|
||||||
// Media Inputs
|
// Media Inputs
|
||||||
RequestResult GetMediaInputStatus(const Request &);
|
RequestResult GetMediaInputStatus(const Request &);
|
||||||
@ -156,7 +203,13 @@ class RequestHandler {
|
|||||||
// Ui
|
// Ui
|
||||||
RequestResult GetStudioModeEnabled(const Request &);
|
RequestResult GetStudioModeEnabled(const Request &);
|
||||||
RequestResult SetStudioModeEnabled(const Request &);
|
RequestResult SetStudioModeEnabled(const Request &);
|
||||||
|
RequestResult OpenInputPropertiesDialog(const Request &);
|
||||||
|
RequestResult OpenInputFiltersDialog(const Request &);
|
||||||
|
RequestResult OpenInputInteractDialog(const Request &);
|
||||||
|
RequestResult GetMonitorList(const Request &);
|
||||||
|
RequestResult OpenVideoMixProjector(const Request &);
|
||||||
|
RequestResult OpenSourceProjector(const Request &);
|
||||||
|
|
||||||
SessionPtr _session;
|
SessionPtr _session;
|
||||||
static const std::map<std::string, RequestMethodHandler> _handlerMap;
|
static const std::unordered_map<std::string, RequestMethodHandler> _handlerMap;
|
||||||
};
|
};
|
||||||
|
@ -53,7 +53,8 @@ RequestResult RequestHandler::GetPersistentData(const Request& request)
|
|||||||
else if (realm == "OBS_WEBSOCKET_DATA_REALM_PROFILE")
|
else if (realm == "OBS_WEBSOCKET_DATA_REALM_PROFILE")
|
||||||
persistentDataPath += "/obsWebSocketPersistentData.json";
|
persistentDataPath += "/obsWebSocketPersistentData.json";
|
||||||
else
|
else
|
||||||
return RequestResult::Error(RequestStatus::ResourceNotFound, "You have specified an invalid persistent data realm.");
|
return RequestResult::Error(RequestStatus::ResourceNotFound,
|
||||||
|
"You have specified an invalid persistent data realm.");
|
||||||
|
|
||||||
json responseData;
|
json responseData;
|
||||||
json persistentData;
|
json persistentData;
|
||||||
@ -83,7 +84,8 @@ RequestResult RequestHandler::SetPersistentData(const Request& request)
|
|||||||
{
|
{
|
||||||
RequestStatus::RequestStatus statusCode;
|
RequestStatus::RequestStatus statusCode;
|
||||||
std::string comment;
|
std::string comment;
|
||||||
if (!(request.ValidateString("realm", statusCode, comment) && request.ValidateString("slotName", statusCode, comment) && request.ValidateBasic("slotValue", statusCode, comment)))
|
if (!(request.ValidateString("realm", statusCode, comment) && request.ValidateString("slotName", statusCode, comment) &&
|
||||||
|
request.ValidateBasic("slotValue", statusCode, comment)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
std::string realm = request.RequestData["realm"];
|
std::string realm = request.RequestData["realm"];
|
||||||
@ -96,13 +98,15 @@ RequestResult RequestHandler::SetPersistentData(const Request& request)
|
|||||||
else if (realm == "OBS_WEBSOCKET_DATA_REALM_PROFILE")
|
else if (realm == "OBS_WEBSOCKET_DATA_REALM_PROFILE")
|
||||||
persistentDataPath += "/obsWebSocketPersistentData.json";
|
persistentDataPath += "/obsWebSocketPersistentData.json";
|
||||||
else
|
else
|
||||||
return RequestResult::Error(RequestStatus::ResourceNotFound, "You have specified an invalid persistent data realm.");
|
return RequestResult::Error(RequestStatus::ResourceNotFound,
|
||||||
|
"You have specified an invalid persistent data realm.");
|
||||||
|
|
||||||
json persistentData = json::object();
|
json persistentData = json::object();
|
||||||
Utils::Json::GetJsonFileContent(persistentDataPath, persistentData);
|
Utils::Json::GetJsonFileContent(persistentDataPath, persistentData);
|
||||||
persistentData[slotName] = slotValue;
|
persistentData[slotName] = slotValue;
|
||||||
if (!Utils::Json::SetJsonFileContent(persistentDataPath, persistentData))
|
if (!Utils::Json::SetJsonFileContent(persistentDataPath, persistentData))
|
||||||
return RequestResult::Error(RequestStatus::RequestProcessingFailed, "Unable to write persistent data. No permissions?");
|
return RequestResult::Error(RequestStatus::RequestProcessingFailed,
|
||||||
|
"Unable to write persistent data. No permissions?");
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
}
|
}
|
||||||
@ -158,9 +162,10 @@ RequestResult RequestHandler::SetCurrentSceneCollection(const Request& request)
|
|||||||
std::string currentSceneCollectionName = Utils::Obs::StringHelper::GetCurrentSceneCollection();
|
std::string currentSceneCollectionName = Utils::Obs::StringHelper::GetCurrentSceneCollection();
|
||||||
// Avoid queueing tasks if nothing will change
|
// Avoid queueing tasks if nothing will change
|
||||||
if (currentSceneCollectionName != sceneCollectionName) {
|
if (currentSceneCollectionName != sceneCollectionName) {
|
||||||
obs_queue_task(OBS_TASK_UI, [](void* param) {
|
obs_queue_task(
|
||||||
obs_frontend_set_current_scene_collection(reinterpret_cast<const char*>(param));
|
OBS_TASK_UI,
|
||||||
}, (void*)sceneCollectionName.c_str(), true);
|
[](void *param) { obs_frontend_set_current_scene_collection(static_cast<const char *>(param)); },
|
||||||
|
(void *)sceneCollectionName.c_str(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
@ -193,9 +198,10 @@ RequestResult RequestHandler::CreateSceneCollection(const Request& request)
|
|||||||
if (std::find(sceneCollections.begin(), sceneCollections.end(), sceneCollectionName) != sceneCollections.end())
|
if (std::find(sceneCollections.begin(), sceneCollections.end(), sceneCollectionName) != sceneCollections.end())
|
||||||
return RequestResult::Error(RequestStatus::ResourceAlreadyExists);
|
return RequestResult::Error(RequestStatus::ResourceAlreadyExists);
|
||||||
|
|
||||||
QMainWindow* mainWindow = reinterpret_cast<QMainWindow*>(obs_frontend_get_main_window());
|
QMainWindow *mainWindow = static_cast<QMainWindow *>(obs_frontend_get_main_window());
|
||||||
bool success = false;
|
bool success = false;
|
||||||
QMetaObject::invokeMethod(mainWindow, "AddSceneCollection", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, success), Q_ARG(bool, true), Q_ARG(QString, QString::fromStdString(sceneCollectionName)));
|
QMetaObject::invokeMethod(mainWindow, "AddSceneCollection", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, success),
|
||||||
|
Q_ARG(bool, true), Q_ARG(QString, QString::fromStdString(sceneCollectionName)));
|
||||||
if (!success)
|
if (!success)
|
||||||
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Failed to create the scene collection.");
|
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Failed to create the scene collection.");
|
||||||
|
|
||||||
@ -251,9 +257,9 @@ RequestResult RequestHandler::SetCurrentProfile(const Request& request)
|
|||||||
std::string currentProfileName = Utils::Obs::StringHelper::GetCurrentProfile();
|
std::string currentProfileName = Utils::Obs::StringHelper::GetCurrentProfile();
|
||||||
// Avoid queueing tasks if nothing will change
|
// Avoid queueing tasks if nothing will change
|
||||||
if (currentProfileName != profileName) {
|
if (currentProfileName != profileName) {
|
||||||
obs_queue_task(OBS_TASK_UI, [](void* param) {
|
obs_queue_task(
|
||||||
obs_frontend_set_current_profile(reinterpret_cast<const char*>(param));
|
OBS_TASK_UI, [](void *param) { obs_frontend_set_current_profile(static_cast<const char *>(param)); },
|
||||||
}, (void*)profileName.c_str(), true);
|
(void *)profileName.c_str(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
@ -284,8 +290,9 @@ RequestResult RequestHandler::CreateProfile(const Request& request)
|
|||||||
if (std::find(profiles.begin(), profiles.end(), profileName) != profiles.end())
|
if (std::find(profiles.begin(), profiles.end(), profileName) != profiles.end())
|
||||||
return RequestResult::Error(RequestStatus::ResourceAlreadyExists);
|
return RequestResult::Error(RequestStatus::ResourceAlreadyExists);
|
||||||
|
|
||||||
QMainWindow* mainWindow = reinterpret_cast<QMainWindow*>(obs_frontend_get_main_window());
|
QMainWindow *mainWindow = static_cast<QMainWindow *>(obs_frontend_get_main_window());
|
||||||
QMetaObject::invokeMethod(mainWindow, "NewProfile", Qt::BlockingQueuedConnection, Q_ARG(QString, QString::fromStdString(profileName)));
|
QMetaObject::invokeMethod(mainWindow, "NewProfile", Qt::BlockingQueuedConnection,
|
||||||
|
Q_ARG(QString, QString::fromStdString(profileName)));
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
}
|
}
|
||||||
@ -318,8 +325,9 @@ RequestResult RequestHandler::RemoveProfile(const Request& request)
|
|||||||
if (profiles.size() < 2)
|
if (profiles.size() < 2)
|
||||||
return RequestResult::Error(RequestStatus::NotEnoughResources);
|
return RequestResult::Error(RequestStatus::NotEnoughResources);
|
||||||
|
|
||||||
QMainWindow* mainWindow = reinterpret_cast<QMainWindow*>(obs_frontend_get_main_window());
|
QMainWindow *mainWindow = static_cast<QMainWindow *>(obs_frontend_get_main_window());
|
||||||
QMetaObject::invokeMethod(mainWindow, "DeleteProfile", Qt::BlockingQueuedConnection, Q_ARG(QString, QString::fromStdString(profileName)));
|
QMetaObject::invokeMethod(mainWindow, "DeleteProfile", Qt::BlockingQueuedConnection,
|
||||||
|
Q_ARG(QString, QString::fromStdString(profileName)));
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
}
|
}
|
||||||
@ -344,7 +352,8 @@ RequestResult RequestHandler::GetProfileParameter(const Request& request)
|
|||||||
{
|
{
|
||||||
RequestStatus::RequestStatus statusCode;
|
RequestStatus::RequestStatus statusCode;
|
||||||
std::string comment;
|
std::string comment;
|
||||||
if (!(request.ValidateString("parameterCategory", statusCode, comment) && request.ValidateString("parameterName", statusCode, comment)))
|
if (!(request.ValidateString("parameterCategory", statusCode, comment) &&
|
||||||
|
request.ValidateString("parameterName", statusCode, comment)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
std::string parameterCategory = request.RequestData["parameterCategory"];
|
std::string parameterCategory = request.RequestData["parameterCategory"];
|
||||||
@ -358,7 +367,8 @@ RequestResult RequestHandler::GetProfileParameter(const Request& request)
|
|||||||
json responseData;
|
json responseData;
|
||||||
if (config_has_default_value(profile, parameterCategory.c_str(), parameterName.c_str())) {
|
if (config_has_default_value(profile, parameterCategory.c_str(), parameterName.c_str())) {
|
||||||
responseData["parameterValue"] = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str());
|
responseData["parameterValue"] = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str());
|
||||||
responseData["defaultParameterValue"] = config_get_default_string(profile, parameterCategory.c_str(), parameterName.c_str());
|
responseData["defaultParameterValue"] =
|
||||||
|
config_get_default_string(profile, parameterCategory.c_str(), parameterName.c_str());
|
||||||
} else if (config_has_user_value(profile, parameterCategory.c_str(), parameterName.c_str())) {
|
} else if (config_has_user_value(profile, parameterCategory.c_str(), parameterName.c_str())) {
|
||||||
responseData["parameterValue"] = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str());
|
responseData["parameterValue"] = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str());
|
||||||
responseData["defaultParameterValue"] = nullptr;
|
responseData["defaultParameterValue"] = nullptr;
|
||||||
@ -400,7 +410,8 @@ RequestResult RequestHandler::SetProfileParameter(const Request& request)
|
|||||||
// Using check helpers here would just make the logic more complicated
|
// Using check helpers here would just make the logic more complicated
|
||||||
if (!request.RequestData.contains("parameterValue") || request.RequestData["parameterValue"].is_null()) {
|
if (!request.RequestData.contains("parameterValue") || request.RequestData["parameterValue"].is_null()) {
|
||||||
if (!config_remove_value(profile, parameterCategory.c_str(), parameterName.c_str()))
|
if (!config_remove_value(profile, parameterCategory.c_str(), parameterName.c_str()))
|
||||||
return RequestResult::Error(RequestStatus::ResourceNotFound, "There are no existing instances of that profile parameter.");
|
return RequestResult::Error(RequestStatus::ResourceNotFound,
|
||||||
|
"There are no existing instances of that profile parameter.");
|
||||||
} else if (request.RequestData["parameterValue"].is_string()) {
|
} else if (request.RequestData["parameterValue"].is_string()) {
|
||||||
std::string parameterValue = request.RequestData["parameterValue"];
|
std::string parameterValue = request.RequestData["parameterValue"];
|
||||||
config_set_string(profile, parameterCategory.c_str(), parameterName.c_str(), parameterValue.c_str());
|
config_set_string(profile, parameterCategory.c_str(), parameterName.c_str(), parameterValue.c_str());
|
||||||
@ -408,6 +419,8 @@ RequestResult RequestHandler::SetProfileParameter(const Request& request)
|
|||||||
return RequestResult::Error(RequestStatus::InvalidRequestFieldType, "The field `parameterValue` must be a string.");
|
return RequestResult::Error(RequestStatus::InvalidRequestFieldType, "The field `parameterValue` must be a string.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
config_save(profile);
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -469,20 +482,24 @@ RequestResult RequestHandler::GetVideoSettings(const Request&)
|
|||||||
RequestResult RequestHandler::SetVideoSettings(const Request &request)
|
RequestResult RequestHandler::SetVideoSettings(const Request &request)
|
||||||
{
|
{
|
||||||
if (obs_video_active())
|
if (obs_video_active())
|
||||||
return RequestResult::Error(RequestStatus::OutputRunning, "Video settings cannot be changed while an output is active.");
|
return RequestResult::Error(RequestStatus::OutputRunning,
|
||||||
|
"Video settings cannot be changed while an output is active.");
|
||||||
|
|
||||||
RequestStatus::RequestStatus statusCode = RequestStatus::NoError;
|
RequestStatus::RequestStatus statusCode = RequestStatus::NoError;
|
||||||
std::string comment;
|
std::string comment;
|
||||||
bool changeFps = (request.Contains("fpsNumerator") && request.Contains("fpsDenominator"));
|
bool changeFps = (request.Contains("fpsNumerator") && request.Contains("fpsDenominator"));
|
||||||
if (changeFps && !(request.ValidateOptionalNumber("fpsNumerator", statusCode, comment, 1) && request.ValidateOptionalNumber("fpsDenominator", statusCode, comment, 1)))
|
if (changeFps && !(request.ValidateOptionalNumber("fpsNumerator", statusCode, comment, 1) &&
|
||||||
|
request.ValidateOptionalNumber("fpsDenominator", statusCode, comment, 1)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
bool changeBaseRes = (request.Contains("baseWidth") && request.Contains("baseHeight"));
|
bool changeBaseRes = (request.Contains("baseWidth") && request.Contains("baseHeight"));
|
||||||
if (changeBaseRes && !(request.ValidateOptionalNumber("baseWidth", statusCode, comment, 8, 4096) && request.ValidateOptionalNumber("baseHeight", statusCode, comment, 8, 4096)))
|
if (changeBaseRes && !(request.ValidateOptionalNumber("baseWidth", statusCode, comment, 8, 4096) &&
|
||||||
|
request.ValidateOptionalNumber("baseHeight", statusCode, comment, 8, 4096)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
bool changeOutputRes = (request.Contains("outputWidth") && request.Contains("outputHeight"));
|
bool changeOutputRes = (request.Contains("outputWidth") && request.Contains("outputHeight"));
|
||||||
if (changeOutputRes && !(request.ValidateOptionalNumber("outputWidth", statusCode, comment, 8, 4096) && request.ValidateOptionalNumber("outputHeight", statusCode, comment, 8, 4096)))
|
if (changeOutputRes && !(request.ValidateOptionalNumber("outputWidth", statusCode, comment, 8, 4096) &&
|
||||||
|
request.ValidateOptionalNumber("outputHeight", statusCode, comment, 8, 4096)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
config_t *config = obs_frontend_get_profile_config();
|
config_t *config = obs_frontend_get_profile_config();
|
||||||
@ -555,18 +572,21 @@ RequestResult RequestHandler::GetStreamServiceSettings(const Request&)
|
|||||||
RequestResult RequestHandler::SetStreamServiceSettings(const Request &request)
|
RequestResult RequestHandler::SetStreamServiceSettings(const Request &request)
|
||||||
{
|
{
|
||||||
if (obs_frontend_streaming_active())
|
if (obs_frontend_streaming_active())
|
||||||
return RequestResult::Error(RequestStatus::OutputRunning, "You cannot change stream service settings while streaming.");
|
return RequestResult::Error(RequestStatus::OutputRunning,
|
||||||
|
"You cannot change stream service settings while streaming.");
|
||||||
|
|
||||||
RequestStatus::RequestStatus statusCode;
|
RequestStatus::RequestStatus statusCode;
|
||||||
std::string comment;
|
std::string comment;
|
||||||
if (!(request.ValidateString("streamServiceType", statusCode, comment) && request.ValidateObject("streamServiceSettings", statusCode, comment)))
|
if (!(request.ValidateString("streamServiceType", statusCode, comment) &&
|
||||||
|
request.ValidateObject("streamServiceSettings", statusCode, comment)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
OBSService currentStreamService = obs_frontend_get_streaming_service();
|
OBSService currentStreamService = obs_frontend_get_streaming_service();
|
||||||
|
|
||||||
std::string streamServiceType = obs_service_get_type(currentStreamService);
|
std::string streamServiceType = obs_service_get_type(currentStreamService);
|
||||||
std::string requestedStreamServiceType = request.RequestData["streamServiceType"];
|
std::string requestedStreamServiceType = request.RequestData["streamServiceType"];
|
||||||
OBSDataAutoRelease requestedStreamServiceSettings = Utils::Json::JsonToObsData(request.RequestData["streamServiceSettings"]);
|
OBSDataAutoRelease requestedStreamServiceSettings =
|
||||||
|
Utils::Json::JsonToObsData(request.RequestData["streamServiceSettings"]);
|
||||||
|
|
||||||
// Don't create a new service if the current service is the same type.
|
// Don't create a new service if the current service is the same type.
|
||||||
if (streamServiceType == requestedStreamServiceType) {
|
if (streamServiceType == requestedStreamServiceType) {
|
||||||
@ -580,10 +600,13 @@ RequestResult RequestHandler::SetStreamServiceSettings(const Request& request)
|
|||||||
obs_service_update(currentStreamService, newStreamServiceSettings);
|
obs_service_update(currentStreamService, newStreamServiceSettings);
|
||||||
} else {
|
} else {
|
||||||
// TODO: This leaks memory. I have no idea why.
|
// TODO: This leaks memory. I have no idea why.
|
||||||
OBSService newStreamService = obs_service_create(requestedStreamServiceType.c_str(), "obs_websocket_custom_service", requestedStreamServiceSettings, nullptr);
|
OBSService newStreamService = obs_service_create(requestedStreamServiceType.c_str(), "obs_websocket_custom_service",
|
||||||
|
requestedStreamServiceSettings, nullptr);
|
||||||
// TODO: Check service type here, instead of relying on service creation to fail.
|
// TODO: Check service type here, instead of relying on service creation to fail.
|
||||||
if (!newStreamService)
|
if (!newStreamService)
|
||||||
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Failed to create the stream service with the requested streamServiceType. It may be an invalid type.");
|
return RequestResult::Error(
|
||||||
|
RequestStatus::ResourceCreationFailed,
|
||||||
|
"Failed to create the stream service with the requested streamServiceType. It may be an invalid type.");
|
||||||
|
|
||||||
obs_frontend_set_streaming_service(newStreamService);
|
obs_frontend_set_streaming_service(newStreamService);
|
||||||
}
|
}
|
||||||
@ -592,3 +615,23 @@ RequestResult RequestHandler::SetStreamServiceSettings(const Request& request)
|
|||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the current directory that the record output is set to.
|
||||||
|
*
|
||||||
|
* @responseField recordDirectory | String | Output directory
|
||||||
|
*
|
||||||
|
* @requestType GetRecordDirectory
|
||||||
|
* @complexity 1
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category config
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::GetRecordDirectory(const Request &)
|
||||||
|
{
|
||||||
|
json responseData;
|
||||||
|
responseData["recordDirectory"] = Utils::Obs::StringHelper::GetCurrentRecordOutputPath();
|
||||||
|
|
||||||
|
return RequestResult::Success(responseData);
|
||||||
|
}
|
||||||
|
@ -18,3 +18,323 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "RequestHandler.h"
|
#include "RequestHandler.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets an array of all of a source's filters.
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source
|
||||||
|
*
|
||||||
|
* @responseField filters | Array<Object> | Array of filters
|
||||||
|
*
|
||||||
|
* @requestType GetSourceFilterList
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::GetSourceFilterList(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
OBSSourceAutoRelease source = request.ValidateSource("sourceName", statusCode, comment);
|
||||||
|
if (!source)
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
json responseData;
|
||||||
|
responseData["filters"] = Utils::Obs::ArrayHelper::GetSourceFilterList(source);
|
||||||
|
|
||||||
|
return RequestResult::Success(responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the default settings for a filter kind.
|
||||||
|
*
|
||||||
|
* @requestField filterKind | String | Filter kind to get the default settings for
|
||||||
|
*
|
||||||
|
* @responseField defaultFilterSettings | Object | Object of default settings for the filter kind
|
||||||
|
*
|
||||||
|
* @requestType GetSourceFilterDefaultSettings
|
||||||
|
* @complexity 3
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::GetSourceFilterDefaultSettings(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
if (!request.ValidateString("filterKind", statusCode, comment))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
std::string filterKind = request.RequestData["filterKind"];
|
||||||
|
auto kinds = Utils::Obs::ArrayHelper::GetFilterKindList();
|
||||||
|
if (std::find(kinds.begin(), kinds.end(), filterKind) == kinds.end())
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidFilterKind);
|
||||||
|
|
||||||
|
OBSDataAutoRelease defaultSettings = obs_get_source_defaults(filterKind.c_str());
|
||||||
|
if (!defaultSettings)
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidFilterKind);
|
||||||
|
|
||||||
|
json responseData;
|
||||||
|
responseData["defaultFilterSettings"] = Utils::Json::ObsDataToJson(defaultSettings, true);
|
||||||
|
return RequestResult::Success(responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new filter, adding it to the specified source.
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source to add the filter to
|
||||||
|
* @requestField filterName | String | Name of the new filter to be created
|
||||||
|
* @requestField filterKind | String | The kind of filter to be created
|
||||||
|
* @requestField ?filterSettings | Object | Settings object to initialize the filter with | Default settings used
|
||||||
|
*
|
||||||
|
* @requestType CreateSourceFilter
|
||||||
|
* @complexity 3
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::CreateSourceFilter(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
|
||||||
|
OBSSourceAutoRelease source = request.ValidateSource("sourceName", statusCode, comment);
|
||||||
|
if (!(source && request.ValidateString("filterName", statusCode, comment) &&
|
||||||
|
request.ValidateString("filterKind", statusCode, comment)))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
std::string filterName = request.RequestData["filterName"];
|
||||||
|
OBSSourceAutoRelease existingFilter = obs_source_get_filter_by_name(source, filterName.c_str());
|
||||||
|
if (existingFilter)
|
||||||
|
return RequestResult::Error(RequestStatus::ResourceAlreadyExists, "A filter already exists by that name.");
|
||||||
|
|
||||||
|
std::string filterKind = request.RequestData["filterKind"];
|
||||||
|
auto kinds = Utils::Obs::ArrayHelper::GetFilterKindList();
|
||||||
|
if (std::find(kinds.begin(), kinds.end(), filterKind) == kinds.end())
|
||||||
|
return RequestResult::Error(
|
||||||
|
RequestStatus::InvalidFilterKind,
|
||||||
|
"Your specified filter kind is not supported by OBS. Check that any necessary plugins are loaded.");
|
||||||
|
|
||||||
|
OBSDataAutoRelease filterSettings = nullptr;
|
||||||
|
if (request.Contains("filterSettings")) {
|
||||||
|
if (!request.ValidateOptionalObject("filterSettings", statusCode, comment, true))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
filterSettings = Utils::Json::JsonToObsData(request.RequestData["filterSettings"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
OBSSourceAutoRelease filter = Utils::Obs::ActionHelper::CreateSourceFilter(source, filterName, filterKind, filterSettings);
|
||||||
|
|
||||||
|
if (!filter)
|
||||||
|
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Creation of the filter failed.");
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes a filter from a source.
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source the filter is on
|
||||||
|
* @requestField filterName | String | Name of the filter to remove
|
||||||
|
*
|
||||||
|
* @requestType RemoveSourceFilter
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::RemoveSourceFilter(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
FilterPair pair = request.ValidateFilter("sourceName", "filterName", statusCode, comment);
|
||||||
|
if (!pair.filter)
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
obs_source_filter_remove(pair.source, pair.filter);
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the name of a source filter (rename).
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source the filter is on
|
||||||
|
* @requestField filterName | String | Current name of the filter
|
||||||
|
* @requestField newFilterName | String | New name for the filter
|
||||||
|
*
|
||||||
|
* @requestType SetSourceFilterName
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::SetSourceFilterName(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
FilterPair pair = request.ValidateFilter("sourceName", "filterName", statusCode, comment);
|
||||||
|
if (!pair.filter || !request.ValidateString("newFilterName", statusCode, comment))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
std::string newFilterName = request.RequestData["newFilterName"];
|
||||||
|
|
||||||
|
OBSSourceAutoRelease existingFilter = obs_source_get_filter_by_name(pair.source, newFilterName.c_str());
|
||||||
|
if (existingFilter)
|
||||||
|
return RequestResult::Error(RequestStatus::ResourceAlreadyExists, "A filter already exists by that new name.");
|
||||||
|
|
||||||
|
obs_source_set_name(pair.filter, newFilterName.c_str());
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the info for a specific source filter.
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source
|
||||||
|
* @requestField filterName | String | Name of the filter
|
||||||
|
*
|
||||||
|
* @responseField filterEnabled | Boolean | Whether the filter is enabled
|
||||||
|
* @responseField filterIndex | Number | Index of the filter in the list, beginning at 0
|
||||||
|
* @responseField filterKind | String | The kind of filter
|
||||||
|
* @responseField filterSettings | Object | Settings object associated with the filter
|
||||||
|
*
|
||||||
|
* @requestType GetSourceFilter
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::GetSourceFilter(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
FilterPair pair = request.ValidateFilter("sourceName", "filterName", statusCode, comment);
|
||||||
|
if (!pair.filter)
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
json responseData;
|
||||||
|
responseData["filterEnabled"] = obs_source_enabled(pair.filter);
|
||||||
|
responseData["filterIndex"] = Utils::Obs::NumberHelper::GetSourceFilterIndex(
|
||||||
|
pair.source,
|
||||||
|
pair.filter); // Todo: Use `GetSourceFilterlist` to select this filter maybe
|
||||||
|
responseData["filterKind"] = obs_source_get_id(pair.filter);
|
||||||
|
|
||||||
|
OBSDataAutoRelease filterSettings = obs_source_get_settings(pair.filter);
|
||||||
|
responseData["filterSettings"] = Utils::Json::ObsDataToJson(filterSettings);
|
||||||
|
|
||||||
|
return RequestResult::Success(responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the index position of a filter on a source.
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source the filter is on
|
||||||
|
* @requestField filterName | String | Name of the filter
|
||||||
|
* @requestField filterIndex | Number | New index position of the filter | >= 0
|
||||||
|
*
|
||||||
|
* @requestType SetSourceFilterIndex
|
||||||
|
* @complexity 3
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::SetSourceFilterIndex(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
FilterPair pair = request.ValidateFilter("sourceName", "filterName", statusCode, comment);
|
||||||
|
if (!(pair.filter && request.ValidateNumber("filterIndex", statusCode, comment, 0, 8192)))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
int filterIndex = request.RequestData["filterIndex"];
|
||||||
|
|
||||||
|
Utils::Obs::ActionHelper::SetSourceFilterIndex(pair.source, pair.filter, filterIndex);
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the settings of a source filter.
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source the filter is on
|
||||||
|
* @requestField filterName | String | Name of the filter to set the settings of
|
||||||
|
* @requestField filterSettings | Object | Object of settings to apply
|
||||||
|
* @requestField ?overlay | Boolean | True == apply the settings on top of existing ones, False == reset the input to its defaults, then apply settings. | true
|
||||||
|
*
|
||||||
|
* @requestType SetSourceFilterSettings
|
||||||
|
* @complexity 3
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::SetSourceFilterSettings(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
FilterPair pair = request.ValidateFilter("sourceName", "filterName", statusCode, comment);
|
||||||
|
if (!(pair.filter && request.ValidateObject("filterSettings", statusCode, comment, true)))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
// Almost identical to SetInputSettings
|
||||||
|
|
||||||
|
bool overlay = true;
|
||||||
|
if (request.Contains("overlay")) {
|
||||||
|
if (!request.ValidateOptionalBoolean("overlay", statusCode, comment))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
overlay = request.RequestData["overlay"];
|
||||||
|
}
|
||||||
|
|
||||||
|
OBSDataAutoRelease newSettings = Utils::Json::JsonToObsData(request.RequestData["filterSettings"]);
|
||||||
|
if (!newSettings)
|
||||||
|
return RequestResult::Error(RequestStatus::RequestProcessingFailed,
|
||||||
|
"An internal data conversion operation failed. Please report this!");
|
||||||
|
|
||||||
|
if (overlay)
|
||||||
|
obs_source_update(pair.filter, newSettings);
|
||||||
|
else
|
||||||
|
obs_source_reset_settings(pair.filter, newSettings);
|
||||||
|
|
||||||
|
obs_source_update_properties(pair.filter);
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the enable state of a source filter.
|
||||||
|
*
|
||||||
|
* @requestField sourceName | String | Name of the source the filter is on
|
||||||
|
* @requestField filterName | String | Name of the filter
|
||||||
|
* @requestField filterEnabled | Boolean | New enable state of the filter
|
||||||
|
*
|
||||||
|
* @requestType SetSourceFilterEnabled
|
||||||
|
* @complexity 3
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category filters
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::SetSourceFilterEnabled(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
FilterPair pair = request.ValidateFilter("sourceName", "filterName", statusCode, comment);
|
||||||
|
if (!(pair.filter && request.ValidateBoolean("filterEnabled", statusCode, comment)))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
bool filterEnabled = request.RequestData["filterEnabled"];
|
||||||
|
|
||||||
|
obs_source_set_enabled(pair.filter, filterEnabled);
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
@ -18,6 +18,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <QImageWriter>
|
#include <QImageWriter>
|
||||||
|
#include <QSysInfo>
|
||||||
|
|
||||||
#include "RequestHandler.h"
|
#include "RequestHandler.h"
|
||||||
#include "../websocketserver/WebSocketServer.h"
|
#include "../websocketserver/WebSocketServer.h"
|
||||||
@ -25,7 +26,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#include "../WebSocketApi.h"
|
#include "../WebSocketApi.h"
|
||||||
#include "../obs-websocket.h"
|
#include "../obs-websocket.h"
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets data about the current plugin and RPC version.
|
* Gets data about the current plugin and RPC version.
|
||||||
*
|
*
|
||||||
@ -34,6 +34,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
* @responseField rpcVersion | Number | Current latest obs-websocket RPC version
|
* @responseField rpcVersion | Number | Current latest obs-websocket RPC version
|
||||||
* @responseField availableRequests | Array<String> | Array of available RPC requests for the currently negotiated RPC version
|
* @responseField availableRequests | Array<String> | Array of available RPC requests for the currently negotiated RPC version
|
||||||
* @responseField supportedImageFormats | Array<String> | Image formats available in `GetSourceScreenshot` and `SaveSourceScreenshot` requests.
|
* @responseField supportedImageFormats | Array<String> | Image formats available in `GetSourceScreenshot` and `SaveSourceScreenshot` requests.
|
||||||
|
* @responseField platform | String | Name of the platform. Usually `windows`, `macos`, or `ubuntu` (linux flavor). Not guaranteed to be any of those
|
||||||
|
* @responseField platformDescription | String | Description of the platform, like `Windows 10 (10.0)`
|
||||||
*
|
*
|
||||||
* @requestType GetVersion
|
* @requestType GetVersion
|
||||||
* @complexity 1
|
* @complexity 1
|
||||||
@ -57,6 +59,9 @@ RequestResult RequestHandler::GetVersion(const Request&)
|
|||||||
}
|
}
|
||||||
responseData["supportedImageFormats"] = supportedImageFormats;
|
responseData["supportedImageFormats"] = supportedImageFormats;
|
||||||
|
|
||||||
|
responseData["platform"] = QSysInfo::productType().toStdString();
|
||||||
|
responseData["platformDescription"] = QSysInfo::prettyProductName().toStdString();
|
||||||
|
|
||||||
return RequestResult::Success(responseData);
|
return RequestResult::Success(responseData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,12 +91,31 @@ RequestResult RequestHandler::GetStats(const Request&)
|
|||||||
{
|
{
|
||||||
json responseData = Utils::Obs::ObjectHelper::GetStats();
|
json responseData = Utils::Obs::ObjectHelper::GetStats();
|
||||||
|
|
||||||
|
if (_session) {
|
||||||
responseData["webSocketSessionIncomingMessages"] = _session->IncomingMessages();
|
responseData["webSocketSessionIncomingMessages"] = _session->IncomingMessages();
|
||||||
responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages();
|
responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages();
|
||||||
|
} else {
|
||||||
|
responseData["webSocketSessionIncomingMessages"] = nullptr;
|
||||||
|
responseData["webSocketSessionOutgoingMessages"] = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
return RequestResult::Success(responseData);
|
return RequestResult::Success(responseData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom event emitted by `BroadcastCustomEvent`.
|
||||||
|
*
|
||||||
|
* @dataField eventData | Object | Custom event data
|
||||||
|
*
|
||||||
|
* @eventType CustomEvent
|
||||||
|
* @eventSubscription General
|
||||||
|
* @complexity 1
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @category general
|
||||||
|
* @api events
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Broadcasts a `CustomEvent` to all WebSocket clients. Receivers are clients which are identified and subscribed.
|
* Broadcasts a `CustomEvent` to all WebSocket clients. Receivers are clients which are identified and subscribed.
|
||||||
*
|
*
|
||||||
@ -130,6 +154,8 @@ RequestResult RequestHandler::BroadcastCustomEvent(const Request& request)
|
|||||||
* @requestField requestType | String | The request type to call
|
* @requestField requestType | String | The request type to call
|
||||||
* @requestField ?requestData | Object | Object containing appropriate request data | {}
|
* @requestField ?requestData | Object | Object containing appropriate request data | {}
|
||||||
*
|
*
|
||||||
|
* @responseField vendorName | String | Echoed of `vendorName`
|
||||||
|
* @responseField requestType | String | Echoed of `requestType`
|
||||||
* @responseField responseData | Object | Object containing appropriate response data. {} if request does not provide any response data
|
* @responseField responseData | Object | Object containing appropriate response data. {} if request does not provide any response data
|
||||||
*
|
*
|
||||||
* @requestType CallVendorRequest
|
* @requestType CallVendorRequest
|
||||||
@ -143,7 +169,8 @@ RequestResult RequestHandler::CallVendorRequest(const Request& request)
|
|||||||
{
|
{
|
||||||
RequestStatus::RequestStatus statusCode;
|
RequestStatus::RequestStatus statusCode;
|
||||||
std::string comment;
|
std::string comment;
|
||||||
if (!request.ValidateString("vendorName", statusCode, comment) || !request.ValidateString("requestType", statusCode, comment))
|
if (!request.ValidateString("vendorName", statusCode, comment) ||
|
||||||
|
!request.ValidateString("requestType", statusCode, comment))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
std::string vendorName = request.RequestData["vendorName"];
|
std::string vendorName = request.RequestData["vendorName"];
|
||||||
@ -161,7 +188,8 @@ RequestResult RequestHandler::CallVendorRequest(const Request& request)
|
|||||||
|
|
||||||
auto webSocketApi = GetWebSocketApi();
|
auto webSocketApi = GetWebSocketApi();
|
||||||
if (!webSocketApi)
|
if (!webSocketApi)
|
||||||
return RequestResult::Error(RequestStatus::RequestProcessingFailed, "Unable to call request due to internal error.");
|
return RequestResult::Error(RequestStatus::RequestProcessingFailed,
|
||||||
|
"Unable to call request due to internal error.");
|
||||||
|
|
||||||
auto ret = webSocketApi->PerformVendorRequest(vendorName, requestType, requestData, obsResponseData);
|
auto ret = webSocketApi->PerformVendorRequest(vendorName, requestType, requestData, obsResponseData);
|
||||||
switch (ret) {
|
switch (ret) {
|
||||||
@ -175,6 +203,8 @@ RequestResult RequestHandler::CallVendorRequest(const Request& request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
json responseData;
|
json responseData;
|
||||||
|
responseData["vendorName"] = vendorName;
|
||||||
|
responseData["requestType"] = requestType;
|
||||||
responseData["responseData"] = Utils::Json::ObsDataToJson(obsResponseData);
|
responseData["responseData"] = Utils::Json::ObsDataToJson(obsResponseData);
|
||||||
|
|
||||||
return RequestResult::Success(responseData);
|
return RequestResult::Success(responseData);
|
||||||
@ -266,19 +296,23 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request& request)
|
|||||||
|
|
||||||
const json keyModifiersJson = request.RequestData["keyModifiers"];
|
const json keyModifiersJson = request.RequestData["keyModifiers"];
|
||||||
uint32_t keyModifiers = 0;
|
uint32_t keyModifiers = 0;
|
||||||
if (keyModifiersJson.contains("shift") && keyModifiersJson["shift"].is_boolean() && keyModifiersJson["shift"].get<bool>())
|
if (keyModifiersJson.contains("shift") && keyModifiersJson["shift"].is_boolean() &&
|
||||||
|
keyModifiersJson["shift"].get<bool>())
|
||||||
keyModifiers |= INTERACT_SHIFT_KEY;
|
keyModifiers |= INTERACT_SHIFT_KEY;
|
||||||
if (keyModifiersJson.contains("control") && keyModifiersJson["control"].is_boolean() && keyModifiersJson["control"].get<bool>())
|
if (keyModifiersJson.contains("control") && keyModifiersJson["control"].is_boolean() &&
|
||||||
|
keyModifiersJson["control"].get<bool>())
|
||||||
keyModifiers |= INTERACT_CONTROL_KEY;
|
keyModifiers |= INTERACT_CONTROL_KEY;
|
||||||
if (keyModifiersJson.contains("alt") && keyModifiersJson["alt"].is_boolean() && keyModifiersJson["alt"].get<bool>())
|
if (keyModifiersJson.contains("alt") && keyModifiersJson["alt"].is_boolean() && keyModifiersJson["alt"].get<bool>())
|
||||||
keyModifiers |= INTERACT_ALT_KEY;
|
keyModifiers |= INTERACT_ALT_KEY;
|
||||||
if (keyModifiersJson.contains("command") && keyModifiersJson["command"].is_boolean() && keyModifiersJson["command"].get<bool>())
|
if (keyModifiersJson.contains("command") && keyModifiersJson["command"].is_boolean() &&
|
||||||
|
keyModifiersJson["command"].get<bool>())
|
||||||
keyModifiers |= INTERACT_COMMAND_KEY;
|
keyModifiers |= INTERACT_COMMAND_KEY;
|
||||||
combo.modifiers = keyModifiers;
|
combo.modifiers = keyModifiers;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!combo.modifiers && (combo.key == OBS_KEY_NONE || combo.key >= OBS_KEY_LAST_VALUE))
|
if (!combo.modifiers && (combo.key == OBS_KEY_NONE || combo.key >= OBS_KEY_LAST_VALUE))
|
||||||
return RequestResult::Error(RequestStatus::CannotAct, "Your provided request fields cannot be used to trigger a hotkey.");
|
return RequestResult::Error(RequestStatus::CannotAct,
|
||||||
|
"Your provided request fields cannot be used to trigger a hotkey.");
|
||||||
|
|
||||||
// Apparently things break when you don't start by setting the combo to false
|
// Apparently things break when you don't start by setting the combo to false
|
||||||
obs_hotkey_inject_event(combo, false);
|
obs_hotkey_inject_event(combo, false);
|
||||||
@ -291,8 +325,8 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request& request)
|
|||||||
/**
|
/**
|
||||||
* Sleeps for a time duration or number of frames. Only available in request batches with types `SERIAL_REALTIME` or `SERIAL_FRAME`.
|
* Sleeps for a time duration or number of frames. Only available in request batches with types `SERIAL_REALTIME` or `SERIAL_FRAME`.
|
||||||
*
|
*
|
||||||
* @requestField sleepMillis | Number | Number of milliseconds to sleep for (if `SERIAL_REALTIME` mode) | >= 0, <= 50000
|
* @requestField ?sleepMillis | Number | Number of milliseconds to sleep for (if `SERIAL_REALTIME` mode) | >= 0, <= 50000
|
||||||
* @requestField sleepFrames | Number | Number of frames to sleep for (if `SERIAL_FRAME` mode) | >= 0, <= 10000
|
* @requestField ?sleepFrames | Number | Number of frames to sleep for (if `SERIAL_FRAME` mode) | >= 0, <= 10000
|
||||||
*
|
*
|
||||||
* @requestType Sleep
|
* @requestType Sleep
|
||||||
* @complexity 2
|
* @complexity 2
|
||||||
|
@ -83,6 +83,43 @@ RequestResult RequestHandler::GetInputKindList(const Request& request)
|
|||||||
return RequestResult::Success(responseData);
|
return RequestResult::Success(responseData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the names of all special inputs.
|
||||||
|
*
|
||||||
|
* @responseField desktop1 | String | Name of the Desktop Audio input
|
||||||
|
* @responseField desktop2 | String | Name of the Desktop Audio 2 input
|
||||||
|
* @responseField mic1 | String | Name of the Mic/Auxiliary Audio input
|
||||||
|
* @responseField mic2 | String | Name of the Mic/Auxiliary Audio 2 input
|
||||||
|
* @responseField mic3 | String | Name of the Mic/Auxiliary Audio 3 input
|
||||||
|
* @responseField mic4 | String | Name of the Mic/Auxiliary Audio 4 input
|
||||||
|
*
|
||||||
|
* @requestType GetSpecialInputs
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category inputs
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::GetSpecialInputs(const Request &)
|
||||||
|
{
|
||||||
|
json responseData;
|
||||||
|
|
||||||
|
std::vector<std::string> channels = {"desktop1", "desktop2", "mic1", "mic2", "mic3", "mic4"};
|
||||||
|
|
||||||
|
uint32_t channelId = 1;
|
||||||
|
for (auto &channel : channels) {
|
||||||
|
OBSSourceAutoRelease input = obs_get_output_source(channelId);
|
||||||
|
if (!input)
|
||||||
|
responseData[channel] = nullptr;
|
||||||
|
else
|
||||||
|
responseData[channel] = obs_source_get_name(input);
|
||||||
|
|
||||||
|
channelId++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return RequestResult::Success(responseData);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new input, adding it as a scene item to the specified scene.
|
* Creates a new input, adding it as a scene item to the specified scene.
|
||||||
*
|
*
|
||||||
@ -106,7 +143,8 @@ RequestResult RequestHandler::CreateInput(const Request& request)
|
|||||||
RequestStatus::RequestStatus statusCode;
|
RequestStatus::RequestStatus statusCode;
|
||||||
std::string comment;
|
std::string comment;
|
||||||
OBSSourceAutoRelease sceneSource = request.ValidateScene("sceneName", statusCode, comment);
|
OBSSourceAutoRelease sceneSource = request.ValidateScene("sceneName", statusCode, comment);
|
||||||
if (!(sceneSource && request.ValidateString("inputName", statusCode, comment) && request.ValidateString("inputKind", statusCode, comment)))
|
if (!(sceneSource && request.ValidateString("inputName", statusCode, comment) &&
|
||||||
|
request.ValidateString("inputKind", statusCode, comment)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
std::string inputName = request.RequestData["inputName"];
|
std::string inputName = request.RequestData["inputName"];
|
||||||
@ -117,7 +155,9 @@ RequestResult RequestHandler::CreateInput(const Request& request)
|
|||||||
std::string inputKind = request.RequestData["inputKind"];
|
std::string inputKind = request.RequestData["inputKind"];
|
||||||
auto kinds = Utils::Obs::ArrayHelper::GetInputKindList();
|
auto kinds = Utils::Obs::ArrayHelper::GetInputKindList();
|
||||||
if (std::find(kinds.begin(), kinds.end(), inputKind) == kinds.end())
|
if (std::find(kinds.begin(), kinds.end(), inputKind) == kinds.end())
|
||||||
return RequestResult::Error(RequestStatus::InvalidInputKind, "Your specified input kind is not supported by OBS. Check that your specified kind is properly versioned and that any necessary plugins are loaded.");
|
return RequestResult::Error(
|
||||||
|
RequestStatus::InvalidInputKind,
|
||||||
|
"Your specified input kind is not supported by OBS. Check that your specified kind is properly versioned and that any necessary plugins are loaded.");
|
||||||
|
|
||||||
OBSDataAutoRelease inputSettings = nullptr;
|
OBSDataAutoRelease inputSettings = nullptr;
|
||||||
if (request.Contains("inputSettings")) {
|
if (request.Contains("inputSettings")) {
|
||||||
@ -138,7 +178,8 @@ RequestResult RequestHandler::CreateInput(const Request& request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create the input and add it as a scene item to the destination scene
|
// Create the input and add it as a scene item to the destination scene
|
||||||
OBSSceneItemAutoRelease sceneItem = Utils::Obs::ActionHelper::CreateInput(inputName, inputKind, inputSettings, scene, sceneItemEnabled);
|
OBSSceneItemAutoRelease sceneItem =
|
||||||
|
Utils::Obs::ActionHelper::CreateInput(inputName, inputKind, inputSettings, scene, sceneItemEnabled);
|
||||||
|
|
||||||
if (!sceneItem)
|
if (!sceneItem)
|
||||||
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Creation of the input or scene item failed.");
|
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Creation of the input or scene item failed.");
|
||||||
@ -203,7 +244,8 @@ RequestResult RequestHandler::SetInputName(const Request& request)
|
|||||||
|
|
||||||
OBSSourceAutoRelease existingSource = obs_get_source_by_name(newInputName.c_str());
|
OBSSourceAutoRelease existingSource = obs_get_source_by_name(newInputName.c_str());
|
||||||
if (existingSource)
|
if (existingSource)
|
||||||
return RequestResult::Error(RequestStatus::ResourceAlreadyExists, "A source already exists by that new input name.");
|
return RequestResult::Error(RequestStatus::ResourceAlreadyExists,
|
||||||
|
"A source already exists by that new input name.");
|
||||||
|
|
||||||
obs_source_set_name(input, newInputName.c_str());
|
obs_source_set_name(input, newInputName.c_str());
|
||||||
|
|
||||||
@ -232,6 +274,9 @@ RequestResult RequestHandler::GetInputDefaultSettings(const Request& request)
|
|||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
std::string inputKind = request.RequestData["inputKind"];
|
std::string inputKind = request.RequestData["inputKind"];
|
||||||
|
auto kinds = Utils::Obs::ArrayHelper::GetInputKindList();
|
||||||
|
if (std::find(kinds.begin(), kinds.end(), inputKind) == kinds.end())
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidInputKind);
|
||||||
|
|
||||||
OBSDataAutoRelease defaultSettings = obs_get_source_defaults(inputKind.c_str());
|
OBSDataAutoRelease defaultSettings = obs_get_source_defaults(inputKind.c_str());
|
||||||
if (!defaultSettings)
|
if (!defaultSettings)
|
||||||
@ -309,7 +354,8 @@ RequestResult RequestHandler::SetInputSettings(const Request& request)
|
|||||||
OBSDataAutoRelease newSettings = Utils::Json::JsonToObsData(request.RequestData["inputSettings"]);
|
OBSDataAutoRelease newSettings = Utils::Json::JsonToObsData(request.RequestData["inputSettings"]);
|
||||||
if (!newSettings)
|
if (!newSettings)
|
||||||
// This should never happen
|
// This should never happen
|
||||||
return RequestResult::Error(RequestStatus::RequestProcessingFailed, "An internal data conversion operation failed. Please report this!");
|
return RequestResult::Error(RequestStatus::RequestProcessingFailed,
|
||||||
|
"An internal data conversion operation failed. Please report this!");
|
||||||
|
|
||||||
if (overlay)
|
if (overlay)
|
||||||
// Applies the new settings on top of the existing user settings
|
// Applies the new settings on top of the existing user settings
|
||||||
@ -346,6 +392,9 @@ RequestResult RequestHandler::GetInputMute(const Request& request)
|
|||||||
if (!input)
|
if (!input)
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
json responseData;
|
json responseData;
|
||||||
responseData["inputMuted"] = obs_source_muted(input);
|
responseData["inputMuted"] = obs_source_muted(input);
|
||||||
return RequestResult::Success(responseData);
|
return RequestResult::Success(responseData);
|
||||||
@ -372,6 +421,9 @@ RequestResult RequestHandler::SetInputMute(const Request& request)
|
|||||||
if (!(input && request.ValidateBoolean("inputMuted", statusCode, comment)))
|
if (!(input && request.ValidateBoolean("inputMuted", statusCode, comment)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
obs_source_set_muted(input, request.RequestData["inputMuted"]);
|
obs_source_set_muted(input, request.RequestData["inputMuted"]);
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
@ -399,6 +451,9 @@ RequestResult RequestHandler::ToggleInputMute(const Request& request)
|
|||||||
if (!input)
|
if (!input)
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
bool inputMuted = !obs_source_muted(input);
|
bool inputMuted = !obs_source_muted(input);
|
||||||
obs_source_set_muted(input, inputMuted);
|
obs_source_set_muted(input, inputMuted);
|
||||||
|
|
||||||
@ -430,6 +485,9 @@ RequestResult RequestHandler::GetInputVolume(const Request& request)
|
|||||||
if (!input)
|
if (!input)
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
float inputVolumeMul = obs_source_get_volume(input);
|
float inputVolumeMul = obs_source_get_volume(input);
|
||||||
float inputVolumeDb = obs_mul_to_db(inputVolumeMul);
|
float inputVolumeDb = obs_mul_to_db(inputVolumeMul);
|
||||||
if (inputVolumeDb == -INFINITY)
|
if (inputVolumeDb == -INFINITY)
|
||||||
@ -446,7 +504,7 @@ RequestResult RequestHandler::GetInputVolume(const Request& request)
|
|||||||
*
|
*
|
||||||
* @requestField inputName | String | Name of the input to set the volume of
|
* @requestField inputName | String | Name of the input to set the volume of
|
||||||
* @requestField ?inputVolumeMul | Number | Volume setting in mul | >= 0, <= 20 | `inputVolumeDb` should be specified
|
* @requestField ?inputVolumeMul | Number | Volume setting in mul | >= 0, <= 20 | `inputVolumeDb` should be specified
|
||||||
* @requestField ?inputVolumeDb | Number | Volume setting in dB | >= -100, <= -26 | `inputVolumeMul` should be specified
|
* @requestField ?inputVolumeDb | Number | Volume setting in dB | >= -100, <= 26 | `inputVolumeMul` should be specified
|
||||||
*
|
*
|
||||||
* @requestType SetInputVolume
|
* @requestType SetInputVolume
|
||||||
* @complexity 3
|
* @complexity 3
|
||||||
@ -463,6 +521,9 @@ RequestResult RequestHandler::SetInputVolume(const Request& request)
|
|||||||
if (!input)
|
if (!input)
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
bool hasMul = request.Contains("inputVolumeMul");
|
bool hasMul = request.Contains("inputVolumeMul");
|
||||||
if (hasMul && !request.ValidateOptionalNumber("inputVolumeMul", statusCode, comment, 0, 20))
|
if (hasMul && !request.ValidateOptionalNumber("inputVolumeMul", statusCode, comment, 0, 20))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
@ -488,6 +549,67 @@ RequestResult RequestHandler::SetInputVolume(const Request& request)
|
|||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the audio balance of an input.
|
||||||
|
*
|
||||||
|
* @requestField inputName | String | Name of the input to get the audio balance of
|
||||||
|
*
|
||||||
|
* @responseField inputAudioBalance | Number | Audio balance value from 0.0-1.0
|
||||||
|
*
|
||||||
|
* @requestType GetInputAudioBalance
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category inputs
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::GetInputAudioBalance(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
OBSSourceAutoRelease input = request.ValidateInput("inputName", statusCode, comment);
|
||||||
|
if (!input)
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
|
json responseData;
|
||||||
|
responseData["inputAudioBalance"] = obs_source_get_balance_value(input);
|
||||||
|
|
||||||
|
return RequestResult::Success(responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the audio balance of an input.
|
||||||
|
*
|
||||||
|
* @requestField inputName | String | Name of the input to set the audio balance of
|
||||||
|
* @requestField inputAudioBalance | Number | New audio balance value | >= 0.0, <= 1.0
|
||||||
|
*
|
||||||
|
* @requestType SetInputAudioBalance
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category inputs
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::SetInputAudioBalance(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
OBSSourceAutoRelease input = request.ValidateInput("inputName", statusCode, comment);
|
||||||
|
if (!(input && request.ValidateNumber("inputAudioBalance", statusCode, comment, 0.0, 1.0)))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
|
float inputAudioBalance = request.RequestData["inputAudioBalance"];
|
||||||
|
obs_source_set_balance_value(input, inputAudioBalance);
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the audio sync offset of an input.
|
* Gets the audio sync offset of an input.
|
||||||
*
|
*
|
||||||
@ -512,6 +634,9 @@ RequestResult RequestHandler::GetInputAudioSyncOffset(const Request& request)
|
|||||||
if (!input)
|
if (!input)
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
json responseData;
|
json responseData;
|
||||||
// Offset is stored in nanoseconds in OBS.
|
// Offset is stored in nanoseconds in OBS.
|
||||||
responseData["inputAudioSyncOffset"] = obs_source_get_sync_offset(input) / 1000000;
|
responseData["inputAudioSyncOffset"] = obs_source_get_sync_offset(input) / 1000000;
|
||||||
@ -540,6 +665,9 @@ RequestResult RequestHandler::SetInputAudioSyncOffset(const Request& request)
|
|||||||
if (!(input && request.ValidateNumber("inputAudioSyncOffset", statusCode, comment, -950, 20000)))
|
if (!(input && request.ValidateNumber("inputAudioSyncOffset", statusCode, comment, -950, 20000)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
int64_t syncOffset = request.RequestData["inputAudioSyncOffset"];
|
int64_t syncOffset = request.RequestData["inputAudioSyncOffset"];
|
||||||
obs_source_set_sync_offset(input, syncOffset * 1000000);
|
obs_source_set_sync_offset(input, syncOffset * 1000000);
|
||||||
|
|
||||||
@ -550,6 +678,7 @@ RequestResult RequestHandler::SetInputAudioSyncOffset(const Request& request)
|
|||||||
* Gets the audio monitor type of an input.
|
* Gets the audio monitor type of an input.
|
||||||
*
|
*
|
||||||
* The available audio monitor types are:
|
* The available audio monitor types are:
|
||||||
|
*
|
||||||
* - `OBS_MONITORING_TYPE_NONE`
|
* - `OBS_MONITORING_TYPE_NONE`
|
||||||
* - `OBS_MONITORING_TYPE_MONITOR_ONLY`
|
* - `OBS_MONITORING_TYPE_MONITOR_ONLY`
|
||||||
* - `OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT`
|
* - `OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT`
|
||||||
@ -573,8 +702,11 @@ RequestResult RequestHandler::GetInputAudioMonitorType(const Request& request)
|
|||||||
if (!input)
|
if (!input)
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
json responseData;
|
json responseData;
|
||||||
responseData["monitorType"] = Utils::Obs::StringHelper::GetInputMonitorType(input);
|
responseData["monitorType"] = obs_source_get_monitoring_type(input);
|
||||||
|
|
||||||
return RequestResult::Success(responseData);
|
return RequestResult::Success(responseData);
|
||||||
}
|
}
|
||||||
@ -600,6 +732,13 @@ RequestResult RequestHandler::SetInputAudioMonitorType(const Request& request)
|
|||||||
if (!(input && request.ValidateString("monitorType", statusCode, comment)))
|
if (!(input && request.ValidateString("monitorType", statusCode, comment)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
|
if (!obs_audio_monitoring_available())
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState,
|
||||||
|
"Audio monitoring is not available on this platform.");
|
||||||
|
|
||||||
enum obs_monitoring_type monitorType;
|
enum obs_monitoring_type monitorType;
|
||||||
std::string monitorTypeString = request.RequestData["monitorType"];
|
std::string monitorTypeString = request.RequestData["monitorType"];
|
||||||
if (monitorTypeString == "OBS_MONITORING_TYPE_NONE")
|
if (monitorTypeString == "OBS_MONITORING_TYPE_NONE")
|
||||||
@ -609,13 +748,104 @@ RequestResult RequestHandler::SetInputAudioMonitorType(const Request& request)
|
|||||||
else if (monitorTypeString == "OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT")
|
else if (monitorTypeString == "OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT")
|
||||||
monitorType = OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT;
|
monitorType = OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT;
|
||||||
else
|
else
|
||||||
return RequestResult::Error(RequestStatus::InvalidRequestField, std::string("Unknown monitor type: ") + monitorTypeString);
|
return RequestResult::Error(RequestStatus::InvalidRequestField,
|
||||||
|
std::string("Unknown monitor type: ") + monitorTypeString);
|
||||||
|
|
||||||
obs_source_set_monitoring_type(input, monitorType);
|
obs_source_set_monitoring_type(input, monitorType);
|
||||||
|
|
||||||
return RequestResult::Success();
|
return RequestResult::Success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the enable state of all audio tracks of an input.
|
||||||
|
*
|
||||||
|
* @requestField inputName | String | Name of the input
|
||||||
|
*
|
||||||
|
* @responseField inputAudioTracks | Object | Object of audio tracks and associated enable states
|
||||||
|
*
|
||||||
|
* @requestType GetInputAudioTracks
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category inputs
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::GetInputAudioTracks(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
OBSSourceAutoRelease input = request.ValidateInput("inputName", statusCode, comment);
|
||||||
|
if (!input)
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
|
long long tracks = obs_source_get_audio_mixers(input);
|
||||||
|
|
||||||
|
json inputAudioTracks;
|
||||||
|
for (long long i = 0; i < MAX_AUDIO_MIXES; i++) {
|
||||||
|
inputAudioTracks[std::to_string(i + 1)] = (bool)((tracks >> i) & 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
json responseData;
|
||||||
|
responseData["inputAudioTracks"] = inputAudioTracks;
|
||||||
|
|
||||||
|
return RequestResult::Success(responseData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the enable state of audio tracks of an input.
|
||||||
|
*
|
||||||
|
* @requestField inputName | String | Name of the input
|
||||||
|
* @requestField inputAudioTracks | Object | Track settings to apply
|
||||||
|
*
|
||||||
|
* @requestType SetInputAudioTracks
|
||||||
|
* @complexity 2
|
||||||
|
* @rpcVersion -1
|
||||||
|
* @initialVersion 5.0.0
|
||||||
|
* @api requests
|
||||||
|
* @category inputs
|
||||||
|
*/
|
||||||
|
RequestResult RequestHandler::SetInputAudioTracks(const Request &request)
|
||||||
|
{
|
||||||
|
RequestStatus::RequestStatus statusCode;
|
||||||
|
std::string comment;
|
||||||
|
OBSSourceAutoRelease input = request.ValidateInput("inputName", statusCode, comment);
|
||||||
|
if (!input || !request.ValidateObject("inputAudioTracks", statusCode, comment))
|
||||||
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
|
if (!(obs_source_get_output_flags(input) & OBS_SOURCE_AUDIO))
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input does not support audio.");
|
||||||
|
|
||||||
|
json inputAudioTracks = request.RequestData["inputAudioTracks"];
|
||||||
|
|
||||||
|
uint32_t mixers = obs_source_get_audio_mixers(input);
|
||||||
|
|
||||||
|
for (uint32_t i = 0; i < MAX_AUDIO_MIXES; i++) {
|
||||||
|
std::string track = std::to_string(i + 1);
|
||||||
|
|
||||||
|
if (!Utils::Json::Contains(inputAudioTracks, track))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!inputAudioTracks[track].is_boolean())
|
||||||
|
return RequestResult::Error(RequestStatus::InvalidRequestFieldType,
|
||||||
|
"The value of one of your tracks is not a boolean.");
|
||||||
|
|
||||||
|
bool enabled = inputAudioTracks[track];
|
||||||
|
|
||||||
|
if (enabled)
|
||||||
|
mixers |= (1 << i);
|
||||||
|
else
|
||||||
|
mixers &= ~(1 << i);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decided that checking if tracks have actually changed is unnecessary
|
||||||
|
obs_source_set_audio_mixers(input, mixers);
|
||||||
|
|
||||||
|
return RequestResult::Success();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the items of a list property from an input's properties.
|
* Gets the items of a list property from an input's properties.
|
||||||
*
|
*
|
||||||
@ -659,6 +889,10 @@ RequestResult RequestHandler::GetInputPropertiesListPropertyItems(const Request&
|
|||||||
/**
|
/**
|
||||||
* Presses a button in the properties of an input.
|
* Presses a button in the properties of an input.
|
||||||
*
|
*
|
||||||
|
* Some known `propertyName` values are:
|
||||||
|
*
|
||||||
|
* - `refreshnocache` - Browser source reload button
|
||||||
|
*
|
||||||
* Note: Use this in cases where there is a button in the properties of an input that cannot be accessed in any other way. For example, browser sources, where there is a refresh button.
|
* Note: Use this in cases where there is a button in the properties of an input that cannot be accessed in any other way. For example, browser sources, where there is a refresh button.
|
||||||
*
|
*
|
||||||
* @requestField inputName | String | Name of the input
|
* @requestField inputName | String | Name of the input
|
||||||
|
@ -29,6 +29,7 @@ bool IsMediaTimeValid(obs_source_t *input)
|
|||||||
* Gets the status of a media input.
|
* Gets the status of a media input.
|
||||||
*
|
*
|
||||||
* Media States:
|
* Media States:
|
||||||
|
*
|
||||||
* - `OBS_MEDIA_STATE_NONE`
|
* - `OBS_MEDIA_STATE_NONE`
|
||||||
* - `OBS_MEDIA_STATE_PLAYING`
|
* - `OBS_MEDIA_STATE_PLAYING`
|
||||||
* - `OBS_MEDIA_STATE_OPENING`
|
* - `OBS_MEDIA_STATE_OPENING`
|
||||||
@ -60,7 +61,8 @@ RequestResult RequestHandler::GetMediaInputStatus(const Request& request)
|
|||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
json responseData;
|
json responseData;
|
||||||
responseData["mediaState"] = Utils::Obs::StringHelper::GetMediaInputState(input);
|
responseData["mediaState"] = obs_source_media_get_state(input);
|
||||||
|
;
|
||||||
|
|
||||||
if (IsMediaTimeValid(input)) {
|
if (IsMediaTimeValid(input)) {
|
||||||
responseData["mediaDuration"] = obs_source_media_get_duration(input);
|
responseData["mediaDuration"] = obs_source_media_get_duration(input);
|
||||||
@ -97,7 +99,8 @@ RequestResult RequestHandler::SetMediaInputCursor(const Request& request)
|
|||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
if (!IsMediaTimeValid(input))
|
if (!IsMediaTimeValid(input))
|
||||||
return RequestResult::Error(RequestStatus::InvalidResourceState, "The media input must be playing or paused in order to set the cursor position.");
|
return RequestResult::Error(RequestStatus::InvalidResourceState,
|
||||||
|
"The media input must be playing or paused in order to set the cursor position.");
|
||||||
|
|
||||||
int64_t mediaCursor = request.RequestData["mediaCursor"];
|
int64_t mediaCursor = request.RequestData["mediaCursor"];
|
||||||
|
|
||||||
@ -131,7 +134,8 @@ RequestResult RequestHandler::OffsetMediaInputCursor(const Request& request)
|
|||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
if (!IsMediaTimeValid(input))
|
if (!IsMediaTimeValid(input))
|
||||||
return RequestResult::Error(RequestStatus::InvalidResourceState, "The media input must be playing or paused in order to set the cursor position.");
|
return RequestResult::Error(RequestStatus::InvalidResourceState,
|
||||||
|
"The media input must be playing or paused in order to set the cursor position.");
|
||||||
|
|
||||||
int64_t mediaCursorOffset = request.RequestData["mediaCursorOffset"];
|
int64_t mediaCursorOffset = request.RequestData["mediaCursorOffset"];
|
||||||
int64_t mediaCursor = obs_source_media_get_time(input) + mediaCursorOffset;
|
int64_t mediaCursor = obs_source_media_get_time(input) + mediaCursorOffset;
|
||||||
@ -165,13 +169,13 @@ RequestResult RequestHandler::TriggerMediaInputAction(const Request& request)
|
|||||||
if (!(input && request.ValidateString("mediaAction", statusCode, comment)))
|
if (!(input && request.ValidateString("mediaAction", statusCode, comment)))
|
||||||
return RequestResult::Error(statusCode, comment);
|
return RequestResult::Error(statusCode, comment);
|
||||||
|
|
||||||
std::string mediaActionString = request.RequestData["mediaAction"];
|
enum ObsMediaInputAction mediaAction = request.RequestData["mediaAction"];
|
||||||
auto mediaAction = Utils::Obs::EnumHelper::GetMediaInputAction(mediaActionString);
|
|
||||||
|
|
||||||
switch (mediaAction) {
|
switch (mediaAction) {
|
||||||
default:
|
default:
|
||||||
case OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE:
|
case OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE:
|
||||||
return RequestResult::Error(RequestStatus::InvalidRequestField, "You have specified an invalid media input action.");
|
return RequestResult::Error(RequestStatus::InvalidRequestField,
|
||||||
|
"You have specified an invalid media input action.");
|
||||||
case OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY:
|
case OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY:
|
||||||
// Shoutout to whoever implemented this API call like this
|
// Shoutout to whoever implemented this API call like this
|
||||||
obs_source_media_play_pause(input, false);
|
obs_source_media_play_pause(input, false);
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user