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

2593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jp9000
aafd114e67 Add latest translations from Crowdin 2015-05-12 15:29:43 -07:00
John Bradley
d6085ac05c UI: Set minimum width of add/remove hotkey buttons 
This prevents odd behavior with Qt5.4 turning the rounded buttons
into square push buttons.
 2015-05-12 22:40:57 +02:00
Palana
f6234ec90d UI: Fix push-to-* localization strings being swapped 2015-05-12 21:36:46 +02:00
Palana
e044fcfaaa libobs: Fix saving/loading of push-to-mute settings 2015-05-12 21:36:46 +02:00
John Bradley
87ea0392b4 Only build tests if specified by BUILD_TESTS 2015-05-12 11:40:09 -05:00
jp9000
6c535513b5 Merge branch 'global-hotkeys' 2015-05-11 20:15:08 -07:00
Palana
37069d372f UI: Add Start/Stop Recording/Streaming hotkeys 2015-05-11 20:45:28 +02:00
Palana
6192b34ab3 UI: Add OBSBasic::StartStreaming/StopStreaming 2015-05-11 20:45:28 +02:00
Palana
508f04d927 UI: Add OBSBasic::StartRecording/StopRecording 2015-05-11 20:45:28 +02:00
Palana
054f00ced1 UI: Add SelectScene hotkey 
UI supplied per scene hotkey to allow switching between scenes; this
has to be done in the UI since it's up to the application to define
what exactly "changing/selecting a scene" means (changing the output
of channel 0 may not be enough for other applications)
 2015-05-11 20:45:28 +02:00
Palana
c23c071ba2 UI: Add Push-to-talk/mute settings to audio settings 2015-05-11 20:45:27 +02:00
Palana
d28e80ae39 UI: Add hotkeys page in settings dialog 2015-05-11 20:45:27 +02:00
Palana
369d95dfc3 UI: Add OBSSourceLabel 2015-05-11 20:45:27 +02:00
Palana
b33be9fca6 UI: Add OBSHotkey{Edit,Label,Widget} 
OBSHotkeyEdit is similar to QKeySequenceEdit, except less terribad on OSX, while
OBSHotkeyWidget provides a container that automagically encapsulates multiple
bindings per hotkey

OBSHotkeyLabel in combination with OBSHotkeyWidget provides mechanisms for
dealing with hotkey pairs (see upcoming usage in window-basic-settings.cpp)
 2015-05-11 20:45:27 +02:00
Palana
9cda23f4b9 UI: Add basic hotkey integration 2015-05-11 20:45:26 +02:00
Palana
c1a00817bb UI: Add TranslateQtKeyboardEventModifiers 2015-05-11 20:45:26 +02:00
Palana
9f0696c1d8 UI: Preserve service hotkey data 2015-05-11 20:45:26 +02:00
Palana
23a2228142 libobs: Add scene item hotkeys 2015-05-11 20:45:25 +02:00
Palana
7b3b083889 libobs: Add audio source hotkeys 2015-05-11 20:45:25 +02:00
Palana
1d39c3e9b6 (API Change) libobs: Add hotkey data to *_create functions 2015-05-11 20:45:25 +02:00
jp9000
d0cae31a48 libobs: Add linux hotkey implementation 2015-05-11 20:45:25 +02:00
jp9000
3fc63f83f1 libobs: Add windows hotkey implementation 2015-05-11 20:45:25 +02:00
Palana
f37e72205a libobs: Add OSX hotkey implementation 2015-05-11 20:45:24 +02:00
Palana
5ad553d06d libobs: Add global hotkey support 2015-05-11 20:45:24 +02:00
Palana
4daa5c7aa7 media-io: Fix check before passing pointer to av_freep 
Found by clang-3.7 (trunk 236075) via -Wpointer-bool-conversion:

warning: address of array 'rs->output_buffer' will always evaluate
to 'true'
 2015-05-11 20:42:53 +02:00
jp9000
83df87c552 UI: Show remaining reconnect timeout duration 
When a reconnect is occurring, the user doesn't really know that the
program is waiting to reconnect to the server or not, nor does the user
know how many seconds are remaining until that next attempt.  This will
show the reconnect timeout countdown as it's occurring.
 2015-05-10 18:26:09 -07:00
