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

178 Commits

Author SHA1 Message Date
jp9000
71b3830b64 Make record button primary when set to record only 
When the user has set the mode to "record to file only", make it so
that the "Start/Stop Recording" button is enabled, and that the
"Start/Stop Streaming" button is disabled.  Having both buttons
enabled when in 'record only' mode is just a bit confusing.
 2014-01-03 13:59:04 -07:00
jp9000
01df955967 Merged keep_recording branch 
This branch fixes the issue of your recordings ending every time the
network stream is disconnection.

This commit is a squash of the following commits on the branch:

    tweak the button positions a little bit
    Added OnOBSStatus plugin callback
    Enables plugins to recreate the (LIVE + REC) display
    Skip ReportStreamStatus callbacks if there is no actual stream
    Fix the status bar for real this time
    Make the status bar keep updating when not live
    Fixed exit cleanup while streaming/recording
    Fix Stop() behavior and stream status message
    Continue recording even if the stream goes offline
    Requires setting KeepRecordingOnStopStreaming to 1 in global.ini to test
 2014-01-03 09:23:46 -07:00
paibox
1f4bb46250 Change the idle description for the toggle recording button 
Because it confused everyone. It's now just a grayed out "Start
recording" while it's disabled.
 2013-12-31 09:22:03 +01:00
paibox
06f66dbcce Add stream status indicator next to current time 
Display current recording/streaming status next to the current running
time. (LIVE)/(LIVE+REC)/(REC)/(Preview)
 2013-12-31 00:55:07 +01:00
paibox
808bc49c73 Add a button to toggle recording on/off 
Like the description says. Currently nukes the Dashboard button, not
quite sure where to put it. Allows you to toggle recording while
streaming, to split up videos or turn it off while you AFK in Orgrimmar
for ten hours.
 2013-12-29 22:40:02 +01:00
Richard Stanway
62c9c10ae3 Don't fire plugin events during OBS shutdown 2013-12-11 21:38:47 +01:00
jp9000
49241dc400 Added ability to use input devices for desktop audio, added a 'point filtering' option to text output source 2013-12-05 17:22:24 -07:00
HomeWorld
be5e859c4d Fixed a small UI bug introduced by 78cfebc (sources listview columns not being resized properly) 2013-10-23 08:35:39 +03:00
jp9000
d4f54a3c5f add a 'stream up on startup' command line option, (-start) 2013-10-05 10:23:09 -07:00
Richard Stanway
921d7f5ac1 Add option to manually check for updates 2013-10-02 23:18:30 +02:00
HomeWorld
78cfebc527 Show main wnd after we're done with init stuff and not before 2013-09-29 01:26:02 +03:00
jp9000
25c8a4c1c7 changed some bad default values 2013-09-22 21:37:51 -07:00
jp9000
b95889d1b0 added a red message on the status bar if encoding is taking too long to process 2013-09-20 21:22:41 -07:00
Richard Stanway
89de3a6f70 Make 64 bit and 32 bit update check independent 2013-09-08 18:42:43 +02:00
jp9000
bbc084f2c7 fixed a display bug with the projector UI 2013-09-02 22:52:32 -07:00
jp9000
4475863468 fixed projector thread issues 2013-09-02 22:29:14 -07:00
jp9000
753156fb82 Make projector stuff thread safe 2013-09-02 21:19:25 -07:00
jp9000
0bcbc14fc0 Added UI stuff for projector 2013-09-02 19:38:03 -07:00
jp9000
8fd7282cb8 Added a "projector" mode to allow outputting the preview to a separate screen at the same time as the main window (differs from fullscreen preview in that you can do it to a separate monitor while still having the main OBS window open) 2013-09-02 17:34:36 -07:00
paibox
c1935ac882 Remember preview enabled/disabled setting 
Store the state of the preview in the global configuration file.
 2013-09-02 15:36:28 +02:00
jp9000
f17ddc84c6 Separated encoding to a separate thread to prevent constant framerate issues, and increased frame timing precision to nanosecond approximation 2013-08-31 13:13:50 -07:00
jp9000
8d1e222aeb Fixed a bad positional check when loading the window position on startup (thanks sapiens and goalitium for pointing it out) 2013-08-07 23:27:09 -07:00
shousa
ebce28fc60 enable window width more compact 
enable window width more compact
 2013-07-28 20:51:49 +09:00
