Commit Graph

7460 Commits (861ebff4c912a8f413c8d54dc159502e8ba6dcee)

Author SHA1 Message Date
Clayton Groeneveld e151ce6f2a UI: Change advanced networking strings 2019-11-19 21:27:37 -08:00
derrod 3e841b221d UI: Add setting for Twitch chat add-ons choice
Both BTTV and FFZ are fairly popular however they do occasionally
interfere.  To give users the option to chose whichever one they like
most we add a new setting that allows BTTV, FFZ, both, or neither.

Defaults to "None" for new users.  Existing users will be migrated to
"Both" as that's the previous behavior.
2019-11-19 21:06:36 -08:00
jp9000 a03ade631f UI: Fix Twitch panels not using dark first time
When the panels start up for the very first time, the dark theme is not
used due to the local storage variable not being set by the first panel.
When the program is restarted, it'll be dark from then on out because
it's set by the secondary panels rather than the primary panel.  This
modifies it so that the locale storage variable is properly set by the
primary panel.
2019-11-19 20:46:44 -08:00
Kurt Kartaltepe 210ebcbda7 obs-outputs: Log FTL during configure 2019-11-18 20:37:33 -08:00
Jim 654508de7c
Merge pull request #2183 from ratwithacompiler/macos-python-fix-2
obs-scripting: Fix Python in new MacOS .app bundles
2019-11-18 19:46:09 -08:00
jp9000 c2c049c606 libobs: Remove _WIN32 ifdef from enum
Ensures that hotkeys cannot become invalid if config data is moved over
to another operating system.
2019-11-17 20:30:42 -08:00
jp9000 d41536cf02 UI: Fix invalid escape sequences in regex string 2019-11-17 20:29:53 -08:00
Jim 769e5f3f78
Merge pull request #2093 from Programatic/pause_icon
UI: Implement system tray icon for when the recording is paused
2019-11-17 19:31:27 -08:00
Jim 374b8d2229
Merge pull request #2092 from ujifgc/add-windows-keys
libobs: add missing multimedia hotkeys for Windows
2019-11-17 19:03:01 -08:00
Ford Smith ac75ec1247 UI: Add system tray icon to indicate when paused 2019-11-17 18:17:07 -08:00
Igor Bochkariov ba86eb3bcf libobs: fix new virtual key codes display
this is required as GetKeyNameText does not translate multimedia keys
and custom OEM keys returning nonsensical one char names
2019-11-17 18:07:18 -08:00
Igor Bochkariov d822c07dc3 libobs: add missing virtual key codes for Windows
the missing codes are extracted from WinUser.h header

nameless reserved codes added as hex in case some OEM keyboards send them
2019-11-17 18:07:18 -08:00
jp9000 6ab6fdffd1 deps/obs-scripting: Fix formatting 2019-11-17 18:06:56 -08:00
Rat a19fef2248 obs-scripting: Fix Python in new MacOS .app bundles
The current scripting directory path given to Python on OSX is
`../data/obs-scripting`. This works when bin/ and data/ are in the same
folder like rundir after a compile and in the old .app bundles but the
new normal .app bundle structure is different.

For bundles move obspython.py and _obspython.so to the binary folder,
just like the Lua one, and pass that bin path to the Python interpreter
so it can find it.

The current working dir isn't guaranteed to be set with .app bundles
so look up binary path at runtime.
2019-11-17 22:11:44 +01:00
Jim 0adb5b81e7
Merge pull request #2180 from ElectronicWar/fix-build-pr-2079
obs-text: add missing include to fix build
2019-11-17 01:24:41 -08:00
Manuel Kroeber 3773c7cc31 obs-text: add missing locale include to fix build
PR 2079 added localization but forgot the needed include
2019-11-16 12:50:42 +01:00
Jim e3f496bf50
Merge pull request #2179 from WizardCM/remove-help-interact
UI: Remove help icon from Interact titlebars
2019-11-16 00:22:03 -08:00
Matt Gajownik 8efb6e92fe UI: Remove help icon from Interact titlebars 2019-11-16 10:23:03 +11:00
Jim e6daa22ab7
Merge pull request #2079 from exeldro/startcase
obs-text: text transform add locale and start case
2019-11-15 02:07:07 -08:00
Jim 9bdb21205d
Merge pull request #2085 from ratwithacompiler/macos-python-fix
obs-scripting: Fix Python on MacOS
2019-11-14 20:38:53 -08:00
Jim 61d959a095
Merge pull request #2077 from brittneysclark/qsv_cust_quant_mat
obs-qsv: Enable option for Custom Quantization Matrix
2019-11-14 18:54:51 -08:00
Jim def6fcb0ee
Merge pull request #2125 from DDRBoxman/appbundle
Fixes to make OBS work on Catalina
2019-11-13 12:21:13 -08:00
Jim 0d140542e4
Merge pull request #2072 from jpark37/dshow-negative-height
win-dshow: Support bottom-up DIBs
2019-11-13 11:42:05 -08:00
Jim 0f8472e8a8
Merge pull request #1914 from YouNow/master
rtmp-services: Add YouNow service and implement ingest lookup
2019-11-13 08:41:13 -08:00
jpark37 f896c773e8 win-dshow: Support bottom-up DIBs
The biHeight field can be negative, leading to crashes on some cards
like VisionRGB-E1S. Adding flip support is fairly straightforward.

