mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code
14,217 Commits 16 Branches 211 Tags 169 MiB
600a564039
Commit Graph

14217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruwen Hahn
600a564039 UI: Add composition_gpu_index to multitrack video postdata 2024-06-14 20:08:26 -04:00
Alex Luccisano
d7e2636316 UI: Change multitrack video configId 
Schema has changed this field from "obsConfigId" to
"clientConfigId". Updated the name to match.
 2024-06-14 20:08:26 -04:00
derrod
d2a7f01295 updater: Use static blake2 and fix building with Debug runtimes 2024-06-14 18:10:04 -04:00
derrod
2d489fc54e deps/blake2: Add static blake2 library for Windows updater 2024-06-14 18:10:04 -04:00
Ruwen Hahn
e4305b0a50 UI: Hide multitrack video options for custom output 
Custom output doesn't currently allow specifying a config URL, so
disable relevant settings for now
 2024-06-14 17:39:11 -04:00
tytan652
508f9c2e3c obs-scripting: Refactor Lua C paths 2024-06-14 17:34:14 -04:00
tytan652
b16516a3fa Revert "cmake: Fix script plugin path on Linux with CMake 3" 
This reverts commit 7a4cb085ba.
 2024-06-14 17:34:14 -04:00
Ruwen Hahn
40bf8b3c06 UI: Make audio_configurations.vod optional 
This is only required if VOD is supported by the service and VOD
track is enabled; otherwise there's no need to supply the key
or an empty array
 2024-06-14 17:33:31 -04:00
Ryan Foster
021adac2d0 UI: Fix submenu arrow indicator position in menus 
Commit b11d61c89f added padding-right to
provide some minimal padding for this element. This was seemingly
accounted for in the Yami Base Theme (Yami.obt), but was missed in the
Yami Classic Variant Theme (Yami_Classic.ovt).

Re-add the padding-right to restore the padding.
 2024-06-14 14:43:40 -04:00
Ryan Foster
b1643c2ac9 UI: Add unit suffix to Multitrack Video bitrate limit control 2024-06-14 14:42:03 -04:00
Andrew Francis
14d2c80560 UI: Re-arrange multitrack-video schema to version 2024-06-04 
Co-authored-by: Ruwen Hahn <haruwenz@twitch.tv>
 2024-06-14 13:12:19 -04:00
Andrew Francis
ce4171908b UI: Remove default values from multitrack-video.hpp 
These are always overridden in goliveapi-postdata.cpp

Co-authored-by: Ruwen Hahn <haruwenz@twitch.tv>
 2024-06-14 13:12:19 -04:00
Ryan Foster
77d31fa33f UI: Restore visibility of Advanced Settings warning 
The warning message when changing Advanced settings that require a
restart was lost. Restore it.

Amends commit 7d55942601.
 2024-06-13 14:42:25 -04:00
Ryan Foster
70307a5d25 CI: Add updateChannel to check-tag in Publish workflow 
This was missing even though we try to set it later.
 2024-06-13 13:28:04 -04:00
Ryan Foster
0ea90380b4 Revert "CI: Remove redundant checkout step in Windows Patches job" 
This reverts commit 8fcdfb815f.

This checkout is not redundant. It is required so that the
windows-patches action files can actually be found.
 2024-06-12 19:41:48 -04:00
Ryan Foster
8fcdfb815f CI: Remove redundant checkout step in Windows Patches job 2024-06-12 19:04:24 -04:00
derrod
718bd0b265 UI: Use unique_ptr for theme objects 2024-06-12 18:41:11 -04:00
derrod
4a46d2d722 UI: Fix themeDir buffer being resized incorrectly 
c677bac875 changed the order here, but
this also resulted in the string having whatever size was necessary for
the install data path, rather than being large enough to fit a userdata
path. To fix this, move the resize operaetion *after* the buit-in
themes are searched, and also bump it to 1024 just to be sure.

This resulted in a crash due to a bug in os_get_path_internal() which
will need to be fixed separately.
 2024-06-12 17:57:02 -04:00
Ryan Foster
e454f488aa obs-websocket: Update version to 5.5.1 
Changelog:
obsproject/obs-websocket@f8bc7c4f59
 2024-06-11 19:05:02 -04:00
derrod
21adf0930f UI: Prevent recursion in theme dependencies 2024-06-11 18:25:40 -04:00
Ryan Foster
cfd692ca15 updater: Fix defaultlib conflict 
Trying to build in Debug fails due a default lib conflict:
LNK4098: defaultlib 'MSVCRTD' conflicts with use of other libs; use
/NODEFAULTLIB:library

