62 Commits

Author SHA1 Message Date
jp9000
1047b129a6 Fix startup issues with scene collections
If a scene collection wasn't found at startup, it would create a
'(null)' scene due to a null pointer.

Also, moved scene collections to the scene collections folder rather
than the base folder to prevent conflicts with the older scenes.xconfig
file.
2014-07-31 17:27:08 -07:00
jp9000
70cb064d32 Implement scene collections in menu only
This hopefully resolves some conflicting opinions about how scene
collections should be handled, and removes it from the general settings
panel, where it felt a bit cluttered.

Actually, I would kind of like it if profiles were handled this way too.
This feels a lot cleaner than how profiles are handled in the general
settings.  The profiles thing in the general settings definitely feels
clunky.

In the main menu, the scene collections menu now has the following menu
items:

- New
- Duplicate
- Rename
- Remove
- Import
- Export

Duplicate was something I personally added - I felt like it might be a
nice thing to have for the sake of convenience.  Import/Export was
requested by dodgepong, and is also definitely nice to have.  Due to how
easy new scene collections are to set up it didn't take very long to put
in.
2014-07-30 19:28:27 -07:00
jp9000
92e407c5a4 Disable scene collections
We've decided not to release scene collections.  It caused some backward
compatibility issues, as well as some ease-of-use concerns.  We just
don't feel comfortable with it so we're just going to go with the
import/export style that will be implemented in OBS2.
2014-07-24 22:11:21 -07:00
palana
bafa55b754 Preserve default scenes.xconfig for compatibility with older versions 2014-07-25 04:09:16 +02:00
palana
1c62fa9472 Remove shaderCache directory creation
This should have been in 9a9deb5d4cd0c639f4eddaa4af449c10189887bc
2014-07-08 18:41:22 +02:00
Glought
98d18ba4fe Added "Scene Collection" Menu
Now able to Switch between different Scene collections.
All Scene ".Xconfig" files now stored in the "sceneCollection" folder.
Changed "GetApplicationName()"  added "Profile: SceneCollection: " to the beginning of the app name.

Added "Scene Collection" Combo Box in Settings General

Can add/rename/remove new scenes collections in settings general.
Can add/rename/remove new scene collections while streaming.
Can change scenes Collections while streaming.
2014-06-25 22:16:06 -07:00
Richard Stanway
2b35f4386b Workaround for VS2013 AVX2 bug
http://connect.microsoft.com/VisualStudio/feedback/details/811093
2014-04-24 17:37:44 +02:00
jp9000
3b5fdc08cf Prevent valid log check from reading too much
Also, fix a JSON parsing bug
2014-04-23 11:07:03 -07:00
Richard Stanway
5d6cc218eb Some static analysis fixes via Coverity Scan 2014-04-09 00:47:39 +02:00
jp9000
dfc96d088e Add -profile [profile] command line option
A user requested it, and it was super quick and easy, so I did it.

Also, renamed an unusual variable isSTEREO to isStereo.
2014-03-07 20:13:24 -07:00
shousa
9af05a3f1d Enabled to select monaural audio
For sites that bit rate is limited
2014-03-03 23:22:40 +09:00
jp9000
f83442633b Replace MessageBox with wrapper for RTL languages 2014-02-24 18:18:21 -07:00
jp9000
458de858dd Restore code of previous commit but still attach
I shouldn't have deleted the previous code, so I reverted it and just
commented out one line instead
2014-02-21 22:07:48 -07:00
jp9000
9139963d5a Always add game capture log to the end of a log
Until file monitoring has been fixed I want to always append game
capture logs to the end of regular logs.  I'm just tired of seeing logs
from users where game capture clearly worked and yet no game capture log
at the end of the file.
2014-02-21 21:57:43 -07:00
palana
7b3beebe1b Fix #53 "Openable log window while application is active"
@jp9000
Implement log window

Also made it so that the log window position/size is saved.  Defaults to
600x500, centered to the main monitor if no configuration found.

