starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-26 17:30:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,464 Commits 20 Branches 255 Tags
88da9bf6935cb905a5a71841696f4eebf3cef122
Commit Graph
8464 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Clayton Groeneveld 88da9bf693 Revert "image-source: Add proc handler calls to slideshow" 
This reverts commit 1475f756f2.
 2020-08-14 13:35:45 -05:00
Matt Gajownik c9001d0f98 Merge pull request #3273 from PatTheMav/macos-streamdeck-fix 
CI: Add QtNetwork to bundle to restore Streamdeck support
 2020-08-13 13:34:01 +10:00
PatTheMav 12c3d92345 CI: Add QtNetwork to bundle to restore Streamdeck support 2020-08-12 11:20:50 +02:00
Jim c5b3125b75 Merge pull request #3253 from JohannMG/mac-decklink-warnings 
mac-decklink: Fix C++ virtual function warnings
 2020-08-11 18:09:31 -07:00
Joel Bethke f1be7fe2d0 Merge pull request #3272 from cg2121/readme-remove-mantis 
README.rst: Remove Mantis
 2020-08-11 13:09:28 -05:00
Clayton Groeneveld 94ef69d022 README.rst: Remove Mantis 2020-08-11 05:11:24 -05:00
jp9000 d45017370b libobs: Add functions to get locale text from modules 
Useful for sharing translated text from modules with the frontend.  This
is technically already done via properties, but it would be nice to just
be able to explicitly look up locale text directly rather than have to
go through properties.
 2020-08-10 12:24:01 -07:00
jp9000 de2e89d972 libobs: Add function to get module pointer 
Useful for getting getting locale text associated with a specific module
 2020-08-10 12:24:01 -07:00
jp9000 f5d6a695be libobs: Add OBSRef::Get() 
Allows explicitly getting the pointer associated with the object.
 2020-08-10 12:24:01 -07:00
jp9000 1475f756f2 image-source: Add proc handler calls to slideshow 
Allows manipulation of the slideshow via procedure handlers.
 2020-08-10 12:24:01 -07:00
jp9000 389f7d390f image-source: Play if play_pause() called while stopped 
Causes the slideshow to start back up if it was stopped for whatever
reason previously.
 2020-08-10 12:23:36 -07:00
jp9000 66863269e8 UI: Add missing refresh icon to acri qss file 2020-08-10 12:23:36 -07:00
Jim a9c65aeabf Merge pull request #2955 from cg2121/group-signals 
UI: Make select/deselect signals work w/ group items
 2020-08-08 19:59:13 -07:00
JohannMG 41b12d7bff mac-decklink: Fix C++ virtual function warnings 
Created another virtual function to override and moves stubbed function
to the header.
 2020-08-06 12:53:30 -07:00
Colin Edwards d7ccac7754 Merge pull request #3258 from PatTheMav/macos-qt-dylib-fix 
CI: Update macOS deps version to fix unmet Qt plugin dependencies
 2020-08-06 14:11:47 -05:00
PatTheMav bc3a405445 CI: Update macOS deps version to fix unmet Qt plugin dependencies 2020-08-06 20:03:05 +02:00
Jim bfdf5dc947 Merge pull request #2356 from jpark37/sycc-color-space 
Color space refinements
 2020-08-05 08:58:21 -07:00
jp9000 1aee73fcfc UI: Clarify and improve locale text 
Renaming it to prevent possible confusion with the source context
toolbar.
 2020-08-03 20:26:06 -07:00
jp9000 2f43197b26 UI: Move View -> Toolbars -> Listboxes 
Moves View -> Toolbars -> Listboxes to View -> Listbox Toolbars
 2020-08-03 19:09:38 -07:00
jp9000 6d758f6f5d UI: Remove unused action 2020-08-03 18:23:50 -07:00
Jim 2e4e986dc0 Merge pull request #3238 from kkartaltepe/unused-var 
UI: Remove unused variable
 2020-08-02 21:36:34 -07:00
Kurt Kartaltepe fe596b2588 UI: Remove unused variable 2020-08-02 12:39:28 -07:00
Jim 478f1de846 Merge pull request #2939 from cg2121/log-viewer 
UI: Add log viewer window
 2020-08-01 12:17:48 -07:00
Clayton Groeneveld 040e445617 UI: Add log viewer window 2020-07-31 19:57:12 -07:00
Jim 3107eda0d2 Merge pull request #2961 from cg2121/transitions-dock 
UI: Redesign transitions dock
 2020-07-31 11:19:55 -07:00
Clayton GroeneveldandJim d5905039c9 UI: Redesign transitions dock 
Co-authored-by: Jim <obs.jim@gmail.com>
 2020-07-31 09:48:09 -07:00
Jim 7092039f55 Merge pull request #3229 from khng300/use_new_scaling_func 
oss-audio: Use util_mul_div64() to do time scaling
 2020-07-31 07:33:02 -07:00
