Commit Graph

8978 Commits (979054cc8c8f3d080618c99f20b807c7cf4233e6)

Author SHA1 Message Date
Clayton Groeneveld ecb71e32d1 UI: Set restart state when there is no media
When there is no media, set the media to the restart state.
Currently, this only affects the VLC source, as the media
source doesn't use the OBS_MEDIA_STATE_NONE, at this time.
2020-09-03 17:09:31 -05:00
Jim ace0faebd8
Merge pull request #3377 from WizardCM/toolbar-fixes
UI: Don't save invalid colors via Source Toolbar (Freetype 2 Source)
2020-09-03 13:42:17 -07:00
Jim a1434fe443
Merge pull request #3397 from cg2121/fix-stats-bug
UI: Fix rec time left not showing in stats
2020-09-03 07:48:51 -07:00
Jim 44bdf60d06
Merge pull request #3394 from cg2121/fix-leak
UI: Fix memory leak when dropping files
2020-09-03 07:45:59 -07:00
Jim a66a8da093
Merge pull request #3383 from Programatic/warning_fix
UI: Fix compiler warning about needing parenthesis
2020-09-03 07:44:24 -07:00
Jim 9af5edc6e2
Merge pull request #3393 from Programatic/crash_fix
UI: Fix source ref bug causing crash on exit
2020-09-03 07:43:46 -07:00
jp9000 7286ee427a UI: Make SetupOutputs virtual instead of ignoring vcam
In 218b936b1d, the virtual camera was ignored when checking the active
state, which is kind of a lackluster solution.  Instead, this makes
SetupOutputs() a virtual function, and calls it before starting the
virtual camera to be more consistent with the rest of the outputs.
2020-09-03 06:56:03 -07:00
Matt Gajownik cefc8cc767 UI: Save Freetype Text source color from Source Toolbar 2020-09-03 23:09:45 +10:00
jp9000 bdd6562a94 win-capture: Put window capture update data in a mutex
Because the window capture source updates its data whenever certain
properties are modified, this would cause a race condition because
source updates normally happen in the graphics thread.  To solve this
for the time being, put access to that data within a mutex when updating
or updating visibility.
2020-09-03 05:49:58 -07:00
jp9000 b99613b677 UI: Fix auto-remux not working w/ slash filesnames
When the feature was added to allow slashes in recording/replay
filenames to automatically create directories, auto-remux was not
accounted for, and all filenames were assumed to be complete.  It used
fi.completeBaseName() to construct the new name which would only add the
last part after the last slash as the filename, causing the remuxed file
to save in the base directory rather than the intended directory.  This
fixes that by simply using the input string as the output string,
removing the extension, appending the new extension.
2020-09-03 05:49:58 -07:00
jp9000 4869167f5c UI: Do not show tray icon if not active
Because the virtual camera stops immediately when you call
obs_output_stop() rather than with a delay like other outputs, it
exposed a bug where the tray icon would show OBS as active when stopping
the source, regardless of the fact that it was stopped.  The bug was
that the expression used to activate the tray icon did not check to make
sure that the output was actually active, so add that to the expression.
2020-09-03 05:49:58 -07:00
jp9000 28f56c0201 UI: Do not show media controls on network media source 2020-09-03 05:49:58 -07:00
jp9000 218b936b1d UI: Fix crash when starting vcam before other outputs
The BasicOutputHandler::Active() function was used for checking whether
outputs had started or not.  However, the virtual camera is not used in
the subclasses; instead it's a part of the base class.  Because of that
fact, when the virtual camera is started, the procedures used to start
up the other outputs are never called, causing outputs to crash because
they hadn't been initialized properly.  For example, starting the
virtual camera, then starting stream/recording would crash.

So, as a simple fix to this, when checking the active status in the
derived classes, do not factor in the virtual camera.
2020-09-03 05:49:58 -07:00
jp9000 1cdf16bac5 UI: Fix maximum size on image source toolbar
The edit widget on the image source toolbar had a maximum width set,
which caused the layout for the toolbar to look ugly if it hit that
maximum width.
2020-09-03 05:49:58 -07:00
jp9000 55c21319e0 UI: Fix source toolbar color selection on color source
When selecting a color on the color source, if you pressed cancel, it
would cause it to set the color to black.  Instead, make sure to check
isValid() on the returned color value to see if the user pressed cancel
when selecting a color.
2020-09-03 05:49:58 -07:00
Clayton Groeneveld 8a3b3da5e4 UI: Fix studio mode load bug
This fixes a bug where studio mode where it would transition
to the preview scene when loaded instead of using previous
program scene.
2020-09-02 22:53:35 -05:00
Clayton Groeneveld f3501976d7 UI: Fix rec time left not showing in stats
If a user would start recording, then open the stats dialog,
the recording time left would be blank.
2020-09-02 18:49:13 -05:00
Richard Stanway c13357ff91 vlc-video: Fix format conversion typos
Introduced by 8b632fa227
Fixes https://github.com/obsproject/obs-studio/issues/3396
2020-09-03 01:13:33 +02:00
Clayton Groeneveld fd0872d630 UI: Fix memory leak when dropping files
This fixes a memory leak when dropping files when the name
is the same as other sources.
2020-09-02 15:08:32 -05:00
Programatic 642dff054d UI: Fix source ref bug causing crash on exit 2020-09-02 12:50:36 -05:00
Tim Vaca f694f94b14 mac-capture: Filter non-trivial windows
Filter the window list provided by the OS to prevent listing icons and
system windows as possible window capture targets.