jp9000
c1e8d28548 libobs: Use exponential backoff for reconnecting 
Implements exponential backoff for consecutive reconnects, which is
useful to prevent too many connections from trying to reconnect back to
a service at once over a short period of time in the case of potential
service downtime.  Exponential backoff causes each subsequent reconnect
attempt to double its timeout duration.
 2015-05-10 16:07:22 -07:00
jp9000
691d3b4a73 libobs: Add timeout_sec param to reconnect signal 
This optionally allows the front-end to know what the current timeout
value in seconds is set to for the reconnection without having to call
an extra API function to find that out.
 2015-05-10 16:05:26 -07:00
Palana
7dd6b1d99a UI: Fix dark theme QToolTip colors on windows 
QToolTip's (background) color(s) would not apply on windows, work-around
taken from https://forum.qt.io/topic/24023/
 2015-05-10 07:03:38 +02:00
Jim
8fb2929420 Merge pull request #427 from dodgepong/latest-crowdin-translations 
Fix issues with German translation
 2015-05-08 17:14:29 -07:00
Palana
7900f46e77 UI: Use emplace_back instead of push_back + move 
Found by clang-3.7 (trunk 236075) via -Wpessimizing-move
 2015-05-09 01:13:56 +02:00
Palana
851d13e910 UI: Add override specifier 
Found by clang-3.6 via -Winconsistent-missing-override
 2015-05-09 01:13:45 +02:00
dodgepong
9d6482a3b1 Fix issues with German translation 2015-05-08 17:36:26 -04:00
Jim
1b577cb45b Merge pull request #426 from dodgepong/latest-crowdin-translations 
Add latest translations from CrowdIn
 2015-05-08 14:17:30 -07:00
dodgepong
d0fbe3b382 Add latest translations from CrowdIn 2015-05-08 17:10:39 -04:00
Jim
b620bb13b5 Merge pull request #425 from fryshorts/bsd-cpu-model 
libobs: Implement logging cpu model on bsd
 2015-05-07 12:30:23 -07:00
Palana
ec1043515b UI: Move Recording button label update logic 2015-05-07 02:08:09 +02:00
Palana
f1f1ca45df UI: Selectively disable focus frame 
NoFocusFrameStyle was meant to disable focus frames around the scenes/sources
list (on OSX); unfortunately it also removed focus frames from controls that
should have focus frames like input boxes in the settings window
 2015-05-07 02:08:09 +02:00
Palana
9ddbb1077a UI: Sanitize muted handling in VolControl 2015-05-07 02:08:09 +02:00
Palana
0f2310a8bc libobs: Extend levels_updated signal with muted flag 2015-05-07 02:08:08 +02:00
Palana
4d40c5c853 libobs: Extend audio_data signal with muted flag 2015-05-07 02:08:08 +02:00
Palana
71abed387f (API Change) libobs: Make obs_service refcounted 2015-05-07 02:08:05 +02:00
Palana
ba0b8eb0e1 (API Change) libobs: Make obs_encoder refcounted 2015-05-07 02:07:56 +02:00
Palana
f094bf199d (API Change) libobs: Make obs_output refcounted 2015-05-07 02:06:40 +02:00
Palana
a563fbc05b libobs: Add weak reference type for obs_source 2015-05-07 01:57:14 +02:00
Palana
99deb0821f libobs: Add refcounting helpers 2015-05-07 01:57:14 +02:00
Palana
a907d74903 util: Add os_atomic_compare_swap_long 2015-05-07 01:57:14 +02:00
jp9000
bf1ca59965 util: Add dstr functions to make upper/lower 2015-05-07 01:57:14 +02:00
Palana
ae19eec2c6 util: Improve handling of config values with linebreaks 2015-05-07 01:55:12 +02:00
fryshorts
e3901b2072 Revert "libobs: Fix missing getline on FreeBSD" 
This is no longer needed since getline is only used in linux specific
functions now.
 2015-05-06 21:39:17 +02:00