0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 21:13:04 +02:00
Commit Graph

5003 Commits

Author SHA1 Message Date
Jimi Huotari
73c4ebc289 libobs: Adjust grammar of an error message
Change 'but both were not found' to 'but neither were found.'

Closes jp9000/obs-studio#1018
2017-09-15 08:23:58 -07:00
Jimi Huotari
068874bc3e libobs: Stop configure if ImageMagick is preferred, but not found
With certain combinations of CMake (<3.9) and ImageMagick (>=7),
configure will silently fail setting up support for ImageMagick,
even if the user requested for it, and the build will move on
(as long as FFMPEG_AVCODEC is found).  This commit adds a check
that will stop configure in such cases.

Closes jp9000/obs-studio#1018
2017-09-15 08:23:54 -07:00
Jimi Huotari
fef71c4b7c libobs: Fix ImageMagick header path
Since ImageMagick 7, the header path has been changed.  This commit
implements a check for the version being used, and includes the
header as is appropriate.

Special thanks to Hu.

Mantis-Bug: https://obsproject.com/mantis/view.php?id=966

Gentoo-Bug: https://bugs.gentoo.org/627520

Closes jp9000/obs-studio#1018
2017-09-15 08:23:32 -07:00
chinasarft
1ef4de7ce3 obs-ffmpeg: Don't mark to destroy media unless valid
Closes jp9000/obs-studio#1021
2017-09-15 05:51:52 -07:00
Jim
dcd3e627c2 Merge pull request #1027 from SuslikV/patch-2
UI: Add missing option to context menu
2017-09-15 04:13:28 -07:00
Christoph Hohmann
27a8f69eea UI: Use Qt standard buttons in source properties
Use the Qt standard buttons in the source properties dialog to make the
UI consistent.  Also remove the right alignment of the button box to
allow Qt to align standard buttons on the left side of the dialog.

