Commit Graph
7755 Commits
Author SHA1 Message Date
Jim 005de86f21 Merge pull request #2463 from jpark37/filter-ref-count
libobs: Only manipulate input source ref counts
2020-03-06 03:39:06 -08:00
Jim 890e63379b Merge pull request #2462 from jpark37/vulkan-null-fix
win-capture: Handle NULL VkApplicationInfo
2020-03-06 03:38:49 -08:00
Jim a373267c17 Merge pull request #2459 from VodBox/sl-scene-source-fix
UI: Fix scenes as sources for SL import
2020-03-06 03:38:30 -08:00
jpark37 6d5bb8b244 libobs: Only manipulate input source ref counts
Filters can be hidden without being shown, which can unbalance the ref
count and destroys them prematurely. We really only care about input
sources having a chance to clean up from the render thread from the hide
handler, Windows 10 window capture specifically.
2020-03-06 01:14:38 -08:00
jpark37 c706a7bed5 win-capture: Handle NULL VkApplicationInfo 2020-03-05 21:20:00 -08:00
Jim 325e0586bb Merge pull request #2461 from cg2121/fix-override
UI: Fix override transition not working
2020-03-05 17:11:04 -08:00
Clayton Groeneveld 18f41afa18 UI: Fix override transition not working 2020-03-05 16:42:25 -06:00
Jim 9719fb26ca Merge pull request #2460 from cg2121/t-bar-fix
UI: Do not disable t-bar
2020-03-05 10:57:41 -08:00
Clayton Groeneveld b240a5671b UI: Do not disable t-bar 2020-03-05 09:11:17 -06:00
VodBox 7553fda3e5 UI: Fix scenes as sources for SL import
The previous fix for repeated names accidentally meant that if a scene
item in a scene was meant to show another scene that was lower in the
list, it would fail to create the item, and wouldn't make it into the
imported collection.

