5876 Commits

Author SHA1 Message Date
Jim
abbea9ef7d
Merge pull request #1408 from DDRBoxman/deps
CI: Fix building libvpx dep on osx
2018-08-05 20:55:25 -07:00
Colin Edwards
5411d6666e CI: Fix building libvpx dep on osx 2018-08-05 22:23:57 -05:00
Jim
4dc57ef24f
Merge pull request #1373 from Xaymar/plugins_enc-amf
enc-amf:  Version 2.4.2
2018-08-05 20:02:06 -07:00
jp9000
be8ddc06a2 rtmp-services: Ensure set URL exists within server list
If the user had a valid service selected, but the server that the user
originally was using is now (for whatever reason) no longer listed, the
rtmp-common service would still use that server rather than any of the
newer servers, and the user would have to physically go in to their
settings to reconfigure to get it to use that new server.

Instead, make sure that the server the user has selected exists within
the server list, and if it doesn't, use the first server in the list
instead by default.
2018-08-05 18:50:13 -07:00
Michael Goulet
a17c28223c rtmp-services: Change Facebook stream URL to use RTMPS 2018-08-05 18:50:13 -07:00
Michael Goulet
e67e2e12e6 obs-outputs: Add support for and use mbedTLS for SSL
This diff adds mbedTLS support to the obs-outputs plugin.  PolarSSL and
mbedTLS have grown so different between 2015-or-so when libRTMP was
written, and now it's no longer feasible to just use the USE_POLARSSL
flag.

This commit adds a WITH_RTMPS tri-state CMake variable (auto/on/off),
set to "Auto" by default.  "Auto" will use RTMPS if mbedTLS is found,
otherwise will disable RTMPS.  "On" will make it require mbedTLS,
otherwise fails configuration, and "Off" disables RTMPS support
altogether.

Closes obsproject/obs-studio#1360
2018-08-05 18:40:49 -07:00
Richard Stanway
4e07ac17d9
Merge pull request #1401 from Dmitry-Me/addMissingVaEnd02
UI: Add missing va_end() call
2018-08-05 22:15:10 +02:00
jp9000
8e5a618f03 libobs: When ungrouping groups, duplicate items
Because groups can now be used in multiple scenes at once, it's
important that if the user wishes to ungroup a group, that they must be
able to keep the group intact if it exists in other scenes.  This
requires duplicating all scene items (as well as their hotkey/private
data) instead of just reparenting the subitems.

This fixes an issue where if the user had the group referenced in
multiple scenes, the group would become empty in other scenes.
2018-08-05 04:21:42 -07:00
jp9000
ef40100c64 libobs: Add internal function to dup. scene item data
Adds an internal function to duplicate scene item data.
2018-08-05 04:21:42 -07:00
jp9000
ba4692622e libobs: Add function to save hotkey pair data 2018-08-05 04:21:42 -07:00
Jim
3509b1be88
Merge pull request #1407 from RytoEX/remove-qt5network
UI: Remove QNetworkReply from window-basic-main.hpp
2018-08-04 23:14:35 -07:00
Ryan Foster
3f7458fe51 UI: Remove QNetworkReply from window-basic-main.hpp
QNetworkReply was added here in commit
5ba8b09c9c0ee3bd4cca7860e5892ee60d1f6cf6. Qt5Network was replaced in
commits 13bed1a448e3726819778e5759bdf456556b6bf9 and
39d1cda4e9b276f1b0770027e211aec0d9ecb927, but this one line referring to
QNetworkReply remained. Let's finally remove it.
2018-08-05 01:44:12 -04:00
Jim
9a095bde11
Merge pull request #1388 from RytoEX/ci-macos
Update macOS CI build image, target, and deps
2018-08-03 01:48:01 -07:00
jp9000
5b091ce06d UI: Use obsproject.com URL for discord invite 2018-08-03 00:33:06 -07:00
Jim
be44b36bd4
Merge pull request #1403 from admshao/gl-improve-error-handling
Improve X error handling
2018-08-02 23:53:34 -07:00
Jim
a4150c7d98
Merge pull request #1402 from admshao/compressor-segfault
obs-filters: Fix segfault in Compressor Filter
2018-08-02 23:52:31 -07:00
Shaolin
85c7669ad2 libobs-opengl: Fix segfault on access of invalid window
Once a window is invalid gl-x11::get_window_geometry will return 0
so just check if the returned geometry is a valid pointer before
trying to get its width/height.
2018-08-03 00:55:09 -03:00
Shaolin
4a266dc920 libobs-opengl: Improve X error handler message 2018-08-03 00:52:47 -03:00
Shaolin
d5fb5edd93 obs-filters: Fix segfault in Compressor Filter
obs_audio_data* sent to compressor_filter_audio had audio->frames == 0.
The analyze_envelope was trying to access an array at index -1 in result
of that. Just return if no samples are provided.