jp9000 22ebba0454 UI: Use case-insensitive sort for "show all" services 2020-07-30 21:19:24 -07:00
Jim 81e4211f64 Merge pull request #3202 from cg2121/screenshot-output 
UI: Add ability to make screenshots
 2020-07-30 18:31:25 -07:00
Clayton GroeneveldandJim a70014d7b2 UI: Add ability to make screenshots 
Co-authored-by: Jim <obs.jim@gmail.com>
 2020-07-30 17:41:43 -07:00
Clayton Groeneveld cc565653d3 UI: Simplify path generation code 2020-07-30 17:41:43 -07:00
Ka Ho Ng b1504b0278 oss-audio: Use util_mul_div64() to do time scaling 
util_mul_div64() is a new helper to do scaling. This commit sweeps the
oss-audio plugin code to generalize the way of doing scaling.
 2020-07-31 02:00:40 +08:00
jp9000 4b17b82aab obs-ffmpeg: Set async video frame immediately when seeking 2020-07-29 13:59:49 -07:00
jp9000 bff7ae89ad deps/media-playback: Add seek callback 
Allows setting the current frame directly when seeking. If not set, will
just use preload if avaialble.
 2020-07-29 13:59:49 -07:00
jp9000 d117908440 libobs: Add func to set async video frame immediately 
Allows the ability to directly override the current async frame
immediately.
 2020-07-29 13:59:49 -07:00
Jim 80bb9b4675 Merge pull request #3206 from notr1ch/frame-fix-squashed 
Fix preloaded video behavior
 2020-07-29 13:57:52 -07:00
Joel Bethke 2f9b57ab8f Merge pull request #3228 from PatTheMav/ci-brew-bundle-fix 
CI: Fix Brew Bundler breaking without prior brew update
 2020-07-29 14:15:17 -05:00
PatTheMav 07a899413a CI: Fix Brew Bundler breaking without prior brew update 2020-07-29 20:30:57 +02:00
antho dcb085a0f9 rtmp-services: Add api.video service 
Closes obsproject/obs-studio#3227
 2020-07-29 11:06:05 -07:00
Jim 086263024f Merge pull request #3221 from jtopper/20200727_no_really_always_on_top 
UI: Make macOS 'always on top' more aggressive
 2020-07-27 17:39:49 -07:00
Jon Topper 87e90ee8a4 UI: Make macOS 'always on top' more aggressive 
Applications like Keynote, in full screen mode, cover up OBS.

This change forces windows that have been set as 'always on top' (eg.
projector windows) to sit above Keynote's full screen view by
manipulating the NSWindow's level attribute.
 2020-07-27 16:37:36 -07:00
Jim a41048b486 Merge pull request #3198 from AngeredZeus/master 
UI: Fix clickable text on boolean properties with tooltips
 2020-07-27 16:12:38 -07:00
AngeredZeus 4011e25e40 UI: Fix clickable text on properties with tooltips 2020-07-27 15:25:42 -07:00
Jim eac9cc2476 Merge pull request #3219 from Uro1/patch-1 
libobs: Add util/sse2neon.h to CMakeLists.txt
 2020-07-27 12:37:28 -07:00
Uro 5fd51eab31 libobs: Add util/sse2neon.h to CMakeLists 
Add util/sse2neon.h to libobs_util_HEADERS in CMakelists.txt. The
previous patch #3180 for arm/rpi support was missing this in
libobs/CMakeLists.txt, and as a result plugins such as obs-websocket,
obs-ndi fail to compile on arm/rpi as the header is not copied with the
install.
 2020-07-27 11:47:29 -07:00
Jim e394206132 Merge pull request #3208 from brittneysclark/qsv_fix_ui_settings 
obs-qsv11: Fix bug mapping old qsv settings to new
 2020-07-27 07:20:27 -07:00
brittneysclark d04e167ed0 obs-qsv11: Fix bug mapping old qsv settings to new 
Fix for an issue found where new "Latency" and "Subjective Video
Enhancement" options where always using default settings even after
being changed in UI. This issue was introduced when mapping old QSV
settings to new ones.
 2020-07-27 06:12:03 -07:00
Jim f22cde5073 Merge pull request #3214 from jpark37/vulkan-family-cleanup 
win-capture: Make Vulkan frame data local to queue
 2020-07-27 05:19:28 -07:00
jpark37 04b9b9fea3 win-capture: Make Vulkan frame data local to queue 
Prevents multiple queues in the same family from racing on frame data.

Removal of vk_family_data also fixes broken capacity calculation. Two
queue families can share the same index if one is "protected-capable"
and the other isn't.
 2020-07-26 13:33:01 -07:00
jpark37 e6896d79e3 win-capture: Hide Vulkan linked list internals 2020-07-26 13:32:53 -07:00