@palana
Log system integration and callback behavior
2014-02-14 00:21:44 +01:00
Richard Stanway
a18e929e5a Set HeapEnableTerminationOnCorruption flag 2013-12-31 01:46:55 +01:00
palana
caff2f8874 Updated cpu model and cpu family detection 2013-10-17 00:12:47 +02:00
jp9000
d4f54a3c5f add a 'stream up on startup' command line option, (-start) 2013-10-05 10:23:09 -07:00
jp9000
4c65b1d7fb Merge remote-tracking branch 'origin/master' 2013-08-22 15:00:27 -07:00
jp9000
3a57d10d04 added saving of custom colors in custom colors dialogs (app-wide), saves colors on exit to config and loads them on startup 2013-08-22 15:00:00 -07:00
palana
db2d95627f Added shader blob file cache
To offset the huge compile time for shaders with complexity similar to the yadif shader
2013-08-19 19:49:25 +02:00
HomeWorld
aec39fe4d2 Append graphics capture hook log to main log only when needed 2013-08-15 02:13:44 +03:00
jp9000
94ea3d1f2f Fixed a mintor bug preventing the appending of the capture hook log 2013-08-12 11:38:07 -07:00
jp9000
711ec4bc32 Made is so game capture logs are automatically appended to the main log file on app exit 2013-08-10 02:26:00 -07:00
Richard Stanway
08e1ac51ef Make Aero warning more annoying when using monitor capture.
Allow disabling of Aero at runtime.
2013-06-14 01:51:40 -04:00
jp9000
a8f22d6caf Added logging of module addresses and loaded plugins 2013-05-07 13:52:05 -07:00
Richard Stanway
fa0704e4de Add simple SSE2 check at startup to avoid crashes 2013-05-04 00:02:57 -04:00
jp9000
6b37fdf576 replaced tabs (for the time being at least. probably going to switch everything to tabs later) 2013-05-01 15:58:55 -07:00
jp9000
d918efdc4a Add a debug flag when administrator - prevents issues with game capture being able to open target process 2013-05-01 15:48:07 -07:00
Richard Stanway
73f68bdc3f Static analysis cleanups 2013-04-30 23:11:08 -04:00
jp9000
91aa0bee2f Probably going to change back to FastAlloc for the time being 2013-03-30 13:42:11 -07:00
jp9000
7f248c34f7 Isolated a string object to a brace block to prevent memory leakage and program crash when the application is using a different allocator 2013-03-26 06:41:14 -07:00
jp9000
7fedee0deb woops, made the OBS class just nullify itself instead 2013-03-26 06:37:28 -07:00
jp9000
6af9f4e42c fixed a bug with notifications where it could access App object when it was freed 2013-03-26 06:29:33 -07: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
HomeWorld
70d7690b43 Do not create a separate folder (OBS) for data stuff when using -portable 2013-03-26 08:56:23 +02:00
HomeWorld
28516bd4d2 Added -portable command line option 2013-03-26 08:39:13 +02:00
jp9000
6ad7e3e472 Make CRT allocator the default allocator 2013-03-25 21:30:18 -07:00
Richard Stanway
f40d5825c5 Don't allow runtime disabling of DEP 2013-03-08 15:29:41 -05:00
jp9000
832f2d4187 added code to log monitors the user has
fixed bug with using x264 presets/tunes in x264 custom params
updated japanese text and made some english text adjustments
2013-02-16 20:26:58 -07:00
jp9000
5a059da5a6 Added multiple instance command line parameter 2013-02-03 14:10:54 -07:00
jp9000
0886fd7c82 Reverse source order on startup if version < 0x470 2013-02-03 03:23:28 -07:00
jp9000
e2ea43ca93 merging develepment branch. don't kill me! 2013-01-24 20:30:22 -07:00
Richard Stanway
ac052a2db2 First stage of the auto updater 2012-12-23 23:12:04 -05:00
jp9000
74851f4d1d final little bugfixes before 0.455 2012-12-13 12:01:41 -07:00
jp9000
1f0152ad91 fixed transcoding issues, fixed issues that could occur with bad mics/devices, logging more data, fixed bugs related to scene changing 2012-12-12 19:48:44 -07:00
Richard Stanway
1cdc107a60 Only switch cwd if files appear to be missing 2012-12-10 08:22:05 -05:00
Richard Stanway
2e47113101 Always use app folder for cwd 2012-12-08 01:21:05 -05:00
Richard Stanway
4eeaf895ed Fix crash dump logs on AMD64
Switch to process-wide exception handler instead of VEH.
2012-11-29 20:55:31 -05:00
jim
7e10a6cad2 added more info to crash handler, fixed some bugs, adjusted rtmp code, removed unnecessary traces 2012-11-22 06:50:22 -07:00