There also appears to be a hack to automatically flip for RGB formats,
but I wish to remove it because it seems to fight with this change. We
already have a separate vertical flip checkbox to deal with non
compliant behavior.
2019-11-12 17:59:59 -08:00
Jim b731b3eea0
Merge pull request #2010 from wanhongqing123/master
win-dshow: fix H264 to mjpeg issue
2019-11-12 17:32:36 -08:00
Jim d357e1eb6e
Merge pull request #2042 from WizardCM/custom-twitch-docks
UI: Add support for Custom (Legacy) Twitch Dashboard Docks
2019-11-12 16:45:37 -08:00
wanhongqing 9b4d9c6788 win-dshow: Fix format switching issue
If the format was one encoded format and changes to another encoded
format, it could cause it to continue to treat it as the old format.
2019-11-12 14:37:32 -08:00
Jim 14d8f86745
Merge pull request #2081 from jpark37/cpp17
CMake 3.10, C++17, SWIG warnings
2019-11-11 11:49:40 -08:00
Jim fc54a3b708
Merge pull request #1974 from DDRBoxman/state
decklink-ui: Show the state of outputs in the decklink dialog
2019-11-11 07:13:52 -08:00
Jim d60c736cb0
Merge pull request #1990 from cg2121/flv-radio-buttons
UI: Use radio buttons for FLV track selection
2019-11-10 06:34:14 -08:00
Jim 8703c85d76
Merge pull request #1927 from rxrbln/master
Just a couple of more X.org / Unix hotkey defines.
2019-11-10 06:33:22 -08:00
Colin Edwards a469d14264 decklink-ui: Show the state of outputs in the decklink dialog 2019-11-09 14:48:24 -06:00
Clayton Groeneveld bab3391ce4 UI: Use radio buttons for FLV track selection 2019-11-09 08:19:41 -08:00
René Rebe fcbe593134 libobs: Add more X.org / Unix hotkey defines 2019-11-09 07:29:16 -08:00
Jim 768a58771a
Merge pull request #1919 from omkelderman/mask-filter-reload-on-file-change
obs-filters: Reload the mask image when file change is detected
2019-11-07 15:45:12 -08:00
Olle Kelderman 5534c46920 obs-filters: Reload the mask image when file change is detected 2019-11-07 11:34:10 -08:00
Jim 3542e4eac1
Merge pull request #1917 from VodBox/scroll-loop-option
libobs/obs-filters: Add toggle for scroll filter looping
2019-11-07 11:30:18 -08:00
VodBox 6645eaf1b8 obs-filters: Add toggle for scroll filter looping
By giving the option to disable the looping in the scroll filter, it
makes it more suitable for tasks like credits sequences, where you don't
want the texture to repeat and for the motion to only be performed once.
2019-11-07 06:25:36 -08:00
VodBox e8c1ec4035 libobs: Send activate and show signals to filters 2019-11-07 06:19:34 -08:00
Jim 647e7e24a1
Merge pull request #2144 from cg2121/quick-tr-fix
UI: Fix main transition being set to the quick one
2019-11-07 05:37:33 -08:00
Jim bfaf4889f1
Merge pull request #2168 from kkartaltepe/vaapi-profile-fix
rtmp-services: Type check apply_encoder_settings
2019-11-07 05:36:44 -08:00
Kurt Kartaltepe d9470770a0 rtmp-services: Type check apply_encoder_settings
This fixes ovewritting hidden "profile" setting in ffmpeg vaapi which is
a number and not a string. It also shouldnt be overwritten as it is
required on some AMD hardware for the encoder to work.
2019-11-06 20:10:19 -08:00
Kurt Kartaltepe d2f2aeb5d2 obs-ffmpeg: Remove unexposed vaapi parameters
In ffmepg 4.2 setting qp overrides bitrate, this option isnt exposed
currently so users cannot disable it.
2019-11-06 18:57:05 -08:00
Clayton Groeneveld 0676c385ba UI: Fix main transition being set to the quick one
This fixes an issue where using a quick transition, it would change
the main transition as well.
2019-11-05 23:47:28 -06:00
Jim f41d0d9d77
Merge pull request #2153 from tujinshu/master
win-capture: Fix rare crash when OpenGL programs exit with graphics-hook
2019-11-05 16:28:13 -08:00
tujinshu 76e6a99124 win-capture: Fix rare crash when GL program exits
**Commit message modified and clarified by Jim**

When hooking a program that has both DirectX and OpenGL contexts in use,
it is possible to cause a crash on shutdown due to capture_active()
returning true when an OpenGL context is deleted.  Normally, when
capturing an OpenGL program, this would not happen because the 'active'
variable would not be set due to OpenGL capture not being initialized,
but if DirectX is captured while an OpenGL context is available, and
OpenGL could not load these required functions, then GL can crash due to
trying to use unavailable functions.

This case is extremely rare and doesn't happen under normal
circumstances; only if a program is using both DirectX and OpenGL within
the same program simultaneously, and *only* if OpenGL could not load the
required functions.  This likely almost never happens under normal
programs, games, and hardware.  This was apparently produced by hooking
a GL Qt program that used QWebEngine, which used multiple contexts at
once.
2019-11-05 13:44:15 -08:00
Jim cbfb779876
Merge pull request #2148 from eulertour/master
UI: Fall back to XGetWMName if XFetchName fails
2019-11-05 12:54:50 -08:00
Jim 57669ffcb7
Merge pull request #2146 from Fenrirthviti/recording-bitrate-fix
UI: Fix audio bitrate not being set in simple mode
2019-11-05 12:52:15 -08:00
Jim 17ddb8d62d
Merge pull request #2142 from cg2121/fade-to-black
UI: Add fade to black in studio mode
2019-11-05 12:50:29 -08:00