jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,608 Commits 1 Branch 0 Tags
Commit Graph

7608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim
d13f204488
Merge pull request #2257 from Xaymar/fix-remove_by_name-corruption 
libobs: Don't corrupt obs_properties in ..._remove_by_name
 2020-02-15 20:03:58 -08:00
Jim
46b652ad2d
Revert "mac-vth264: Manually mark priority bits for frames" 2020-02-15 19:52:02 -08:00
Jim
da326f63f5
Merge pull request #2402 from WizardCM/mouse-hotkey-resize 
UI: Allow resizing docks when hotkeys are disabled
 2020-02-13 23:40:42 -08:00
Richard Stanway
42ed6ffffb UI: Fix preview not being disabled when minimized 2020-02-13 23:18:40 +01:00
jp9000
6970cc32c2 libobs: Remove unused variable 2020-02-12 18:31:18 -08:00
jp9000
ff22c20019 libobs: Fix audio keyframe issue 
Audio packets are always considered keyframe packets, so if they weren't
already, mark them as keyframe packets.
 2020-02-12 18:27:42 -08:00
Matt Gajownik
a77c6aafde UI: Allow resizing docks when hotkeys are disabled 
Fixes #2194
 2020-02-13 12:28:48 +11:00
Jim
677ac95b80
Merge pull request #2394 from cg2121/media-source-callbacks 
obs-ffmpeg: Use callbacks when starting/ending
 2020-02-12 10:53:54 -08:00
Jim
c2c7419e5f
Merge pull request #2400 from wahajdar/rtmp-services-Updating-Castr.io-ingests 
rtmp-services: updating castr.io rtmp ingests
 2020-02-12 10:53:31 -08:00
Jim
695ec9c959
Merge pull request #2399 from tlivegaming/master 
rtmp-services: Add Madcat
 2020-02-12 10:53:02 -08:00
Jim
d1a4208734
Merge pull request #2397 from PivanInteractive/master 
rtmp-services: Uncanny.gg
 2020-02-12 10:52:42 -08:00
tlivegaming
7c4056e4c1 rtmp-services: Add Madcat 2020-02-12 15:11:17 +08:00
Wahaj Dar
c6b1f0fa64 rtmp-services: updating castr.io rtmp ingests 2020-02-12 12:06:34 +05:00
jake-shomer
955db2986f rtmp-services: Uncanny.gg 2020-02-11 18:09:07 -07:00
Clayton Groeneveld
0b3a1711d0 obs-ffmpeg: Use callbacks when starting/ending 2020-02-10 23:49:05 -06:00
Jim
0f272de065
Merge pull request #2393 from cg2121/simplify-media-code 
deps/media-playback: Simplify seek/time code
 2020-02-10 21:36:06 -08:00
Clayton Groeneveld
9730b270a7 deps/media-playback: Simplify seek/time code 2020-02-10 23:03:04 -06:00
jp9000
94d4bfdb1c libobs: Restore order 2020-02-09 18:36:58 -08:00
Jim
1b463bcbbb Merge pull request #2391 from DDRBoxman/cifix 
CI: Fail osx and linux on build failures. Fix decklink clang-format
 2020-02-09 18:33:25 -08:00
Colin Edwards
fadbbc9588 CI: Fail osx and linux on build failures. Fix decklink clang-format 2020-02-09 20:02:13 -06:00
Jim
82c3b3c817
Merge pull request #2392 from tbodt/mac-panels-fix 
UI: Add missing function delcaration
 2020-02-09 17:47:46 -08:00
Theodore Dubois
c5b0da7d13 UI: Add missing function declaration 
This broke the build, but due to an issue with CI this was not caught by
CI.
 2020-02-09 17:25:31 -08:00
jp9000
1b275054bc decklink: Fix formatting 2020-02-09 16:51:05 -08:00
Jim
18030527f3
Merge pull request #2389 from DDRBoxman/decklinkversion 
decklink: Log decklink API version on plugin load
 2020-02-09 16:33:45 -08:00
Jim
6a561f7ae8 Merge pull request #2386 from tbodt/mac-panels 
UI: Add Chromium-compatible NSApplication subclass
 2020-02-09 16:32:54 -08:00
Colin Edwards
8090ebffb1 decklink: Log decklink API version on plugin load 2020-02-09 17:24:40 -06:00
Theodore Dubois
bd3cbf23ad UI: Add Chromium-compatible NSApplication subclass 
This fixes some crashes in browser panels on Mac, but it's also harmless
if browser panels aren't enabled.
 2020-02-09 00:02:09 -08:00
