234 Commits

Author SHA1 Message Date
jackun
3a5f10d919 When deleting a profile open next profile's ini. 2014-12-30 15:31:00 +02:00
Glought
ffe212bdee Implement Profiles in menu only
I have implemented the same menu as scene collections

- New
- Duplicate
- Rename
- Remove
- Import
- Export
2014-10-16 03:29:33 -07:00
hohoho
658800ee2e Added scene collections API calls 2014-10-16 00:56:00 -07:00
palana
aec9599704 Don't display Connection.Disconnected for forced PostStopMessage 2014-09-27 19:32:49 +02:00
palana
fadce387bb Add PostConfigureStreamButtons
Deadlock free-er button updates
2014-09-24 15:20:25 +02:00
palana
c8b7f3eab4 Add warnings when using invalid (Replay Buffer) File Path(s) 2014-09-24 01:22:52 +02:00
palana
1802fd7ddc Strip filename inside of GetExpandedRecordingDirectoryBase
Fixes 'invalid' file name style paths like "C:/foo/%.flv"
2014-09-12 21:36:14 +02:00
palana
f35e835758 Add File -> Show Saved Replay Buffers menu entry 2014-09-12 21:23:52 +02:00
palana
04ce520708 Make File -> Show Recordings Folder aware of file name expansions 2014-09-12 21:23:52 +02:00
Glought
fc73e0a21c Fixed a bug with "copyTo" that only effected the 64bit version of obs
I have fixed a bug when a user uses obs 64bit and  copies a scene to a
different scene collection it will instead of copying to the target
scene collection it would copy it to a new scene collection with what
looks like chinese characters as the new scene collection's name. This
bug only happened in the 64bit version of obs.
2014-09-08 00:18:33 -07:00
palana
b3817488b4 Add API support for Replay Buffer
Closes https://github.com/jp9000/OBS/issues/374
2014-09-01 05:03:10 +02:00
Richard Stanway
739915317d Fix live removal of global sources with non-default names 2014-09-01 00:57:25 +02:00
Glought
fbfb0a98e4 Added "Copy To" in the scenes right click context menu
I have added a "Copy To" menu item to the scenes right click context menu below "Copy".

When hovered over it will open a sub-menu where the user can then select the scene collection file the user wants to copy the selected scene to.

If there is a reference to a global source it will open a dialog asking the user if he/she wants to also copy the global sources the references point to.If the user clicks "No" the references are removed from the copied scene.If the global sources already exists in the target scene collection a dialog will open letting the user know but the scene is still copied.

A dialog will open telling the user the export was successful or the scene already exists in the selected scene collection.

I believe this is useful for users that want to copy or move scenes to a different scene collection.
2014-08-26 16:19:56 -07:00
Jim
04a089f3e8 Merge pull request #362 from Glought/SceneCollectionGlobalSourcesImport
Added "Import" button in Global Sources Dialog.
2014-08-21 16:11:32 -07:00
palana
38f96367d1 Separate Replay Buffer from normal file recording 2014-08-21 02:29:40 +02:00
Glought
7e934f8f16 Added "Import" button in Global Sources Dialog.
The "Import" button opens a "Open" dialog where a user can open a scene collection file then it lists all Global Sources from the selected scene collection in a dialog.

You can Import multiple global sources by holding shift or Ctrl and clicking on the Global sources you want to import.

With this change scene collections have their own Global Sources but users can import Global Sources from other scene collections.

If you make any changes to a Global sources properties and want the change in another scene collection you will need to remove the global source in the other scene collection and then import it again.

You can't import Global Sources if there is already a Global Source with the same name.

