b86af28380
linux-v4l2: Fix string for translation
...
Changed "ImageFormat" for "VideoFormat"
(checked in v4l2-input.c)
2015-02-27 00:52:17 +01:00
57f32e30f1
Merge pull request #385 from fryshorts/v4l2-dv-timings
...
linux-v4l2: Add support for dv timings
2015-02-24 16:04:49 -08:00
1c0df043fa
linux-v4l2: Use dv timing property in source
...
Use the dv timing selected in the source properties to configure the
device instead of resolution/framerate.
2015-02-24 23:32:46 +01:00
99b6a018cc
linux-v4l2: Add helper function to set dv timing
...
Add a helper function to set the dv timing for the input.
2015-02-24 23:32:46 +01:00
bcf8400137
linux-v4l2: Show dv timings when supported
...
Show the dv timing property when the selected input supports it.
2015-02-24 23:32:46 +01:00
5d317920f1
linux-v4l2: Add dv timing property
...
Add the dv timing property and hide it by default.
2015-02-24 23:32:46 +01:00
bf27d4c1cb
linux-v4l2: Add function to list dv timings
...
Add a helper function to enumerate dv timings supported by the
selected input and add them to a property.
2015-02-24 23:32:46 +01:00
0a6cf208f1
linux-v4l2: Add helper function to get dv timings
...
Add a helper function to get a dv timing by index for the input.
2015-02-24 23:32:46 +01:00
fe144c891d
Merge pull request #383 from RobotCaleb/ViewLogMenuEntry
...
View Log menu entry in Help -> Log Files menu
2015-02-24 00:49:32 -08:00
c3e382c8f7
UI: View Log menu entry in Help -> Log Files menu
...
Since the file being logged to changes with each run, opening a log
file is a tad more involved than desirable when it's necessary to view
the log each time OBS is run. This new menu entry shortcuts opening the
file from the file system manually.
2015-02-24 01:44:37 -07:00
aa681119c7
Merge pull request #382 from fryshorts/v4l2-tuner-devices
...
linux-v4l2: Add support for video standards
2015-02-23 15:44:23 -08:00
f38347acc6
linux-v4l2: Use video standard property in source
...
Use the video standard selected in the source properties to configure
the device instead of resolution/framerate.
2015-02-23 21:27:08 +01:00
7dc9069c1b
linux-v4l2: Add helper function for video standard
...
Add a helper function to get/set the video standard for the input.
2015-02-23 21:27:08 +01:00
a9df1d921a
linux-v4l2: Use input caps for properties
...
Use the capabilities for the selected input to decide which properties
are enumerated and displayed.
2015-02-23 21:27:08 +01:00
bab2aa24d5
linux-v4l2: Add video standard property
...
Add the video standard property and hide it by default.
2015-02-23 20:34:44 +01:00
cc57222aa9
linux-v4l2: Add function to enum video standards
...
Add a helper function to enumerate video standards supported by the
selected input and add them to a property.
2015-02-23 20:34:44 +01:00
96b994afb2
linux-v4l2: Add helper function to get input caps
...
Add a helper function to get the capabilities of a specific or the
currently selected input of the device.
2015-02-23 20:34:44 +01:00
ff8ac210fb
linux-v4l2: Remove camera constraint for inputs
...
Remove the constraint for device inputs to be of the type "CAMERA".
This was added under the false assumption that inputs of the type
"TUNER" are only used for control purposes.
2015-02-23 20:34:44 +01:00
0c63afccf5
libobs: Update to 0.8.3
2015-02-20 21:56:03 -08:00
3c8a3d7866
mac-capture: Add update callbacks for coreaudio
...
Somehow managed to forget to add this function at an earlier point.
Allows the audio device to be changed via a simple update.
2015-02-20 21:53:00 -08:00
8bc2288dfe
mac-capture: Separate audio shudown code
...
This allows the code to be used elsewhere as needed.
2015-02-20 21:49:51 -08:00
c69b70b847
obs-outputs: Fix bug (RTMP only working once)
...
This was caused to do the new RTMP code that added support for multiple
streams; the stream index needs to be reset on RTMP_Close otherwise it
will keep using the wrong stream information.
2015-02-17 20:38:23 -08:00
d3c8f81cc2
obs-outputs: Fix potential RTMP auth issue
2015-02-17 17:23:32 -08:00
76e864bfe0
Merge pull request #379 from fryshorts/adv-audio-fix
...
UI: Fix rounding issues for advanced audio
2015-02-17 14:14:31 -08:00
fd53892a4d
UI: Fix rounding issues for advanced audio
...
Remove the close_float check for values that are set through the
advanced UI. If the difference of the integer was 1 this would sometimes
cause the input to be ignored.
Add rounding to values that are set through the signal system, since
casting alone will act like floor, which is not desirable in this case.
2015-02-17 21:44:32 +01:00
d085d6e4a1
libobs: Allow duplicate sources per scene
...
Previously having a source multiple times in a single scene would cause
the recursion check to trigger. Example scenes.json:
{
"current_scene": "Scene",
"sources": [
{
"flags": 0,
"id": "scene",
"mixers": 0,
"name": "Scene",
"settings": {
"items": [
{
"align": 5,
"bounds": {
"x": 0.0,
"y": 0.0
},
"bounds_align": 0,
"bounds_type": 0,
"name": "Text (FreeType 2)",
"pos": {
"x": 0.0,
"y": 0.0
},
"rot": 0.0,
"scale": {
"x": 1.0,
"y": 1.0
},
"visible": true
},
{
"align": 5,
"bounds": {
"x": 0.0,
"y": 0.0
},
"bounds_align": 0,
"bounds_type": 0,
"name": "Text (FreeType 2)",
"pos": {
"x": 0.0,
"y": 98.0
},
"rot": 0.0,
"scale": {
"x": 1.0,
"y": 1.0
},
"visible": true
}
]
},
"sync": 0,
"volume": 1.0
},
{
"flags": 0,
"id": "text_ft2_source",
"mixers": 0,
"name": "Text (FreeType 2)",
"settings": {},
"sync": 0,
"volume": 1.0
}
]
}
2015-02-17 13:41:49 +01:00
9dca07db30
libobs: Handle obs_scene_add failure
...
Previously a NULL item would cause a crash when reading transform info.
The crash can be reproduced by e.g. editing scenes.json so that two
scenes contain each other. Example scenes.json:
{
"current_scene": "Scene",
"sources": [
{
"flags": 0,
"id": "scene",
"mixers": 0,
"name": "Scene",
"settings": {
"items": [
{
"align": 5,
"bounds": {
"x": 1440.0,
"y": 900.0
},
"bounds_align": 0,
"bounds_type": 2,
"name": "Scene 2",
"pos": {
"x": 0.0,
"y": 0.0
},
"rot": 0.0,
"scale": {
"x": 1.0,
"y": 1.0
},
"visible": true
}
]
},
"sync": 0,
"volume": 1.0
},
{
"flags": 0,
"id": "scene",
"mixers": 0,
"name": "Scene 2",
"settings": {
"items": [
{
"align": 5,
"bounds": {
"x": 1.0,
"y": 1.0
},
"bounds_align": 0,
"bounds_type": 0,
"name": "Scene",
"pos": {
"x": 854.0,
"y": -520.0
},
"rot": 0.0,
"scale": {
"x": 1.75,
"y": 1.7562724351882935
},
"visible": true
}
]
},
"sync": 0,
"volume": 1.0
}
]
}
2015-02-17 13:41:49 +01:00
641f626593
UI: Display message if no properties available
...
Display "No properties available" text in the property view if there are
no properties available.
Closes Pull Request #377
2015-02-16 18:39:39 -08:00
c293c17620
Generate proper DL_OPENGL value for linux
...
Since we rely on the dynamic linker to find the library for us via
dlopen(), we need to have DL_OPENGL be .so.N, not the full library
filename, as ldconfig doesn't cache the full filename
Use of TARGET_SONAME_FILE requires the library to be marked as SHARED,
not MODULE
This closes pull request #370
2015-02-16 15:28:42 -05:00
2cc4c6e8d3
UI: Prevent re-updating of the stream encoder
...
Using advanced output mode, the stream encoder could be updated with the
same settings, causing the encoder to output those changes
unnecessarily.
2015-02-15 22:08:55 -08:00
77f2fda3ce
UI: Fix adv. mode recording settings update bug
...
The recording settings are updated only when not using the streaming
encoder for recording.
2015-02-15 22:08:55 -08:00
ee4f8443b1
Merge pull request #372 from kc5nra/fix-typo-in-readme
...
Fix typo in README
2015-02-14 15:40:07 -08:00
3f7239741d
Fix typo in README
2015-02-14 17:09:18 -06:00
8e9924d6a1
win-dshow: Do not update encoders if active
...
Do not update the avermedia encoders if they are already active, they
weren't designed to be updated in real time, so it will cause encoding
to break.
2015-02-14 15:04:11 -08:00
86d4ee68e6
UI: Do not save the project if null
...
If the jsonData string is null, then there's nothing that should be
written.
Closes pull request #366 from Socapex/debugcrash
2015-02-14 12:19:41 -08:00
73c7a7f8bb
Specify to load submodules for both win and mac
2015-02-14 12:10:52 -08:00
c0b9a11c5d
Merge pull request #371 from martell/master
...
win-dshow: Reorder CapsMatch for gcc
2015-02-14 11:21:04 -08:00
f079bc9f7f
win-dshow: Reorder CapsMatch for gcc
2015-02-14 19:14:27 +00:00
8ecbe91d9a
Merge pull request #367 from fryshorts/adv-audio-crash
...
UI: Small fixes to advanced audio settings
2015-02-14 10:02:00 -08:00
104415d5c3
win-capture: Fix hook bug that could cause crashes
...
I had this issue where IDXGISwapChain::ResizeBuffers would fail in the
hooks, causing games to crash when they resized their backbuffers
because ResizeBuffers would return an 'invalid call' HRESULT value. In
the ResizeBuffers documentation it says that it will only happen if a
backbuffer currently has any outstanding references, but there's no way
this would happen unless ResizeBuffers internally calls Present or vise
versa.
After ResizeBuffers has been called, the very first call to Present will
somehow seemingly invalidate and/or destroy the current backbuffer.
It's very strange, but that seems to be what's going on, at least for
the game I was testing. So if you are performing a post-overlay
capture, then you must ignore the capture on the very first call to
Present.
It's Microsoft's code so you can't really know what's going on, you just
have to work around these strange issues seemingly in the dark.
2015-02-14 09:12:24 -08:00
8b59b606c5
win-capture: Use right call type for hook funcs
...
Although STDMETHODCALLTYPE is technically WINAPI (__stdcall), it's best
not to make any assumptions.
2015-02-14 07:48:36 -08:00
5d9cac1f80
win-dshow: Rename the avermedia encoders again
...
Slight clarification (I guess)
2015-02-14 07:48:35 -08:00
ae931b32cf
win-capture: Fix debug function strings
...
These had an older name of what the function used to be named
2015-02-14 07:48:35 -08:00
2c5a5b82c4
Merge pull request #369 from Bl00drav3n/master
...
Fixed a bug in color conversion code for 16bit textures.
2015-02-13 16:24:23 -08:00
1f9f50c800
Fixed a bug in color conversion code for 16bit textures.
2015-02-14 01:08:38 +01:00
90ccae6f4c
UI: Ensure only one advanced audio settings window
...
Add a check to prevent that the advanced audio settings dialog is only
once. When the dialog is already present raise it to the top instead.
2015-02-13 13:11:15 +01:00
c45e74039f
UI: Fix crash in advanced audio settings
...
Delete source controls when the settings window is deleted.
2015-02-13 13:11:15 +01:00
6099c65ff7
Merge pull request #363 from dodgepong/latest-crowdin-translations
...
Add latest translations from crowdin
2015-02-11 16:18:39 -08:00
2b01030607
Add latest translations from crowdin
2015-02-11 19:15:08 -05:00
04925993b0
win-dshow: Fix names of AVerMedia encoders
2015-02-11 15:29:31 -08:00
Radzaquiel
Jim
fryshorts
Caleb Anderson
Palana
HomeWorld
Kevin Tardif
kc5nra
Socapex
Martell Malone
Bl00drav3n
dodgepong