This fixes Mantis issue: 1261
2018-08-02 15:32:54 -03:00
Dmitry-Me
440baa3147 UI: Add missing va_end() call 2018-08-02 15:57:35 +03:00
Jim
9565f9cd0c
Merge pull request #1332 from Andersama/patch-21
UI: Hide preview for sources and filters where possible
2018-08-01 23:05:45 -07:00
Ryan Foster
6dfeeca620 CI: Update macOS dependencies in build script
* Add mbedTLS in brew install
* Update Sparkle from 1.16.0 to 1.20.0
* Update Opus from 1.1.3 to 1.2.1
* Update libogg from 1.3.2 to 1.3.3
* Update libvorbis from 1.3.5 to 1.3.6
* Update libvpx from 1.6.0 to 1.7.0
* Update Jansson from 2.9 to 2.11
* Update FFmpeg from 3.2.2 to 4.0.2
2018-08-02 00:08:24 -04:00
Ryan Foster
3ea16c619f CI: Update Travis scripts to target OSX 10.11+ 2018-08-02 00:08:20 -04:00
Ryan Foster
7fd981c2c0 CI: Update Travis Mac builds to Xcode 9.4 and macOS 10.13 2018-08-02 00:08:17 -04:00
jp9000
16ead25dd3 UI: Add ability to join discord server from help menu 2018-08-01 18:41:57 -07:00
Jim
324071f5a3
Merge pull request #1338 from VodBox/scene-item-colors
UI: Add Color Coding to Source Tree Widget
2018-08-01 17:42:29 -07:00
Jim
fbd8d02c77
Merge pull request #1400 from Dmitry-Me/addMissingVaEnd01
win-mf: Add missing va_end() call
2018-08-01 13:31:59 -07:00
VodBox
0dca4318b2 UI: Add Color Coding to Source Tree Widget
This commit adds the ability to select a background color for a
scene-item, whether it's a custom color or one of eight presets.

As this is an initial implementation, it lacks theme customizability,
and it also lacks the ability for the user to set their own preset
colors, so only the hard-coded 8 are available.
2018-08-02 08:23:12 +12:00
Dmitry-Me
d3863e837c win-mf: Add missing va_end() call 2018-08-01 18:12:08 +03:00
jp9000
7faad4b467 obs-browser: Add hardware acceleration option (win32) 2018-08-01 02:03:17 -07:00
Jim
a7a2f21448
Merge pull request #1399 from Dmitry-Me/missingReturnInAssignment
UI: Add missing return statement
2018-08-01 01:36:03 -07:00
Dmitry-Me
a5eb2b8e7e UI: Add missing return statement 2018-08-01 11:04:25 +03:00
Jim
6905b22c5f
Merge pull request #1391 from Dmitry-Me/fixPotentialNullDeref01
UI: Check pointer before the first dereference
2018-07-31 22:37:12 -07:00
cg2121
2e18745c37 UI: Uncheck record/replay buffer buttons if fail
Closes obsproject/obs-studio#1375
2018-07-31 21:35:06 -07:00
jp9000
b6665f9cc0 UI: Use QScopedPointer (not QPointer) where applicable
Contrary to what the name would have you believe, QPointer<> is not used
to delete a pointer when it leaves its specific scope.  Instead, it's
used to check to see if the pointer is still valid.  For most
QWidget-based objects, this is actually fine because QWidgets that are
assigned to layouts or other widgets will automatically be destroyed --
however, for non-widget objects, this can cause a memory leak.

