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
Jim
525d5debac
Merge pull request #125 from lmurray/master
...
1:1 preview mode
2013-03-03 20:41:59 -08:00
Lucas Murray
793c59f7a0
Merge remote-tracking branch 'upstream/master'
2013-03-04 12:07:22 +08:00
Lucas Murray
f0fe72aa45
Recalculate the preview area when resizing the window
2013-03-04 11:56:06 +08:00
Lucas Murray
c9119a95ec
Added a right-click menu item to toggle 1:1 preview mode
2013-03-04 11:37:03 +08:00
Lucas Murray
8116b0680e
Added a 1:1 preview mode that is currently always enabled
2013-03-04 11:36:50 +08:00
jp9000
675d0c6d6c
added an audio filter API
2013-03-03 18:20:38 -07:00
jp9000
9468b2cbc5
removed almost all of the mp4 compile time
2013-03-01 13:22:33 -07:00
jp9000
ac3fc240e7
fixed hooking issues with D3D 10/10.1/11 games, made it hook by DXGI rather than by the individual APIs
...
also, added a copy for game capture to prevent render slowdowns
2013-02-28 18:33:49 -07:00
jp9000
0f3987a3d8
well, looks like I just made a very nice optimization
2013-02-28 14:05:19 -07:00
jp9000
5cccb84106
fixed a minor bug
2013-02-28 09:29:35 -07:00
HomeWorld
9445b0702a
Implemented #50 (slideshow disable fading | randomize)
2013-02-28 14:33:07 +02:00
jp9000
07d2e2bdd8
Fixed a bug in advanced that always set the global audio time offset to 50ms when the advanced page was used. just disabled global audio time offset for the time being
2013-02-26 16:27:03 -07:00
jp9000
911a209ed6
fixed a fairly critical bug that caused I444 to be used due to 1.) visual studio saving old control IDs, and 2.) me forgetting/neglecting to remove code for old control IDs
2013-02-26 03:35:45 -07:00
jp9000
75c83e83bc
Added an option to force mic to use the QPC timestamps (or alternatively use desktop time if disabled)
...
Fixed a potential minor issue with directshow devices choosing a less-than-optimal output format
2013-02-25 16:58:06 -07:00
jp9000
2fe05b123b
added "desktop audio boost" option
2013-02-25 03:11:32 -07:00
jp9000
3be930e719
added compatibility mode for software capture
...
added triple buffering option to advanced settings (potentially as an optimization for some cards)
added scene buffering time option to advanced settings (mainly for sound devices)
moved "Use CBR" to encoding section, made buffer size automatically default to the same as bitrate unless "Use Custom Buffer Size" is checked
2013-02-24 07:51:01 -07:00
Jim
f0490fdbd7
Merge pull request #115 from hwdro/master
...
Erase preview's window bk when stream is running and preview is disabled
2013-02-22 22:44:19 -08:00
jp9000
34f73441b3
finally fixed that utterly stupid size reset thing
2013-02-22 23:42:06 -07:00
HomeWorld
275690969d
Use def window proc for bk erase, also spawn enable preview popup menu on WM_RBUTTONUP
2013-02-22 11:14:15 +02:00
HomeWorld
4ccbe1787d
Properly erase preview window bk when stream is running and enable preview is not ticked
2013-02-22 10:45:17 +02:00
jp9000
672333fa6a
Added volume bar to directshow source,
...
moved the volume controls to OBSApi,
made some minor tweaks to mic audio
2013-02-21 01:42:35 -07:00
jp9000
34ae3ac1de
graphics capture fix just in case injectHelper isn't working
...
also fixed text so that it doesn't use GDI textures, should fix multi-GPU laptop issues
2013-02-19 17:14:40 -07:00