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

4281 Commits

Author SHA1 Message Date
SuslikV
7eee8de331 UI: Do not quit program when last windows are projectors
Prevents the program from unintentionally quitting if the program is
minimized to the task tray and the user closes all projectors

Closes jp9000/obs-studio#737
2017-01-25 20:23:03 -08:00
SuslikV
d473b2da96 UI: Hide/show dialogs when minimizing to tray
Hides dialogs when minimizing to tray, and shows again when restoring
from tray.

Closes jp9000/obs-studio#737
2017-01-25 20:22:55 -08:00
SuslikV
abe4bfd96e UI: Add option to always minimize to tray
Closes jp9000/obs-studio#737
2017-01-25 20:22:45 -08:00
cg2121
cdf8a40bf1 UI: Add connection status square to status bar
Closes jp9000/obs-studio#720
2017-01-24 15:54:59 -08:00
jp9000
d1b78edbf3 obs-outputs: Increase default drop threshold
500ms is a bit unnecessarily low.
2017-01-24 15:54:25 -08:00
jp9000
5c27ab8d87 obs-output: Add ability to get congestion to rtmp output 2017-01-24 15:52:22 -08:00
jp9000
d8500b47ea libobs: Add ability to get output congestion
From 0.0 (not congested) to 1.0 (completely congested/dropping).
2017-01-24 15:31:44 -08:00
jp9000
85c43cd666 UI: Protect debug text static string var with mutex 2017-01-24 12:49:47 -08:00
Lionheart Zhang
9050febf06 UI: Convert to wide before outputting debug text (win)
Fixes an issue where non-english debug text wouldn't display correctly
in the debugger output on windows.  Also, only output debug text when
actually debugging.

Closes jp9000/obs-studio#734
2017-01-24 12:32:23 -08:00
Alexandre Vicenzi
1d5a5558ab libobs: Log correct amount of memory on 32bit (windows)
Closes jp9000/obs-studio#764
2017-01-24 11:28:52 -08:00
Jim
1608435657 Merge pull request #770 from derrod/purge-services
rtmp-services: remove shut down services
2017-01-23 22:57:40 -08:00
Mark Vaughn
ea0f47e6d2 rtmp-services: Update Vaughn Live ingests
Update video ingest servers for Vaughn Live.  Also split Breakers.TV
into its own since it is possibly becoming its own entity soon.

Closes jp9000/obs-studio#771
Closes jp9000/obs-studio#772
2017-01-23 22:52:36 -08:00
Jim
7099e170b2 Merge pull request #769 from DDRBoxman/osx
CI: Build VLC plugin for OSX on travis
2017-01-23 22:30:24 -08:00
Joel Bethke
d9b0c85daf cmake: Enable COPY_DEPENDENCIES by default on Windows
When setting up a build for the first time on windows, makes it so you
no longer have to run cmake twice:  once to build, then once again with
the COPY_DEPENDENCIES box to ensure dependencies are copied.

Closes jp9000/obs-studio#768
2017-01-23 22:21:38 -08:00
Jim
70bcf3d5b0 Merge pull request #773 from Gol-D-Ace/CI_Stuff
CI: Build Windows version and upload artifacts
2017-01-23 22:20:09 -08:00
Jim
8c76216c4b Merge pull request #775 from DDRBoxman/patch-1
CI: Update permissions on CEF app plist before packaging
2017-01-23 20:00:04 -08:00
Colin Edwards
be59588df6 CI: Update permissions on CEF app plist before packaging 2017-01-23 21:59:08 -06:00
Jim
c926e99740 Merge pull request #774 from DDRBoxman/CEFicon
obs-browser: Update browser ref
2017-01-23 18:09:37 -08:00
Colin Edwards
2d6993e7f1 obs-browser: Update browser ref 2017-01-23 20:07:36 -06:00
Gol-D-Ace
29888dc2f7 CI: Build Windows version and upload artifacts
Currently this build is still missing the following plugins:
enc-amf
obs-browser
win-ivcam
2017-01-24 01:17:13 +01:00
derrod
cdd6f846f9 rtmp-services: remove shut down services 2017-01-22 22:37:45 +01:00
Colin Edwards
22e2a12432 CI: Build VLC plugin for OSX on travis 2017-01-22 00:51:40 -06:00
Jim
43e4a2e939 Merge pull request #766 from DDRBoxman/osx
CI: Move browser source before building app
2017-01-19 08:17:04 -08:00
Colin Edwards
991c8bd352 CI: Move browser source before building app
The buildapp.py script was modifying the CEF.app when we don't want it to. It was also packaging the plugin inside the OBS.app so the app was not using the one under /Library
2017-01-19 10:15:41 -06:00
Jim
4d5a500990 Merge pull request #765 from DDRBoxman/appveyor
CI: Add in inital appveyor config
2017-01-18 21:04:36 -08:00
Colin Edwards
514f53486d CI: Add in inital appveyor config 2017-01-18 23:01:59 -06:00
jp9000
839e593e77 Revert "Revert "win-capture: Use FindWindowEx to traverse window list""
This reverts commit f4d7f0cbba.