This patch replaces QPointer with QScopedPointer where applicable to
prevent memory leaks.

Closes obsproject/obs-studio#1367
2018-07-31 21:14:52 -07:00
Jim
a5d740373c
Merge pull request #1396 from RytoEX/dark-theme-fixes
UI: Fix disabled items in Dark theme being too light
2018-07-31 16:31:29 -07:00
Jim
1da698ca64
Merge pull request #1395 from RytoEX/add-bitness-to-crash-log
libobs: Log libobs bitness in crash logs
2018-07-31 16:30:52 -07:00
Alex Anderson
57f8c5e328 UI: Hide preview for sources and filters where possible
Hides the preview window for audio sources in the properties menu and
contextually in the filters menu to save on gui space.
2018-07-31 13:14:32 -07:00
Ryan Foster
b5e0544c2b UI: Fix disabled items in Dark theme being too light
In the Dark theme, disabled UI elements had text that was too close in
color to enabled UI elements. This commit switches them to use the
"light" palette color instead of the "lighter" palette color.
2018-07-31 12:10:13 -04:00
Ryan Foster
6c76e9a736 libobs: Log libobs bitness in crash logs 2018-07-31 11:49:35 -04:00
Jim
be2857f0bd
Merge pull request #1394 from SuslikV/patch-8
libobs-d3d11: Initialize variable to zero
2018-07-31 04:44:55 -07:00
cg2121
8f4edede4a UI: Add confirmation dialog if there are no sources
This adds a confirmation dialog for streaming or recording if
there are no sources.

Closes obsproject/obs-studio#1344
2018-07-31 04:28:43 -07:00
Jim
3fd33478f8
Merge pull request #1345 from TheMuso/fix-input-output-mac-audio-devices
libobs: Rework code for checking Mac audio device capabilities for mo…
2018-07-31 00:33:14 -07:00
SuslikV
671b6032e2
libobs-d3d11: Initialize variable to zero
Initialize variable (that will be used to change the resource) to zero.
2018-07-31 07:37:12 +02:00
Dmitry-Me
69f217003b UI: Check pointer before the first dereference 2018-07-30 15:11:41 +03:00
jp9000
a032bcc798 UI: Add intro startup page (windows)
Allows the ability to show a web page via CEF to the users on startup to
present and announce new features.
2018-07-29 23:32:23 -07:00
jp9000
28e3604a56 deps: Add json11 library for convenience
Adds a very basic and easy-to-use C++ library strictly for the sake of
convenience when using C++.
2018-07-29 22:15:03 -07:00
Richard Stanway
2d60c89a02
UI: Only allow stream/record hotkeys if the UI buttons are enabled
Currently the only thing preventing a user from trying to start multiple
streams or recordings is the UI buttons being disabled. The hotkey code
allowed the user to bypass that, which for streaming resulted in lots of
rtmp output connect threads spawning, which stomped all over each
other's data structures and resulted in crashes.
2018-07-28 15:27:49 +02:00
Jim
ad23128836
Merge pull request #1387 from DDRBoxman/usagedesc
OSX: Add NSCamera and NSMicrophone UsageDescription for 10.14
2018-07-27 21:27:39 -07:00
Jim
8bf03e8caa
Merge pull request #1381 from Dmitry-Me/fixSectionNameTypo
Fix typo in contributor guide
2018-07-27 21:26:50 -07:00