Jim
9abfe465fc Merge pull request #2385 from zavitax/fix_group_api 
libobs: fix obs_sceneitem_group_XXX_item API
 2020-02-08 12:00:01 -08:00
Ilya Melamed
9f035e430c libobs: fix obs_sceneitem_group_XXX_item API 
`obs_sceneitem_group_add_item` and `obs_Sceneitem_group_remove_item`
were leaving the affected scene in an inconsistent state.

To resolve, simplify and make the code more readable, we replace the
manual linked lists mutation with existing `detach_sceneitem` and
`attach_sceneitem` calls.
 2020-02-08 13:17:02 +02:00
jp9000
9f297dde2c docs/sphinx: Fix missing parameter in documentation 2020-02-08 01:51:51 -08:00
Jim
e73e76048e
Merge pull request #2382 from jpark37/mac-linker-fix 
libobs: Fix Mac linker error
 2020-02-07 18:19:37 -08:00
jp9000
99e639015f libobs: Add group functions that can signal refresh 
Adds API:
obs_scene_add_group2
obs_scene_insert_group2
obs_sceneitem_group_ungroup2

These functions should be used by plugins if they need to use these
functions and need to send a refresh signal.  If a major API rework ever
happens the old functions should be removed.  The old functions should
eventually be deprecated.

The reason why specifying a 'signal' parameter is useful is because it's
a bit more seamless for the user interface to be able to have custom
handling of these specific cases.  It looks better and doesn't require
completely erasing/recreating the entire list, which is visually
unappealing.
 2020-02-07 16:45:04 -08:00
jp9000
93e2aa1d00 libobs: Make group subitem add/remove funcs signal refresh 
Fixes a bug where the UI would not know that a group had been updated.
 2020-02-07 16:44:48 -08:00
jp9000
7c9d227f1e UI: Watch for refresh signal in source list 2020-02-07 16:44:48 -08:00
jp9000
6d0ef75663 libobs: Add refresh signal to scenes 
This signal is used to specify when a scene needs a full refresh of its
item list.
 2020-02-07 16:35:20 -08:00
jp9000
5027709320 docs/sphinx: Fix typo 2020-02-07 16:21:34 -08:00
jpark37
85c9ccb753 libobs: Fix Mac linker error 
Non-static inline functions don't work for some reason.
 2020-02-06 12:51:20 -08:00
Jim
ff5f7064f5
Merge pull request #2381 from exeldro/docs 
docs/sphinx: add media controls and source icon
 2020-02-06 10:57:12 -08:00
Exeldro
5c30f8343e docs/sphinx: add media controls 2020-02-06 18:44:04 +01:00
Exeldro
1564eb63e7 docs/sphinx: add source icon 2020-02-06 17:51:56 +01:00
Jim
d75245f017
Merge pull request #2264 from jpark37/mac-context-share 
Fix OpenGL thread-safety on Mac to use latest Xcode
 2020-02-05 14:33:27 -08:00
Jim
7808c6d338
Merge pull request #2372 from obsproject/readme-update 
README.rst: Remove retired CI services
 2020-02-05 13:22:39 -08:00
Jim
ead2cbc2e1
Merge pull request #2373 from WizardCM/multi-portable-warning 
UI: Use absolute path for portable mode multi-instance check
 2020-02-05 12:56:56 -08:00
Jim
6852051f84
Merge pull request #2371 from WizardCM/aap-source-icons 
UI: Show source icons in Advanced Audio Properties
 2020-02-05 12:55:25 -08:00
Rodney
56546dd893 README.rst: Remove retired CI services 
Travis and AppVeyor have been retired in favor of Azure Pipelines.

Also re-order Crowdin and Discord badges and fix indentation of Azure image.
 2020-02-05 12:47:28 -08:00
Jim
83a74b8967
Merge pull request #2375 from cg2121/tr-disabled-fix 
UI: Fix transitions being disabled
 2020-02-05 12:40:58 -08:00
Jim
3f82d05c0e
Merge pull request #2370 from notr1ch/speedy-capture-updates 
win-capture: Faster display / window capture updates
 2020-02-05 11:53:40 -08:00
Jim
1b7345e09a
Merge pull request #2369 from notr1ch/always-prompt-for-updates 
UI: Always prompt when updates are available
 2020-02-05 11:53:02 -08:00
Jim
0c4bdde153
Merge pull request #2365 from cg2121/media-stuff 
obs-ffmpeg, vlc-video: Add media control support
 2020-02-05 11:52:02 -08:00
Clayton Groeneveld
abcff0073c obs-ffmpeg: Add media hotkeys 2020-02-05 08:14:51 -08:00