Closes jp9000/obs-studio#1013
2017-09-15 04:05:32 -07:00
SuslikV
2b175d6da9 UI: Add missing option to context menu
Add 'Advanced Audio Properties' option to context menu over empty area
of the Mixer's pane.
2017-09-14 15:01:15 +02:00
cg2121
76b6266689 UI: Allow hiding/unhiding sources in the mixer
Allows the ability to hide/unhide sources in the mixer that the user
doesn't care about or doesn't necessarily want to see (such as video
sources that have audio but don't have any audio playing).  If all
sources are hidden, the user can right-click the mixer's empty area and
choose "unhide all" via a context menu.

Closes jp9000/obs-studio#1002
2017-09-13 21:17:44 -07:00
jp9000
7bde1eb6af UI: Allow right-clicking mixer sources to bring up menu
Allows bringing up properties/filters/etc via right-clicking mixer items
in addition instead of only being able to click the gear icon.  Minor
QoL improvement.
2017-09-13 21:17:44 -07:00
jp9000
2ef00ecec4 libobs: Add private settings to scene items/sources
Allows setting and sharing of user data for sources and scene items.
2017-09-13 21:17:44 -07:00
Palana
db1da73647 libobs: Fix I420 shader for (width/2)%4 == 2 resolutions
For those resolutions the last two chroma samples of every other
line would be overwritten by the last chroma samples of the previous
line (depending on sampler used), producing artifacts on the left
edge of the resulting image (e.g. any color present on the right
edge of the image would "bleed" to every other line on
the left edge)
2017-09-13 16:39:36 +02:00
Palana
9ce9c35b0d libobs: Fix texture_ready feedback for CPU conversion path 2017-09-13 16:39:27 +02:00
Jim
dde03af95e Merge pull request #987 from seirl/master
Add fix to watch for VisibilityNotify events.
2017-09-12 05:30:36 -07:00
Jim
ee5b371576 Merge pull request #988 from ishitatsuyuki/xcb-segfault
Fix XCB keyboard mapping size calculation
2017-09-12 05:23:15 -07:00
Christoph Hohmann
5813a4bfbf linux-pulseaudio: Use actual sink device names
Uses the sink device names rather than the "Monitor of" names.

Closes jp9000/obs-studio#990
2017-09-12 04:01:06 -07:00
Shaolin
1bae6f3c18 UI: Enable audio monitoring on linux if pulse available
Closes jp9000/obs-studio#940
2017-09-12 03:37:58 -07:00
Shaolin
b6042d91ea libobs: Add Pulseaudio audio monitoring support
Checks if the system has Pulseaudio and enables support via the
HAVE_PULSEAUDIO flag.

Closes jp9000/obs-studio#940
2017-09-12 03:37:54 -07:00
Jim
b1f2b72628 Merge pull request #929 from RytoEX/nix-sysinfo
Make *nix system info logging more like Windows/Mac
2017-09-12 01:58:49 -07:00
mntone
9ffdaff984 UI: Add memory usage to Stats window on linux/mac
Closes jp9000/obs-studio#953
2017-09-12 01:56:40 -07:00
mntone
a6318ffdca libobs/util: Add memory usage functions
Closes jp9000/obs-studio#953
2017-09-12 01:49:11 -07:00
Jim
c049dfdf1d Merge pull request #1008 from pkuznets/add_looch_tv_platfom
rtmp-services: Add looch.tv streaming platform
2017-09-11 16:19:17 -07:00
pkuznetsov
03659d8706 rtmp-services: Add looch.tv streaming platform 2017-09-11 16:43:39 +03:00
Jim
67d2292bbc Merge pull request #1026 from Dead133/master
rtmp-services: Update ingest list for Restream.io
2017-09-11 03:33:46 -07:00
Andrew Surzhynskyi
c830f919d7 rtmp-services: Update ingest list for Restream.io 2017-09-11 13:29:26 +03:00
Jim
e8f66d6c18 Merge pull request #998 from ErunamoJAZZ/master
rtmp-services: Fix misspelled country name
2017-09-11 02:47:52 -07:00
cg2121
be77b13e58 vlc-source: Add media control hotkeys
This adds play/pause, restart, stop, next, and previous hotkeys to the
VLC source.

Closes jp9000/obs-studio#972
2017-09-11 01:13:59 -07:00
C. Daniel Sanchez R
06bbd2667f rtmp-services: Fixing misspell in a country name
That had a misspell in a Twitch ingest server:
Col_u_mbia instead Col**o**mbia.
Incremented version.
2017-09-09 13:06:41 -05:00
Richard Stanway
41a1b09988
obs-outputs: Improve new netcode if encoder reports 0 bitrate
Some encoders such as the AMD AMF encoder don't set their bitrate
property, so it gets returned as 0. This causes the new network code to
allocate a tiny buffer, resulting in output starvation and throttling
to the point of uselessness if low latency mode is also enabled.
2017-08-30 00:09:05 +02:00
Jim
4c58dcf65c Merge pull request #1016 from derrod/update-ingests
rtmp-services: Add new twitch ingest servers
2017-08-25 07:17:09 -07:00
derrod
48fc0fc120 rtmp-services: Add new twitch ingest servers 2017-08-25 16:11:18 +02:00
Quinn Damerell
1151c6cede obs-outputs: Fix invalid stream key error
Fixes an issue where it would show the wrong error when the user entered
an invalid stream key, and logs it

Closes jp9000/obs-studio#1015
2017-08-25 02:03:13 -07:00
Quinn Damerell
8111f99854 obs-outputs: Enable FTL logging and reduce verbosity
Closes jp9000/obs-studio#1015
2017-08-25 02:02:50 -07:00
Jim
b2055f0566 Merge pull request #1009 from Dead133/master
rtmp-services: Update ingest list for Restream.io
2017-08-24 14:41:23 -07:00
Andrew Surzhynskyi
354f337e42 rtmp-services: Update ingest list for Restream.io 2017-08-24 12:39:13 +03:00
Jim
8fe0d508fd Merge pull request #1012 from DDRBoxman/cef
obs-browser: version 1.30.1
2017-08-18 20:42:21 -07:00
Colin Edwards
86cea3f48f obs-browser: version 1.30.1 2017-08-18 22:26:47 -05:00
Jim
684db36996 Merge pull request #1011 from DDRBoxman/cef
Build with CEF 3112 on OSX
2017-08-18 20:02:43 -07:00
Colin Edwards
23ea91976f Build with CEF 3112 on OSX 2017-08-18 21:41:31 -05:00
SuslikV
a21da59741 UI: Fix parent window geometry loading
The parent window adjusted according to child object polices and hint 
sizes. Thus, it is possible to disable all docking panes to restore 
true parent geometry first, the docking geometry and settings will be 
restored later in OBSBasic::OBSInit().
2017-08-12 19:45:25 +02:00
Joel Bethke
5576823f24 UI: Allow volume peak to be customized via .qss
With the addition of the peak volume indicator, themes may wish to change
these colors but there was no way to do so. This change updates the
VolumeControl widget to allow a stylesheet to adjust all possible colors
for the volume bar. In addtion, the Rachni theme is updated to demonstrate
this new capability.
2017-08-11 21:07:31 -05:00
jp9000
d3c163b775 UI: Fix Stats not showing stream data until start 2017-08-11 08:52:09 -07:00
SuslikV
650495331d libobs: Add default hotkey id to duplicated item
Fixes https://obsproject.com/mantis/view.php?id=508

The toggle_visibility set only by init_hotkeys() call, but used each
time in obs_sceneitem_destroy() call.  Because zero hotkey_pair_id is
valid - we need to set item property other than zero here.

Closes jp9000/obs-studio#1000
2017-08-11 08:41:22 -07:00
jp9000
0b909a8d9e libobs: Update version to 20.0.1 2017-08-11 08:24:27 -07:00
SuslikV
9bf2318654 UI: Fix conditions for redraw the stats labels
After the commit 3491487c71 obs_frontend_get_streaming_output()
returns NULL if "Start Streaming" button not pressed yet.  The code
would erroneously fail to update the recording/streaming status if
either one of them hadn't been activated yet.

Closes jp9000/obs-studio#999
2017-08-10 21:40:18 -07:00
jp9000
00f6bbe99c image-source: Fix potential crash with slideshow
If there are no slideshow items and this function is called, it would
cause a null pointer dereference.
2017-08-10 21:30:03 -07:00
jp9000
8b315186a7 rtmp-services: Always check service updates on non-windows
This is a workaround for build server cmake build issues on mac/linux.
In the future, the build servers should specify the cmake variable.
2017-08-10 08:11:27 -07:00
Gol-D-Ace
8d8c2e5a22 Update translations from Crowdin 2017-08-10 16:07:40 +02:00
jp9000
0cae0439ff obs-transitions: Rename stinger ID to prevent conflict
Prevents a conflict with potentially existing plugins
2017-08-10 07:04:56 -07:00
jp9000
a4b361de00 rtmp-services: Require cmake var to enable ingest updates
Prevents an issue where forks would continually request data from the
obsproject server for ingest updates.
2017-08-09 12:34:27 -07:00
jp9000
a625448d97 rtmp-services: Initialize mutex/dynamic array
The Twitch ingest lookup file did not initialize the dynamic array or
mutex before using.
2017-08-09 12:33:16 -07:00