Fixes #3146.
2020-09-02 11:13:33 -04:00
Jim 4aa6610bf4
Merge pull request #3386 from jpark37/vulkan-instance-fallback
Vulkan instance fallback, and uninitialized member fix
2020-09-01 21:40:34 -07:00
jpark37 94475b8795 win-capture: Fix Vulkan crash on minimize restore
Set uninitialized data members to avoid crash coming back from minimize.
2020-09-01 20:20:59 -07:00
jpark37 7a66466efc win-capture: Add Vulkan instance creation fallback
Fall back to original arguments if our 1.1 API request doesn't work.
2020-09-01 18:59:13 -07:00
jpark37 e905b4cb6e win-capture: Vulkan variable naming consistency 2020-09-01 18:56:14 -07:00
Programatic e1fd89a4e5 UI: Fix compiler warning about needing parenthesis
It was the only thing blocking me from a clean and satisfying compile.
2020-09-01 12:53:25 -05:00
Dillon Pentz 6df30951f5
Merge pull request #3371 from VodBox/docs-fix
docs/sphinx: Fix errors with scripting and properties.
2020-08-31 12:11:18 +12:00
VodBox a78162991a docs/sphinx: Fix mismatched typedefs 2020-08-31 12:07:19 +12:00
VodBox bc084bc10b docs/sphinx: Fix incorrect callback information 2020-08-31 12:02:11 +12:00
Clayton Groeneveld 8fab74d234 CI: Remove clang format Mac check
It is kind of pointless to have the Mac clang format check
when there is already one on Linux.
2020-08-30 04:39:54 -05:00
Richard Stanway 288a84dc95 win-dshow: Add file description for virtual camera DLL 2020-08-29 03:04:44 +02:00
Matt Gajownik 3370e8fc12 obs-vst: Support older Qt versions 2020-08-29 10:56:12 +10:00
Richard Stanway 21fb1e770e win-dshow: Use constant reference for virtualcam CLSID 2020-08-29 02:46:03 +02:00
Richard Stanway 4c08c7bfa4 win-dshow: Reduce size of virtualcam placeholder image 2020-08-29 02:42:03 +02:00
Richard Stanway c8f7a4563d libobs: Check data validity for media sources 2020-08-29 02:42:03 +02:00
Richard Stanway 8b632fa227 vlc-video: Fix possible undefined behavior in format conversion
Casting from char[] to uint32_t * is considered undefined behavior due
to different alignment requirements. Instead of using char[] for the new
value, this uses a macro to set a uint32_t directly.

Issue detected by PVS Studio.
2020-08-29 02:42:03 +02:00
Matt Gajownik 94ca885bda obs-vst: Fix VST detection in home directory on Linux 2020-08-29 09:38:57 +10:00
Matt Gajownik ff69ff72f5 obs-browser: Update to 2.8.7
This contains a fix for Unicode CSS
2020-08-29 09:35:31 +10:00
Colin Edwards 9b07104357
Merge pull request #3354 from WizardCM/macos-deps-08
CI: Update macOS deps to fix crash from invalid linking
2020-08-28 10:38:46 -05:00
Matt Gajownik 592b75d89a CI: Update macOS deps to fix crash from invalid linking 2020-08-29 00:40:45 +10:00
Jim 87125984ee
Merge pull request #3350 from kkartaltepe/noise_cmake
obs-filters: Cleanup CMake
2020-08-27 10:18:38 -07:00
Jim 6efd70fc01
Merge pull request #3260 from jpark37/vulkan-cts-hack-remove
win-capture: Remove Vulkan CTS workaround
2020-08-27 10:18:08 -07:00
Kurt Kartaltepe a2f5c323da obs-filters: Cleanup CMake
This file has become a mess of people hacking in fixes so this cleans it
up to make sense again.
2020-08-27 09:02:36 -07:00
Jim f9d664302e
Merge pull request #3349 from WizardCM/fix-settings-tab-order
UI: Add missing tab stop fields in Settings
2020-08-27 06:31:25 -07:00
Jim 6999f6a4bd
Merge pull request #3344 from admshao/fix-compiling-warnings
Fix compiling warnings
2020-08-27 05:14:58 -07:00
Jim 02ae365857
Merge pull request #3346 from ElectronicWar/add-hags-logging
libobs: Log Windows 10 Hardware GPU Scheduler
2020-08-27 05:11:26 -07:00
Matt Gajownik 1f1e0ceb47 UI: Add missing tab stop fields in Settings 2020-08-27 21:17:35 +10:00
Shaolin 5ff82bb9fe UI: Fix compile warnings about deprecated QT usage 2020-08-26 23:20:23 -03:00
Manuel Kroeber 618781e563 libobs: Log Windows 10 Hardware GPU Scheduler
This adds logging for the "Hardware-accelerated GPU Scheduler" (HAGS)
introduced with Windows 10 2004 which is known to cause issues with OBS
and game performance.
2020-08-26 22:57:52 +02:00
Matt Gajownik f319b96678
Merge pull request #3336 from PatTheMav/ci-macos-script-update
CI: Update macOS CLI build script
2020-08-26 21:55:14 +10:00