Richard Stanway
40475c1346 Fix typo 2013-07-25 09:10:59 -04:00
Crehl
5bc55a6388 Correctly show/hide the dashboard button upon profile change, not just window resize. 2013-07-21 17:16:55 +01:00
foxx1337
5fd4a88eb4 fixed the header declaration for OBS::EnsureCropValid; the main window now shows <profilename> - <programname> (was <programname>), same for the notification area tooltip (was OBS) 2013-07-21 11:42:25 +02:00
Eric Bataille
a5f1c526c6 Don't exit edit scene mode when going fullscreen. 2013-07-17 20:01:10 +02:00
jp9000
ab34a238b5 undo last commit for optimus hint because according to others it apparently can prevent GPU switching 2013-07-16 01:59:53 -07:00
jp9000
6bad03d117 added an nvidia optimus hint export to encourage laptops and similar systems to use the nvidia over the intel by default 2013-07-16 01:09:09 -07:00
HomeWorld
1de770bd58 Load and initialize the plugins after we are done with main OBS stuff 2013-06-19 21:41:26 +03:00
Eric Bataille
a382bf8994 Renamed LoadPluginAPIVer to LoadPluginEx to avoid confusion. 2013-05-29 19:15:27 +02:00
jp9000
83c3d732a6 Added some extra functions and callbacks for API version checks for plugins to prevent them from necessarily loading if the API version number changes or is incompatible 2013-05-07 14:40:13 -07:00
jp9000
1bd101c792 changed project settings to use SSE2 optimizations by default, and removed SSE2 checks from the app 2013-05-03 19:54:49 -07:00
Richard Stanway
73f68bdc3f Static analysis cleanups 2013-04-30 23:11:08 -04:00
jp9000
798362fed0 made a tiny fix for text color issues on the status bar 2013-04-25 22:10:14 -07:00
jp9000
fccdc638aa Split up software capture into window and monitor capture. Put warnings on monitor capture for vista/7 and when aero is on 2013-04-19 10:50:16 -07:00
HomeWorld
1da99309bd Fixed an issue where the RenderMessage static text isn't properly repainted on maximize/restore down. (issue #171) 2013-04-03 22:46:56 +03:00
Richard Stanway
6d4652da5f Fix updater compatibility with portable mode 2013-04-01 20:14:20 -04:00
HomeWorld
fb53cc80c5 After Shell_NotifyIcon is called destroy loaded icon if it's the case 2013-04-01 09:28:25 +03:00
jp9000
7fedee0deb woops, made the OBS class just nullify itself instead 2013-03-26 06:37:28 -07:00
HomeWorld
21264a6fc2 Fixed render message static text flickering when resizing (WS_CLIPCHILDREN flag added to parent window) 2013-03-26 11:49:32 +02:00
HomeWorld
e4b5476db0 Make sure obs' tray icon is properly updated when stream starts/ends. 2013-03-26 11:25:09 +02:00
HomeWorld
740d9b852e Do not check for updates if in portable mode (the updater makes assumptions that user data is in appdata folder). Added an alternative way to enable portable mode (check at start if a file named obs_portable_mode exists in obs' working dir) 2013-03-26 10:03:28 +02:00
jp9000
bb43293e31 fixed a memory leak with settings panes 2013-03-25 21:27:34 -07:00
Jim
14e943dfc9 Merge pull request #160 from foxx1337/nifix 
Moved the code for adding / removing the Notification Area icon...
 2013-03-25 05:37:07 -07:00
foxx1337
04826a68cc Moved the code for adding / removing the Notification Area icon directly into OBS::ReloadIniSettings(), its proper place. Fixes a bug that caused the OBS window remain hidden and unreachable. 2013-03-23 16:47:28 +01:00
Eric
cb62447599 Review by chat: Fix settings loading, clean up ProcessPanelVisible(). 2013-03-23 14:36:19 +01:00
Eric
b795814a41 Fix performance issue warning on int -> boolean conversion. 2013-03-23 14:14:14 +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
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