mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
4a647c5262 | |||
3ea3d3228b | |||
e94f9194a2 | |||
9ee6e2ff2a |
2
.github/workflows/crowdin_upload.yml
vendored
2
.github/workflows/crowdin_upload.yml
vendored
@ -11,7 +11,7 @@ jobs:
|
||||
if: github.repository_owner == 'obsproject'
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 100
|
||||
- name: Upload US English Language Files 🇺🇸
|
||||
|
2
.github/workflows/generate_docs.yml
vendored
2
.github/workflows/generate_docs.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
||||
IS_CI: "true"
|
||||
steps:
|
||||
- name: 'Checkout'
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: ${{ github.workspace }}/obs-websocket
|
||||
- name: 'Generate docs'
|
||||
|
2
.github/workflows/lint.yml
vendored
2
.github/workflows/lint.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
||||
if: contains(github.event.head_commit.message, '[skip ci]') != true
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v4
|
||||
- name: Generate docs
|
||||
run: cd docs && ./build_docs.sh
|
||||
- name: Run markdownlint-cli
|
||||
|
@ -1,4 +1,4 @@
|
||||
project(obs-websocket VERSION 5.4.0)
|
||||
project(obs-websocket VERSION 5.4.1)
|
||||
set(OBS_WEBSOCKET_RPC_VERSION 1)
|
||||
|
||||
option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
|
||||
|
@ -1,4 +1,5 @@
|
||||
OBSWebSocket.Plugin.Description="Fjernstyring af OBS Studio via WebSocket"
|
||||
OBSWebSocket.Settings.DialogTitle="WebSocket-serverindstillinger"
|
||||
OBSWebSocket.Settings.PluginSettingsTitle="Plugin-indstillinger"
|
||||
OBSWebSocket.Settings.ServerEnable="Aktivér WebSocket-server"
|
||||
OBSWebSocket.Settings.AlertsEnable="Aktivér Systembakke Alarmer"
|
||||
|
@ -8,7 +8,7 @@ OBSWebSocket.Settings.DebugEnableHoverText="Aktifkan pencatatan awakutu untuk pe
|
||||
OBSWebSocket.Settings.ServerSettingsTitle="Pengaturan Server"
|
||||
OBSWebSocket.Settings.AuthRequired="Aktifkan Autentikasi"
|
||||
OBSWebSocket.Settings.Password="Kata Sandi Server"
|
||||
OBSWebSocket.Settings.GeneratePassword="Ciptakan Kata Sandi"
|
||||
OBSWebSocket.Settings.GeneratePassword="Buat Kata Sandi"
|
||||
OBSWebSocket.Settings.ServerPort="Port Server"
|
||||
OBSWebSocket.Settings.ShowConnectInfo="Tampilkan Informasi Koneksi"
|
||||
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Peringatan: Saat Ini Siaran Langsung"
|
||||
@ -16,7 +16,7 @@ OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Sepertinya sebuah output (s
|
||||
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.UserPasswordWarningInfoText="Apakah Anda yakin ingin menggunakan kata sandi 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"
|
||||
|
2
data/locale/ug-CN.ini
Normal file
2
data/locale/ug-CN.ini
Normal file
@ -0,0 +1,2 @@
|
||||
OBSWebSocket.Settings.GeneratePassword="ئىم ھاسىللا"
|
||||
OBSWebSocket.ConnectInfo.CopyText="كۆچۈر"
|
@ -308,7 +308,7 @@ RequestResult RequestHandler::DuplicateSceneItem(const Request &request)
|
||||
bool sceneItemEnabled = obs_sceneitem_visible(sceneItem);
|
||||
obs_transform_info sceneItemTransform;
|
||||
obs_sceneitem_crop sceneItemCrop;
|
||||
obs_sceneitem_get_info(sceneItem, &sceneItemTransform);
|
||||
obs_sceneitem_get_info2(sceneItem, &sceneItemTransform);
|
||||
obs_sceneitem_get_crop(sceneItem, &sceneItemCrop);
|
||||
|
||||
// Create the new item
|
||||
@ -386,7 +386,7 @@ RequestResult RequestHandler::SetSceneItemTransform(const Request &request)
|
||||
bool cropChanged = false;
|
||||
obs_transform_info sceneItemTransform;
|
||||
obs_sceneitem_crop sceneItemCrop;
|
||||
obs_sceneitem_get_info(sceneItem, &sceneItemTransform);
|
||||
obs_sceneitem_get_info2(sceneItem, &sceneItemTransform);
|
||||
obs_sceneitem_get_crop(sceneItem, &sceneItemCrop);
|
||||
|
||||
OBSSource source = obs_sceneitem_get_source(sceneItem);
|
||||
@ -503,7 +503,7 @@ RequestResult RequestHandler::SetSceneItemTransform(const Request &request)
|
||||
return RequestResult::Error(RequestStatus::CannotAct, "You have not provided any valid transform changes.");
|
||||
|
||||
if (transformChanged)
|
||||
obs_sceneitem_set_info(sceneItem, &sceneItemTransform);
|
||||
obs_sceneitem_set_info2(sceneItem, &sceneItemTransform);
|
||||
|
||||
if (cropChanged)
|
||||
obs_sceneitem_set_crop(sceneItem, &sceneItemCrop);
|
||||
|
@ -33,7 +33,7 @@ static void CreateSceneItemHelper(void *_data, obs_scene_t *scene)
|
||||
data->sceneItem = obs_scene_add(scene, data->source);
|
||||
|
||||
if (data->sceneItemTransform)
|
||||
obs_sceneitem_set_info(data->sceneItem, data->sceneItemTransform);
|
||||
obs_sceneitem_set_info2(data->sceneItem, data->sceneItemTransform);
|
||||
|
||||
if (data->sceneItemCrop)
|
||||
obs_sceneitem_set_crop(data->sceneItem, data->sceneItemCrop);
|
||||
|
@ -50,7 +50,7 @@ json Utils::Obs::ObjectHelper::GetSceneItemTransform(obs_sceneitem_t *item)
|
||||
|
||||
obs_transform_info osi;
|
||||
obs_sceneitem_crop crop;
|
||||
obs_sceneitem_get_info(item, &osi);
|
||||
obs_sceneitem_get_info2(item, &osi);
|
||||
obs_sceneitem_get_crop(item, &crop);
|
||||
|
||||
OBSSource source = obs_sceneitem_get_source(item);
|
||||
|
Reference in New Issue
Block a user