218 Commits

Author SHA1 Message Date
Richard Stanway
42adfc7183 Basic support for installing custom service files 2015-05-08 23:50:44 +02:00
jp9000
691c251d89 Revert "Update OBS to D3D11"
This reverts commit fb3188a7cd94a4577238aae1692f91f847949090.

This was a change that was added to fix support for certain intel
devices, but ultimately I feel like it's just not needed and is trying
to fix something that isn't broken.
2015-01-23 14:52:22 -08:00
Andrew Story
c054777d66 Allow plugins to toggle the default transition via the API 2014-12-16 14:06:01 -08:00
jp9000
fb3188a7cd Update OBS to D3D11
This should fix the issues that have been happening with those intel
integrated laptops.
2014-11-19 15:48:12 -08: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
Jim
e0fce5bc27 Merge pull request #385 from hwdro/master
Use a separate texture when scene transitioning.
2014-10-10 16:56:13 -07:00
HomeWorld
872ed6f931 Use a separate texture when scene transitioning.
Get rid of 1+ DrawSprite call(s) during scene transition.
2014-10-04 01:09:59 +03:00
palana
c4a77ace4d Make pending streams not call OSTerminateThread on early exit 2014-10-03 21:15:39 +02:00
palana
c497f712de Add ClosableStream support to network streams 2014-09-24 15:20:28 +02:00
palana
70b4322229 Add ClosableStream support to file recording 2014-09-24 15:20:28 +02:00
palana
25c1a1130c Add ClosableStream support to ReplayBuffer 2014-09-24 15:20:27 +02:00
palana
3069c2e361 Mark NetworkStream and VideoFileStream as ClosableStream 2014-09-24 15:20:27 +02:00
palana
3caa30ce3b Add HandleStreamStopInfo helper 2014-09-24 15:20:26 +02:00
palana
8919fcb31d Add ClosableStream interface and pending stream helpers 2014-09-24 15:20:26 +02:00
palana
858991b506 Move NetworkStream and FileStream to std::unique_ptr 2014-09-24 15:20:26 +02:00
palana
fadce387bb Add PostConfigureStreamButtons
Deadlock free-er button updates
2014-09-24 15:20:25 +02:00
palana
b998dd5e18 Allow PostStopMessage to bypass reconnect logic 2014-09-24 15:20:24 +02:00
palana
4e63676d1a Add GetExpandedRecordingDirectoryBase
For a path "D:/foo/bar-$Y/$M/$T.flv" this will return at least "D:/foo"
(and create "D:/foo" if the directory doesn't exist) or at most
"D:/foo/bar-$Y/$M" with $Y and $M expanded, if those directories exist
2014-09-12 21:23:52 +02:00
palana
2ca9f89e95 Add ExpandRecordingFilename helper 2014-09-12 21:23:50 +02:00
palana
edfbea5ba0 Add support for 3rd party service.xconfigs
3rd party service.xconfigs are located in %AppDataPath%/services
(e.g. %APPDATA%/OBS/services in non-portable mode) and have the same
format as a single service definition in services.xconfig without the id
field, e.g.:

"My Service" : {
  servers : {
    Primary : "rtmp://live.example.org/live"
    Secondary : "rtmp://live.example.com/live"
  }
  recommended : {
    "max bitrate" : 1337
  }
}
2014-09-12 21:23:50 +02: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
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
b5f803084e Share memory between ReplayBuffer and RecordingHelper 2014-08-21 21:18:27 +02:00
palana
0f668e132b Add Record from Replay Buffer
This basically saves the current replay buffer and continues recording
to the saved file. The recording uses the standard file path.
2014-08-21 21:18:19 +02: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
Richard Stanway
82e31c2d1d Move bufferedVideo flushing to separate function, add logging 2014-08-13 23:01:26 +02:00
palana
79208d174b Add support for encoder settings panes 2014-08-13 00:37:49 +02:00
palana
1560f5b9e7 Add Save Interval support to UI/recording logic 2014-08-13 00:37:23 +02:00
palana
079b545747 Pass pts of encoded picture to file streams 2014-08-13 00:37:22 +02:00
palana
5f1f3d40b3 Track pts of encoded pictures 2014-08-13 00:37:22 +02:00
palana
0b5158d9e3 Streamline (settings) hotkey handling
This moves all hotkeys that were accessible in the audio/publish
settings panes to a new hotkeys settings pane

Also makes the push to talk hotkeys behave like all other (settings)
hotkeys, i.e. as long as a hotkey is configured the hotkey is active
2014-08-13 00:37:21 +02:00
Richard Stanway
094951b5e9 Prevent and warn about excessive audio buffering
Fix audio thread deadlock and issues with PTT / mute
2014-08-01 03:27:45 +02: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
palana
d036faa33e Allow recording even when SaveToFile is disabled
This changes the semantics of SaveToFile from "disable all file output
when disabled" to "automatically save stream to file when enabled",
which allows the "Start Recording" button to be enabled even when
SaveToFile is disabled.

Having the "Start Recording" button enabled now depends on having a
non-empty SavePath
2014-07-03 16:22:40 +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
jp9000
c150a39689 Use atomic pointer swapping for swapping frames
I can't help but wonder if this is causing some issues with frame
duplication, I suddenly realized the code wasn't particularly thread
safe so I threw this in as a precaution.
2014-06-23 12:06:23 -07:00
palana
c73c18e2fb Automatically select last recording when opening the recordings directory 2014-06-11 17:25:37 +02:00
palana
777deeb1cc Fix compile issue 2014-06-10 18:20:44 +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
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
palana
87ba3a736e Add optimize settings button (this "replaces" the defaults button when available)
Displaying both the defaults and the optimize button requires (currently
unnecessary) tweaking of the settings dialog, so they are mutually exclusive for
now
2014-03-08 19:42:19 +01: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
palana
3d13a9c5e7 Fix clearing first push to talk hotkey if two hotkeys were set
It was possible to bind an unlimited number of push to talk hotkeys via the first
push to talk hotkey edit box, and it was impossible to unbind those hotkeys
without restarting OBS
2014-03-01 14:18:05 +01:00
palana
c08bf24dbd Stop encoder in file only mode when the output file cannot be opened
This may or may not break some other combination of hotkey/button/invalid
setting, we shall see
2014-02-20 15:15:16 +01:00
palana
2a9cf6e5d9 Add plugin callback for log update notifications
This should allow plugins to implement their own version of a log window
without having to worry about providing lightweight-ish and non-blocking
callback functions for OBSApi.
2014-02-15 18:02:03 +01:00