Hopefully this makes it simple and fast for users to import their commonly used Global sources like for
example followers alerts.
2014-08-18 13:40:58 -07:00
palana
b0914dfbd5 Merge pull request #368 from Jack0r/remove-helpfile
Remove helpfile
2014-08-13 22:15:48 +02:00
palana
ad51cb0c8e Fix scene collection export
Fixes https://github.com/jp9000/OBS/issues/366
2014-08-13 19:38:38 +02:00
Jack0r
c98379b158 Change Help.Contents to Help.OpenHelp.
Instead of opening the OBS.chm it will open the online Help.
2014-08-13 17:54:40 +02:00
palana
fc79a5bcb7 Make log menu handling immune to (external) menu layout changes 2014-08-13 17:00:52 +02:00
palana
fe0347b1ef Fix log menu
The addition of the scenes collection menu changed the help menu
position without updating log upload related code
2014-08-13 01:48:38 +02:00
Richard Stanway
7e5f6ecc5f Fix crash when removing a global source with no scenes 2014-08-07 17:36:56 +02:00
jp9000
8bfdd25b00 Copy scene collection to scenes.xconfig
This allows better backward compatibility with older versions.  This
will keep the current scene collection set to default if the user ever
decides to downgrade OBS versions for whatever reason.
2014-07-31 17:27:08 -07:00
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
Richard Stanway
1419f39167 Hide bit-version for 32 bit OBS to avoid confusion 2014-07-23 17:12:48 +02:00
Richard Stanway
c9814c0a66 Don't allow runtime changing of scene collections as this leaves dangling XElement pointers in all the current SceneItems which causes crashes.
Refresh the Sources list when changing scene collections.
2014-06-27 19:11:44 +02:00
Richard Stanway
d824c3910d Fix crash when deleting a global source that didn't load 2014-06-27 17:43:45 +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
palana
c73c18e2fb Automatically select last recording when opening the recordings directory 2014-06-11 17:25:37 +02:00
palana
ea2faadbc6 Add "Open Recordings Folder" file menu item 2014-06-11 17:23:49 +02:00
jp9000
ad464d892c Keep unmuted volume values if volume muted
If a volume control was muted, the hidden 'unmute volume' value was not
saved to the configuration, meaning that if you exit while muted then
restart, it would unmute to 100% each time, causing annoyance for some
users.
2014-05-14 22:59:37 -07: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
25af8712c4 Remove unnecessary braces 2014-04-23 01:13:36 +02:00
Richard Stanway
26f9c88495 Allow RTMPPublisher to reconnect without full Stop / Start
Based on the "keep recording" hack. Not compatible with DelayedPublisher because DelayedPublisher is nasty >:(
2014-04-23 00:56:20 +02:00
Richard Stanway
1b8b8482bc Fix issues with 0 second reconnect timer 2014-04-21 19:13:05 +02:00
Richard Stanway
5d6cc218eb Some static analysis fixes via Coverity Scan 2014-04-09 00:47:39 +02:00
Richard Stanway
c1f702dc8f Small misc fixes 2014-04-09 00:46:37 +02:00
palana
d091679842 Disable uploading/analyzing of logs without logged system stats
The log file menu will now only contain log files that have at least logged
the system stats since too many people uploaded useless logs, unfortunately
2014-03-16 17:13:36 +01:00
palana
622dea851e Move LogUpdateCallback to a more appropriate location 2014-03-14 18:51:39 +01:00
Richard Stanway
e508216b31 Minor static analysis fixes 2014-03-10 23:18:15 +01:00
HomeWorld
a7a56f7118 Added a small visual indicator for global sources in sources listview 2014-03-06 10:24:45 +02:00
palana
d1a6dace57 Make OBS application name less fun 2014-03-04 16:35:39 +01:00
palana
9c06b9e603 Modify window title to show 32bit/64bit version 2014-03-03 16:49:11 +01:00
palana
02024ffcca Remove a whole bunch of tabs ...
Someone make Visual Studio remember that OBS1 uses spaces
2014-02-26 15:53:50 +01:00
palana
f4ed09778e Add RTL-aware wrappers for DialogBox and CreateDialog
This makes previous RTL-changes (except for OBSMessageBox) obsolete
2014-02-26 07:07:13 +01:00
palana
70a55af307 Right align menus (including the profile menu) and messagebox contents for RTL locales 2014-02-25 14:25:59 +00:00
jp9000
f83442633b Replace MessageBox with wrapper for RTL languages 2014-02-24 18:18:21 -07:00