Never thought a revert of a revert would happen.
2017-01-18 20:18:28 -08:00
jp9000
c8d08932fb obs-browser: Update submodule to latest version
Fixes a hang on startup.
2017-01-18 10:55:31 -08:00
jp9000
841dfade55 libobs: Update to 17.0.2 2017-01-18 06:00:41 -08:00
jp9000
5f5582b87e libobs: Update to version 17.0.1 2017-01-17 09:20:49 -08:00
jp9000
bf9048a1a4 obs-x264: Allow opencl through much longer alias
Due to the fact that people follow terrible guides that ignorantly
recommend opencl, the "opencl" custom x264 option was blocked.  However,
because some people still apparently want to use it, it's being renamed
to "opencl_is_experimental_and_potentially_unstable" so that anyone who
uses this option realizes that they should probably think twice about
using the option rather than just follow some terrible guide that tells
them to use it.
2017-01-16 13:22:04 -08:00
jp9000
b1707b18b2 libobs: Add callback for enumerating all scene children
Prevents infinite recursion when adding children to a scene.
2017-01-16 09:55:15 -08:00
jp9000
69ec87b9a5 libobs: Enumerate full tree when adding active child
Fixes a bug that would allow possible infinite recursion within a source
tree.  To fix this, inactive sources must be enumerated as well in order
to prevent infinite recursion.
2017-01-16 09:53:16 -08:00
jp9000
2877f1d553 libobs: Add func to enum active and inactive child tree 2017-01-16 09:53:08 -08:00
jp9000
c30d4f5075 win-capture: Fix game capture size bug when rehooking
When rehooking, even if scaling is off, it'll unintentionally overwrite
the game's backbuffer texture size with the scale size.
2017-01-16 04:19:16 -08:00
shiina424
36bf5988d2 UI: Fix bug with uncopied profile import/export files
streamEncoder.json and recordEncoder.json are missing.  Thess files are
generated when the output mode is advanced, and the user modifies
encoder settings.

Closes jp9000/obs-studio#741
2017-01-16 03:55:20 -08:00
Gol-D-Ace
e4f32aa54a Update translations from Crowdin 2017-01-16 12:44:07 +01:00
Jim
21839374a8 Merge pull request #746 from iblis17/master
obs-outputs: fix build error on freebsd
2017-01-16 03:43:03 -08:00
Cephas Reis
1e17414e8f obs-filters.c: Fix color correction filter saturation
The Saturation option was unbalanced, giving more weight to the color
red and a TON more weight to the color blue.  This patch balances the
colors to provide a more even increase in saturation across the RGB
channels.

Closes jp9000/obs-studio#739
2017-01-16 03:41:57 -08:00
Cephas Reis
10d6d5f0ca obs-filters.c: Fix color correction filter OpenGL crash
When using this filter in/on OpenGL situations can cause crashes with an
"int to vec4" cast.  This fix should resolve that issue.

Closes jp9000/obs-studio#739
2017-01-16 03:41:50 -08:00
Jim
956349fdd3 Merge pull request #759 from derrod/ignore-opencl
obs-x264: ignore opencl param
2017-01-16 03:31:37 -08:00
Jim
b45cf05db9 Merge pull request #753 from Xaymar/feature_amd-encoder
enc-amf: Update to 1.4.3.8
2017-01-16 03:30:29 -08:00
jp9000
f4d7f0cbba Revert "win-capture: Use FindWindowEx to traverse window list"
This reverts commit bd67c18c02.

Causes performance issues when the window isn't found.  The situation it
fixes is also very rare anyway.
2017-01-16 03:22:12 -08:00
Jim
a95d4d12c6 Merge pull request #763 from DDRBoxman/osx
CI: Install Packages and use the full version
2017-01-15 10:37:19 -08:00
Colin Edwards
e1496ecff9 CI: Install Packages and use the full version 2017-01-15 11:26:58 -06:00
jp9000
21d70fa207 win-capture: Don't use FindWindow for game capture keepalive
Using and creating a window can use issues in game capture if multiple
game captures are active, so revert back to using a mutex, and just
ignore the keepalive check failure if injected inside a UWP program
(only check to see if GetLastError reports that it's not found -- if it
returns access denied or any other error, assume it's in a UWP program,
and ignore the keepalive check).
2017-01-15 09:15:45 -08:00
jp9000
3f976bec8b libobs: Fix scale filtering bug when duplicating scenes
When duplicating scenes, scene item scale filtering options would not be
preserved.
2017-01-15 09:15:44 -08:00
jp9000
b6bde7e026 cmake: Remove unnecessary find_package calls
Fixes a bug in cmake that would cause a libavcodec_dir being set to "not
found", confusing new contributors
2017-01-15 09:15:43 -08:00
Jim
468ea9d3f8 Merge pull request #761 from DDRBoxman/osx
CI: actually call packagesbuild from the right place 😑
2017-01-12 22:21:03 -08:00
Colin Edwards
2132919005 CI: actually call packagesbuild from the right place 😑 2017-01-12 23:13:26 -06:00