456 Commits

Author SHA1 Message Date
Eric
b795814a41 Fix performance issue warning on int -> boolean conversion. 2013-03-23 14:14:14 +01:00
Eric
77766a0421 Merge branch 'master' of https://github.com/jp9000/OBS 2013-03-23 14:10:57 +01:00
Eric
c68d89c2af Implement part 2 of #148, two separate control panel visibility states, which are saved across sessions. 2013-03-23 14:10:16 +01:00
Jim
89503a87f4 Merge pull request #154 from foxx1337/traymenu
Profile switching, hide/show, exit added to the Notification Area icon
2013-03-22 20:53:56 -07:00
foxx1337
bca1e9dcd1 Added a poopup menu as response to clicking on the Notification Area icon. Added Exit and profile switching functionality to that menu. Left clicks / right clicks on the Notification Area icon are now smart - they just enable OBS if a modal dialog is topmost in the OBS dialog stack. 2013-03-23 02:50:19 +01:00
Eric
41bcd09017 Move ResizeWindow so it gets called both wen entering and leaving fullscreen and redraw the renderFrame to prevent the preview from showing up pixelated. 2013-03-23 00:09:14 +01:00
jp9000
d02364a0bf Added ability to use game capture via hotkey instead of having to select the window 2013-03-21 23:01:37 -07:00
Jim
11d93fa48b Merge pull request #144 from foxx1337/trayicon
Added Notification Area Icon and minimize to Notification Area
2013-03-21 03:19:08 -07:00
jp9000
3fc6a56820 Merge remote-tracking branch 'origin/master' 2013-03-20 17:10:38 -07:00
jp9000
3cd334b61e Added bicubic and lanczos downscale shaders, optimized existing bilinear downscale shaders 2013-03-20 17:10:05 -07:00
foxx1337
058537cdfa Added support for systray (Windows Notification Area) icon. Modified the default OBS icon (added a red dot) to signal running state (broadcasting, previewing, etc). Added two General Settings options for displaying the Notification Area icon and minimizing to it. 2013-03-20 04:32:45 +01:00
William Hamilton
b4887f748f Removed previewOnly given it is available through OBSGetPreviewOnly. 2013-03-19 17:52:00 -05:00
William Hamilton
28ae32920e Switch event api to plugin export c-style calls. Virtual-function calls too fragile. 2013-03-19 17:52:00 -05:00
paibox
ee68ba6924 Added point filtering option to the software capture source as well, useful for up/downscaling of emulators and other low resolution fixed pixel 2D stuff. 2013-03-19 12:02:44 +01:00
Lucas Murray
351b4089f0 Increase minimum window height in order to not cut off preview messages 2013-03-19 15:50:26 +08:00
Lucas Murray
cf88113b78 Remember maximize state between application sessions 2013-03-19 14:50:17 +08:00
Richard Stanway
74d2b05710 Merge remote-tracking branch 'refs/remotes/origin/master' 2013-03-18 18:45:02 -04:00
jp9000
10b43836bf changing the size of the scene buffering time temporarily - DON'T TEST ME KRAZY 2013-03-18 14:29:19 -07:00
Eric
b284a04804 Fix tab settings. 2013-03-18 21:48:48 +01:00
Eric
5fad211eec Fullscreen preview on the same monitor as the OBS window and force a call to resize even if the window is maximized. 2013-03-18 21:26:29 +01:00
Lucas Murray
bdb572c2c0 Merge remote-tracking branch 'upstream/master' 2013-03-19 00:06:40 +08:00
Lucas Murray
7bb8bfddd8 Hide panel in fullscreen mode by default; ESC cancels fullscreen mode;
Fix always-on-top when exiting fullscreen mode
2013-03-19 00:04:25 +08:00
Lucas Murray
840703852e Don't resize the DirectX buffers until after the user finishes resizing
the window
2013-03-18 23:16:20 +08:00
jp9000
0b7ac33536 added an option to use frame duplication (without necessarily using CFR) 2013-03-18 07:01:14 -07:00
paibox
b7b6fb203e Tiny code cleanup. 2013-03-18 14:56:39 +01:00
Lucas Murray
258b7045f5 Added a fullscreen mode 2013-03-18 21:49:25 +08:00
Lucas Murray
65babd7331 Made the control panel hideable; Fixed edit mode when maximizing or
restoring the window
2013-03-18 20:55:54 +08:00
Lucas Murray
6595e6b3a8 Enable the maximize button 2013-03-18 20:05:54 +08:00
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