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

4000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jp9000
9081df9708 UI: Fix poor handling of system tray pointers 
The original pull request that added the system tray feature was riddled
with bad pointer usage.  Bare pointers that are never properly freed,
never contained within a QPointer or unique_ptr.

These have now been changed to use QPointer variables, and to always
check when the variables are valid before using.  The order of
destruction for QMenu that uses the actions has now been prioritized
first before the actions.
 2016-10-19 06:48:03 -07:00
jp9000
dadefceccf UI: Fix sys. tray crashes when sys. tray not available 
When the system tray is not available, the system tray variables would
still be used despite not being initialized.

Fixes mantis bug 640 on linux systems in particular that may not always
have system tray available.
 2016-10-19 05:32:01 -07:00
Jim
65da3fbaa2 Merge pull request #666 from cg2121/output-timer-fix 
frontend-tools: Add ability to start timer if output is already active
 2016-10-18 04:07:08 -07:00
cg2121
6639847017 frontend-tools: Add ability to start timer if output is already active 
This adds the ability to start the output timer if streaming or recording is already active.
 2016-10-17 22:20:24 -05:00
Jim
4505d5ac33 Merge pull request #665 from reboot/cleanup_output_timers_code 
frontend-tools: Code cleanup of output timers
 2016-10-17 10:42:55 -07:00
Christoph Hohmann
a1ea6e4f51 frontend-tools: Code cleanup of output timers 2016-10-17 17:28:05 +02:00
cg2121
7e5c7da542 frontend-tools: Add output timers 
This adds streaming and recording timers to the frontend tools.

Closes jp9000/obs-studio#625
 2016-10-17 02:47:29 -07:00
jp9000
971dd4945c UI: Fix bug in frontend API event 
Was using main->outputHandler->StreamingActive() for the
obs_frontend_recording_active function.
 2016-10-17 02:45:28 -07:00
Jim
6d5b23b37c Merge pull request #664 from DDRBoxman/osxnightly 
CI: Build on OSX 10.10 on travis
 2016-10-17 00:09:48 -07:00
Colin Edwards
d160cedbc3 CI: Build on OSX 10.10 on travis 2016-10-17 00:49:55 -05:00
Cephas Reis
94b6943f27 decklink: Update Blackmagic SDK to 10.8.0 
Updated to help support the newest cards, features, and options.

Closes jp9000/obs-studio#627
 2016-10-16 01:53:51 -07:00
Younes SERRAJ
f029ec821e cmake: Fix FFmpeg search path on debian 
Although FFmpeg is installed, OBS currently fails to build on debian
(tested on Debian Jessie 8.6).  It looks for libavcodec.a in
/usr/local/lib and not /usr/lib.

Closes jp9000/obs-studio#661
 2016-10-16 01:01:34 -07:00
jp9000
e2af0eec04 obs-frontend-api: Add library version 2016-10-16 00:08:49 -07:00
Jim
37269933af Merge pull request #663 from DDRBoxman/osxnightly 
Update obs-browser submodule to a working version
 2016-10-14 06:19:10 -07:00
Colin Edwards
a41bdb3bf0 Update obs-browser submodule to a working version 2016-10-14 08:17:28 -05:00
Jim
8d491f15a9 Merge pull request #656 from DDRBoxman/osxnightly 
Build browser plugin on travis for OSX
 2016-10-13 19:27:52 -07:00
Colin Edwards
947d04012f Build browser plugin on travis for OSX 2016-10-13 19:36:55 -05:00
Jim
60576d0cf3 Merge pull request #662 from DDRBoxman/osxpackage 
CI: Use python2 to run package script
 2016-10-13 17:35:37 -07:00
Colin Edwards
522c43f827 CI: Use python2 to run package script 2016-10-13 19:32:19 -05:00
Jim
925c229312 Merge pull request #660 from DDRBoxman/buildapp 
CI: Package OSX build into an actual app
 2016-10-11 21:12:24 -07:00
Colin Edwards
a0b4439893 CI: Package OSX build into an actual app 2016-10-11 22:43:17 -05:00
Jim
3db1f62133 Merge pull request #659 from DDRBoxman/travisirc 
CI: Reduce travis irc notice to one line
 2016-10-11 15:56:06 -07:00
Colin Edwards
30b813564e CI: Reduce travis irc notice to one line 2016-10-11 17:54:28 -05:00
Jim
7d4fa4a650 Merge pull request #657 from DDRBoxman/travisirc 
CI: Add irc notifications to travis config
 2016-10-11 13:43:44 -07:00
Colin Edwards
5f65739606 CI: Add irc notifications to travis config 2016-10-11 15:43:00 -05:00
Jim
b84fd6bc2e Merge pull request #658 from DDRBoxman/archivepushes 
CI: Upload artifacts on all pushes
 2016-10-11 13:19:11 -07:00
