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

628 Commits

Author SHA1 Message Date
Lucas Murray
00c41fd8a5 Make the DirectX control fill all available space; Display a message 
when the user isn't streaming or if the preview is disabled; 1:1 mode
now center aligns the preview if the window is too small
 2013-03-18 18:02:07 +08:00
Lucas Murray
0513422f20 Add helpers for converting between window and frame coordinates 2013-03-18 15:08:20 +08:00
Richard Stanway
6d9458bd9f Merge remote-tracking branch 'refs/remotes/origin/master' 2013-03-17 23:09:45 -04:00
Richard Stanway
9e3613c75e Support profiles via x264 custom settings 2013-03-17 23:08:56 -04:00
Jim
a99ab44312 Merge pull request #137 from lmurray/master 
Splitting "Settings.cpp" and new SettingsPane API
 2013-03-17 03:45:53 -07:00
paibox
8a610d5ae5 Because I forgot to think. Unless separate boost is implemented for audio sources added through the API, this should be fine. 2013-03-17 09:47:19 +01:00
paibox
1810fae45b Make auxiliary audio sources use their own set volume rather than 
the desktop volume, and quick fix of "Output to stream only" for stuff
like the DirectShow device source.
 2013-03-17 08:34:56 +01:00
Lucas Murray
6b9b671a3d Use SettingsPane for the noise gate settings; Remove HINSTANCE from 
the SettingsPane API as it's not needed
 2013-03-16 20:01:19 +08:00
Lucas Murray
86f931902d Moved SettingsPane to OBSApi 2013-03-16 18:55:41 +08:00
Lucas Murray
b2a1b533c3 Added a SetChangedSettings() method to SettingsPane 2013-03-16 18:34:40 +08:00
Lucas Murray
1a62251b66 Ported advanced settings to SettingsPane 2013-03-16 18:17:36 +08:00
Lucas Murray
2577e34f7d Ported audio settings to SettingsPane 2013-03-16 18:05:44 +08:00
Lucas Murray
439f55ae39 Ported video settings to SettingsPane 2013-03-16 17:30:29 +08:00
Lucas Murray
c153a3656a Ported broadcast settings to SettingsPane 2013-03-16 17:13:30 +08:00
Lucas Murray
c2d232843a Ported encoding settings to SettingsPane 2013-03-16 16:53:30 +08:00
Lucas Murray
980f4104c2 Created a SettingsPane class and ported the general settings screen to 
use it
 2013-03-16 15:30:24 +08:00
Lucas Murray
b81c368ba9 Remove old noise gate code from "OBS.h" 2013-03-15 22:04:31 +08:00
Lucas Murray
72207ac344 Merge branch 'master' into noisegate 
Conflicts:
	rundir/copydebug.bat
	rundir/copydebug64.bat
	rundir/copyrelease.bat
	rundir/copyrelease64.bat
 2013-03-15 21:56:48 +08:00
Lucas Murray
69f4c00760 Add an API for accessing the current RMS, max and peak volume 
statistics for the desktop and microphone audio sources
 2013-03-14 22:06:02 +08:00
Lucas Murray
4ce71a44bb Revert "Force the OS scheduler period to be at or below 4ms" 
This reverts commit ad578ccd0f252df2c83009cf263ee1818fddcd4b.
 2013-03-14 16:45:53 +08:00
paibox
3198d9dcf9 Added color key functionality to the Image source 2013-03-12 06:09:22 +01:00
Lucas Murray
e0afb03777 Merge branch 'master' into noisegate 2013-03-10 14:18:57 +08:00
jp9000
0d1157ff4e reverted triple buffering code that was causing crashes 2013-03-08 23:29:43 -07:00
Richard Stanway
048889ae69 Merge remote-tracking branch 'refs/remotes/origin/master' 
Conflicts:
	Source/Encoder_x264.cpp
 2013-03-08 18:51:09 -05:00
Richard Stanway
e8784704a1 Crash when texture map fails, or we end up deadlocking 2013-03-08 18:35:03 -05:00
jp9000
5f4ea96439 a few minor alterations to code positioning 2013-03-08 16:31:09 -07:00
Richard Stanway
f40d5825c5 Don't allow runtime disabling of DEP 2013-03-08 15:29:41 -05:00
Richard Stanway
74337972d4 Fix GetBitRate when not using VBV 2013-03-08 15:27:44 -05:00
William Hamilton
f6e2226879 Pack volume level in lParam, to prevent freeing allocated memory across dll's 2013-03-06 21:32:34 -06:00
Lucas Murray
bc2171ed6a Moved noise gate code into its own plugin; Removed raw mic volume 
variables from main audio loop
 2013-03-06 18:40:17 +08:00
Lucas Murray
528ae566a9 Merge branch 'master' into noisegate 2013-03-06 16:59:10 +08:00
Lucas Murray
c646b38a6b Remove clicking from noise gate at the expense of not being able to 
display the output microphone volume on the GUI
 2013-03-06 11:45:56 +08:00
Lucas Murray
ad578ccd0f Force the OS scheduler period to be at or below 4ms 2013-03-06 11:45:42 +08:00
Lucas Murray
24bca776fa Added a microphone noise gate with hard-coded settings; Split the 
volume meter widget into two bars and use the top bar to show the raw
input level and the bottom bar to show the output level after DSPs
 2013-03-06 11:45:27 +08:00
jp9000
3c8257a8e1 removed a useless debug message 2013-03-05 19:54:58 -07:00
jp9000
da4de110a7 fixed delay, added timed bframe-only dropping 2013-03-05 19:54:58 -07:00
jp9000
4d94812121 new network code 2013-03-05 19:54:58 -07:00
Lucas Murray
fa07dd8114 Merge remote-tracking branch 'upstream/master' 2013-03-06 10:37:17 +08:00
jp9000
705fd556af Made graphics capture hook to use more common API functions when getting a temp swap chain 2013-03-05 16:34:53 -07:00
jp9000
4557078698 fix to the multi PTT hotkey code 2013-03-05 16:27:37 -07:00
paibox
e02acf1532 Added a second push to talk hotkey 2013-03-05 23:05:34 +01:00
Lucas Murray
ef70d81874 Merge remote-tracking branch 'upstream/master' 2013-03-05 15:54:56 +08:00
Lucas Murray
c7f92f3c99 Remove duplicate switch case from previous merge 2013-03-05 15:53:43 +08:00
Lucas Murray
d8cdc635f3 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	OBS.rc
	Source/TextOutputSource.cpp
	Source/WindowStuff.cpp
 2013-03-05 12:06:41 +08:00
jp9000
278c38ea38 allow case change on scene/source names 2013-03-04 21:00:50 -07:00
jp9000
bee3afc173 fixed a tiny sync bug with the new mp4 code 2013-03-04 11:23:00 -07:00
jp9000
490c79a404 manual merge of pull request for issue #126 by lmurry (also known as.. sunforest. ...) 
fixed a bug with audio sources
added ability to change outline opacity independently of outline
a minor fix to renaming sources/scenes
 2013-03-04 10:03:09 -07:00
Lucas Murray
d7e97875f1 Remove redundant XBaseItem methods 2013-03-05 00:26:24 +08:00
Lucas Murray
0d881db976 Don't test against the same element when renaming it; Fix auto-fill of 
scene and global source rename dialog; Fixes issue #118
 2013-03-04 18:21:18 +08:00
Lucas Murray
252f122c56 Added ability to change the opacity of text outlines independently of 
the text itself
 2013-03-04 18:19:54 +08:00