Instead, we can set the updater to always use /MT instead of /MTd.
 2024-06-11 18:25:05 -04:00
Ruwen Hahn
0f4e33c33e UI: Discard state if stream attempt is canceled 
Repro steps:
1. Enable an incompatible setting in settings
2. Start stream, hit cancel on incompatible settings dialog
3. Disable incompatible setting in settings
4. Start stream -> crash
 2024-06-11 13:27:15 -04:00
derrod
0cfae862cd updater: Compile with static VC runtime 2024-06-11 13:24:07 -04:00
derrod
6779052902 updater: Check and update VC runtime version 2024-06-11 13:24:07 -04:00
Ryan Foster
051c11e7b2 UI: Translate Multitrack Video error dialog buttons 
The Yes and No standard buttons are not translated unless we manually
set the translated text ourselves.
 2024-06-11 13:22:31 -04:00
Ryan Foster
e774bd90b8
Merge pull request #10819 from derrod/update-bouf 
CI: Update bouf release
 2024-06-10 17:33:50 -04:00
derrod
5bc1d31a98 CI: Update windows signing workflow commit 2024-06-10 17:25:25 -04:00
derrod
d2b05a6e0c CI: Update bouf release in Windows Signing action 2024-06-10 17:21:36 -04:00
derrod
86502764b9 obs-ffmpeg: Set encoder error message for CUDA errors 2024-06-10 17:08:57 -04:00
tytan652
c677bac875 UI: Avoid allowing to override provided themes 2024-06-10 17:01:21 -04:00
derrod
00c68981ab UI: Check VC++ Runtime version on startup 2024-06-10 16:51:50 -04:00
Warchamp7
4e13cff8f1 UI: Center widgets in vertical mixer layout 2024-06-10 16:48:32 -04:00
gxalpha
c7dc09e862 UI: Fix mute checkbox positioning on macOS 
Likely related to QTBUG-2699, QMacStyle appears to screw up the size of
this checkbox. Ignoring the style's layout rect fixes this.
 2024-06-10 16:48:32 -04:00
Warchamp7
a989fefa0b UI: Fix audio meter and slider blocking mousewheel 2024-06-10 16:48:32 -04:00
Warchamp7
86c337d4e7 UI: Adjust audio mixer slider size and spacing 2024-06-10 16:48:32 -04:00
Warchamp7
56d6fb4c62 UI: Group horizontal audio mixer buttons 2024-06-10 16:48:32 -04:00
tytan652
4b187ed38c cmake: Copy shared library soname file to rundir on Linux 
Soname files are required since 1d8c377240
 2024-06-10 16:32:11 -04:00
Warchamp7
7d55942601 UI: Clean up Settings widget structure and styling 2024-06-10 15:33:50 -04:00
gxalpha
14fa71f749 UI: Connect replay buffer stopping to signal instead of slot 2024-06-09 16:12:02 -04:00
derrod
0680b642e9 UI: Always show chapter marker hotkey 2024-06-08 17:03:09 -07:00
gxalpha
298e858f63 UI: Improve macOS properties tooltip spacing workaround 
QMacStyle appears to have an issue where it messes up the positions of
some widgets. The previous workaround added extra spacing to force the
icon further to the right. Forcing the widget rectangle to be used
instead of the one made by the style also fixes this, arguably in a
nicer way.
See also b760b24ff0 which does this for
checkboxes in the source tree.
 2024-06-08 16:59:38 -07:00
tytan652
7a4cb085ba cmake: Fix script plugin path on Linux with CMake 3 2024-06-08 17:08:25 -04:00
Richard Stanway
f9f4171d56 UI: Add null checks before doing some API calls 
Harmless, but generated a debug warning for null pointers passed into
the API.
 2024-06-08 15:25:04 -04:00
derrod
51e3bd5e3d UI: Remove unnecessary string copy from log filter 2024-06-08 14:06:23 -04:00
derrod
30f174b8bb CI: Fix input variable name when getting Windows release notes 2024-06-08 13:25:17 -04:00
Ryan Foster
dab4349e05 CI: Fix incorrect filenames in release creation 
Follow-up to fb4d65875e.
 2024-06-07 19:40:18 -04:00
Ryan Foster
5ef97920c3 libobs: Update version to 30.2.0 2024-06-07 17:55:37 -04:00
derrod
28f056882a UI: Fix multitrack stream key query parameter concatenation 2024-06-07 17:36:55 -04:00
derrod
6d3a645bbf CI: Restrict PVS-Studio analysis to obsproject repo 2024-06-07 16:09:19 -04:00
derrod
c1fdbf064f UI: Simplify multitrack encoder availability check 2024-06-07 16:00:42 -04:00