This fix makes sure that scenes as sources still works properly in that
situation.
2020-03-05 22:38:45 +13:00
waffeln 46dcc9c2fb UI: Lower minimum dock size
Closes obsproject/obs-studio#2448
25.0.0-rc2
2020-03-04 22:25:39 -08:00
jp9000 ec247ba982 win-capture: Find correct window even if it's minimized
In window capture, it will search for a window with a specific title,
but will not search minimized windows.  This fixes that by making is
acquire the correct window even if that window is minimized, rather than
potentially risk it capturing the wrong window of the same type.
2020-03-04 22:21:45 -08:00
Jim 4f6ab0b2f2 Merge pull request #2458 from pkviet/srtfix
obs-ffmpeg: Fix some incorrect settings for srt output
2020-03-04 22:18:19 -08:00
Colin Edwards f0fe107515 CI: macOS use qt 5.14.1 2020-03-04 21:48:26 -06:00
pkv 759aa079e7 obs-ffmpeg: Fix some incorrect settings for srt output
This fixes some configuration parameters which were incorrect (for audio).
2020-03-05 00:03:13 +01:00
Richard Stanway 7df435f2cf UI: Remove unused variable 2020-03-04 23:35:28 +01:00
Jim 934a9e8bae Merge pull request #2457 from VodBox/sl-dup-fix
UI: Fix importing SL collections with repeated names
2020-03-04 14:29:12 -08:00
Richard Stanway 5cfc16e9f9 UI: Call setWindowFlags before setupUi
For some reason this has a noticeable performance improvement,
presumably because Qt is notifying all the child widgets?
2020-03-04 23:20:19 +01:00
VodBox 6b5459fbe7 UI: Fix importing SL collections with repeated names 2020-03-05 10:37:37 +13:00
jp9000 eba6810423 obs-browser: Fix CEF initialization conflict
Fixes a CEF initialization issue where CefInitialize would internally
call a Chromium function that would change process permissions.  The
permissions it changed would break other functionality within the
program, such as the new window capture method based upon
Window.Graphics.Capture.
2020-03-04 06:16:10 -08:00
Jim dca56252c4 Merge pull request #2452 from WizardCM/dynamic-rename
UI: Dynamically set widget index when renaming sources
2020-03-04 01:37:33 -08:00
Matt Gajownik c50f488085 UI: Dynamically set widget index when renaming sources 2020-03-04 19:22:30 +11:00
Jim cb970d0cb9 Merge pull request #2451 from jpark37/disable-incremental-link
CMake: Disable incremental linking on Windows
2020-03-03 23:30:55 -08:00
jpark37 f3e6bfdc59 CMake: Disable incremental linking on Windows
Not compatible with /OPT:REF, and caused warnings.
2020-03-03 23:13:03 -08:00
jp9000 d5974b9e30 win-capture: Disable correct capture method index
When "Automatic" was added, the index for the item that needed to be
disabled became incorrect (to disable WCG).
2020-03-03 21:09:54 -08:00
Jim a0f700e737 Merge pull request #2450 from jpark37/opt-ref
CMake: Enable /OPT:REF for Windows
2020-03-03 20:40:35 -08:00
jpark37 9abdf2eec7 CMake: Enable /OPT:REF for Windows 2020-03-03 20:18:43 -08:00
Colin Edwards e99849e1fc CI: Remove merge conflict bot for now 2020-03-03 20:23:25 -06:00
Colin Edwards 91d5a9c895 CI: Fix some macOS build settings 2020-03-03 20:20:12 -06:00
VodBox 9aedc7e5b7 win-capture: Prevent WGC being selected when unavailable 2020-03-03 23:06:25 +13:00
Richard Stanway 8f4f33aed8 UI: Move OBSBasicSettings to scoped block
This ensures that the OBSBasicSettings destructor has been run before
the restart prompt appears, preventing bugs related to OBS shutting down
with the settings window still having active callbacks.
25.0.0-rc1
2020-03-03 00:05:43 +01:00
Richard Stanway 2f0134bf60 UI: Don't add removed sources when refreshing LoadAudioSources
This can be fired by a callback during source removal. The code was
re-adding the source that was just removed, causing the program to
freeze when trying to remove all sources.
2020-03-02 22:23:13 +01:00
Richard Stanway 2a4a46deed UI: Use invokeMethod to refresh LoadAudioSources
Sources may be removed or destroyed by other threads which resulted in
GUI calls outside of the main Qt thread.
2020-03-02 22:21:02 +01:00
Richard Stanway 57b47ca90a UI: Fix preview not being re-enabled on maximize 2020-03-01 10:02:14 -08:00
jp9000 07089873fc win-dshow: Add support for devices that relay rotation
Adds support for devices that can relay rotation, such as the Logitech
StreamCam.
2020-03-01 03:42:46 -08:00
jp9000 b9d6675e2c libobs: Add ability to rotate async sources 2020-03-01 03:39:54 -08:00
Jim 88e8ffc1e0 Merge pull request #2445 from jpark37/ffmpeg-duration-warning
obs-ffmpeg: Fix type conversion warning
2020-03-01 01:35:22 -08:00
jpark37 1121f32b40 obs-ffmpeg: Fix type conversion warning 2020-02-29 20:57:17 -08:00
jp9000 e40f2cc155 win-capture: Fix registry lookup bug
The make_filename command was misplaced.  Was meant to be right below
the get_programdata_path call.
2020-02-29 10:32:20 -08:00
Jim 1a071982aa Merge pull request #2156 from LittleMatth/master
Vulkan Game Capture
2020-02-29 05:37:44 -08:00
jp9000 7e78c17ace win-capture: Check hook version before capture init
Checks the hook version to ensure compatibility with hook DLL.  It's
unlikely it'll ever be necessary to increment the hook version, but this
is just a precautionary thing that allows a hook DLL to make sure it's
rejected by an older OBS version if needed.  Again however, very
unlikely that the major version will ever be incremented.
2020-02-29 04:53:29 -08:00
74acbd7ed0 win-capture: Add Vulkan capture
Co-authored-by: jp9000 <obs.jim@gmail.com>
Co-authored-by: jpark37 <jpark37@users.noreply.github.com>
2020-02-29 04:53:28 -08:00
jpark37 5c38c6455f win-capture: Refactor create_hook_info 2020-02-29 00:15:54 -08:00
jp9000 72e770458f win-capture: Use full DLL path for inject helper
The inject helper should be able to specify the full path rather than
assume the path of the hook DLL.  This change allows us to modify the
hook's location.  This needs to be done because the hook needs to be
relocated to ProgramData to prevent the possibility of multiple Vulkan
capture hooks.
2020-02-29 00:15:54 -08:00
jpark37 39dc64f0f8 win-capture/graphics-hook: Refactor mutex check
OpenMutex doesn't return INVALID_HANDLE_VALUE, so there's no need to
check for that.  Also only call CloseHandle if the call was successful.
2020-02-29 00:15:54 -08:00
jp9000 a20f1168a7 win-capture/graphics-hook: Don't allow multiple hooks
Prevents multiple separate hook DLLs from being loaded in to a target at
once.  This is done just in the off-chance that someone might add
another hook to the Vulkan layer registry.
2020-02-29 00:15:54 -08:00
jp9000 e55a2b4331 cmake: Add FindVulkan module 2020-02-29 00:15:54 -08:00
jp9000 675530204e libobs/util: Add dll version compare func 2020-02-28 23:48:12 -08:00
jp9000 46c8ef615d libobs/util: Use MAX_PATH for absolute path funcs
Makes these functions a bit more consistent with the rest of the
project.
2020-02-28 23:48:12 -08:00
jp9000 3e3521b9e1 win-capture/graphics-hook: Fix OBS detection
Fixes where the graphics hook would try to detect if OBS is currently
active or not.
2020-02-28 23:48:11 -08:00