Colin Edwards
720f8cd6a2 CI: Upload artifacts on all pushes 2016-10-11 15:15:21 -05:00
Jim
9e2e183c04 Merge pull request #655 from DDRBoxman/osxnightly 
OSX Travis build
 2016-10-09 22:42:33 -07:00
Colin Edwards
47c8365cdd OSX Travis build 2016-10-10 00:39:55 -05:00
Jim
ad2550e060 Merge pull request #628 from RytoEX/master 
libobs/util: Fix get_dll_ver not reporting DLL name
 2016-10-09 19:46:21 -07:00
CoDEmanX
2680321860 CMake: Warn if empty QTDIR/DepsPath vars on Windows 
Closes jp9000/obs-studio#608
 2016-10-09 19:32:58 -07:00
Jim
43c1dce777 Merge pull request #634 from CoDEmanX/master 
rtmp-services: Add Asian Livecoding.tv server and increase video bitrate
 2016-10-09 18:49:34 -07:00
Michael Fabian Dirks
bd606785fe UI: Split Properties window with a QSplitter 
Closes jp9000/obs-studio#645
 2016-10-09 18:47:32 -07:00
Michael Fabian Dirks
d324713364 UI: Add raw text and text file to drag&drop support 
Closes jp9000/obs-studio#644
 2016-10-09 18:39:53 -07:00
Ryan Foster
b75292dbf4 UI: Add Portable Mode indicator to title bar and log 
Closes jp9000/obs-studio#654
 2016-10-09 18:10:18 -07:00
Jim
9cb8ae74e4 Merge pull request #635 from cortexmedia/msi-license 
Display license in MSI installer
 2016-10-09 17:09:25 -07:00
Jim
7d243509bb Merge pull request #653 from DDRBoxman/HiDPI 
Add 256x256 icon to windows ico for HiDPI displays
 2016-10-08 18:05:36 -07:00
Colin Edwards
f1a9c139b8 Add 256x256 icon to windows ico for HiDPI displays 2016-10-08 19:41:31 -05:00
Jim
7bdca3e28a Merge pull request #651 from Xaymar/plugin_enc-amf 
enc-amf: Update to 1.3.3.1
 2016-10-07 12:37:50 -07:00
Ryan Foster
487ef58ee7 libobs-d3d11: Log GetDeviceRemovedReason 
When DirectX throws error 0x887A0005 (DXGI_ERROR_DEVICE_REMOVED),
Microsoft recommends calling ID3D11Device::GetDeviceRemovedReason to
retrieve a more precise error code.

Closes jp9000/obs-studio#652
 2016-10-07 01:07:00 -07:00
Michael Fabian Dirks
ccbb542eb0 enc-amf: Update to 1.3.3.1 2016-10-07 00:47:06 +02:00
Jim
986edc84c4 Merge pull request #650 from DDRBoxman/HiDPI 
UI: Only scale HiDPI on QT 5.6+
 2016-10-04 21:54:36 -07:00
Colin Edwards
404258f41a UI: Only scale HiDPI on QT 5.6+ 2016-10-04 22:46:52 -05:00
Jim
a80d334cf6 Merge pull request #640 from DDRBoxman/HiDPI 
UI: Enable HiDPI scaling.
 2016-10-04 11:30:34 -07:00
Jim
987cd85edd Merge pull request #649 from Xaymar/plugin_enc-amf 
enc-amf: Update to 1.3.2.3
 2016-10-04 11:28:05 -07:00
Michael Fabian Dirks
70fc27d34a enc-amf: Update to 1.3.2.3 2016-10-04 20:21:17 +02:00
Jim
f81637718b Merge pull request #647 from wt/remove_GetMonitors 
Remove get monitors
 2016-10-03 23:54:36 -07:00
Warren Turkal
f3eb8aacfe UI: Use Qt lib for screen info instead of x11 libs 
All of the monitor discovery logic can be implemented with Qt. This
change removes all the x11 implementations in favor of Qt and removes a
fair amount of platform specific code.
 2016-10-03 23:50:13 -07:00
Jim
5642b7bc66 Merge pull request #642 from RytoEX/scenesw-regex 
Prevent crash when adding an invalid regex to Automatic Scene Switcher
 2016-10-02 21:13:36 -07:00
Ryan Foster
91b64657c6 frontend-tools: Fix crash when adding invalid regex 
When adding a new regex rule to the Automatic Scene Switcher, OBS would
crash if the regex was invalid. This was because the regex was added to
the Regex object without a test or try-catch. This commit fixes that
behavior, and adds a warning message when attempting to add an invalid
regex.
 2016-10-02 23:28:38 -04:00