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

6588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gol-D-Ace
3a01fefe1e Use proper capitalization for string 
Windows is a product name in this case.
 2019-04-19 05:38:21 +02:00
Jim
c27a8e7ae9
Merge pull request #1664 from Xaymar/feature-property-groups 
libobs/UI: Add Property Grouping
 2019-04-18 07:22:15 -07:00
Michael Fabian 'Xaymar' Dirks
5c0c512fc2 UI: Add support for property groups 
Property groups are implemented in the UI using QGroupBox, which support
both the normal and checkable version of them.
 2019-04-18 06:37:54 -07:00
Michael Fabian 'Xaymar' Dirks
6b6ea575ff libobs: Add property groups 
Property groups allow multiple properties to be combined into a single
visual group and thus can be used to reduce visual clutter and improve
user experience by giving additional context to a property. The name of
a child of a group is not affected by the group and thus all property
names must still be unique.

A new parent field has been added to obs_properties_t to ease the
tracking of existing properties. That way properties inside a group will
also be able to verify that they have a unique name.
 2019-04-18 06:37:36 -07:00
Jim
75d62a8d86
Merge pull request #1623 from SuslikV/patch-11 
UI: Correct custom property implementation
 2019-04-17 08:28:48 -07:00
SuslikV
8a22889e3d UI: Use theme colors setting for Projectors too 
Don't override the theme color settings for the Projector.
If required, the background color of the projector can be changed via

OBSProjector {qproperty-...}

record placed after "OBSQTDisplay {qproperty-...}" section in the theme
file (qss).
 2019-04-17 07:10:12 -07:00
SuslikV
e2be33956b UI: Correct custom property implementation 
- Fixes Q_PROPERTY macro syntax
- Removes excessive notification declaration and slot
- Removes unneeded dynamic property
- Improves Themes versatility
 2019-04-17 07:10:12 -07:00
Jim
4dc1c2a7f9
Merge pull request #1833 from dwot/master 
vlc-video: Enable subtitle track selection
 2019-04-17 06:46:12 -07:00
dwot
8c7dbf69f2 vlc-video: Enable subtitle track selection 2019-04-17 06:45:33 -07:00
SuslikV
975431a7c7 UI: Add default color for the preview background 
If custom theme for obs UI has no record about background custom
property in the qss file, then application can set random color per
display initialization. This fixes this issue.
 2019-04-17 06:32:27 -07:00
Jim
ebb8d6bc28
Merge pull request #1767 from ratwithashotgun/caption-pr1 
deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts
 2019-04-15 03:30:30 -07:00
Jim
49d178d593
Merge pull request #1830 from jpark37/bilinear-lowres-gl-fix 
libobs: Fix shader for GLSL
 2019-04-14 19:16:34 -07:00
James Park
f66625bf1e libobs: Fix shader for GLSL 
vec4 to vec3 truncation fix.
 2019-04-14 14:15:48 -07:00
Jim
88391b818d
Merge pull request #1811 from akapar2016/UI_scrollWheelEvents 
Ui scroll wheel events
 2019-04-14 13:58:54 -07:00
Colin Edwards
7dacd58aab
Merge pull request #1795 from cg2121/f-keys-linux 
libobs: Add support for F25-F35 hotkeys on Linux
 2019-04-14 10:48:46 -07:00
Jim
88d439b587
Merge pull request #1754 from Xaymar/feature-remove-properties 
libobs: Add function to remove properties
 2019-04-14 05:15:10 -07:00
Jim
10e72fcc2a
Merge pull request #1752 from pkviet/vlc 
vlc-video: Enable audio track selection
 2019-04-14 05:13:47 -07:00
Jim
f121aa5a2d
Merge pull request #1743 from eszlari/xdg-data 
UI: Add Linux AppStream metadata
 2019-04-14 05:11:50 -07:00
Peter Eszlari
6b9da9b912 UI: Add Linux AppStream metadata 2019-04-14 05:10:10 -07:00
Jim
3a05466baf
Merge pull request #1760 from Vainock/master 
Improve locales
 2019-04-14 05:00:31 -07:00
Jim
f6a24d9b83
Merge pull request #1716 from cg2121/toggle-preview-hotkey 
UI: Add hotkey to toggle preview
 2019-04-14 04:56:02 -07:00
Clayton Groeneveld
e89283d172 UI: Add hotkey to toggle preview 2019-04-14 04:51:34 -07:00
Jim
397f3733cf
Merge pull request #1685 from DDRBoxman/luma 
obs-filters: Add luma key filter
 2019-04-14 04:24:16 -07:00
Jim
9480cc4fd2
Merge pull request #1675 from admshao/clear-linux-compiling-warnings 
Clear linux compiling warnings
 2019-04-14 04:21:21 -07:00
Jim
827f45acfd
Merge pull request #1672 from derrod/captions-no-throttling 
libobs: Add minimum display duration to caption data
 2019-04-14 04:19:07 -07:00
Jim
e7b25a9870
Merge pull request #1667 from grimmy/xshm-xrandr-support 
linux-capture: Add randr support
 2019-04-14 04:15:29 -07:00
Jim
d14fa715e8
Merge pull request #1641 from WizardCM/move-settings 
UI: Refactor Audio Settings UI and move Monitoring Device from Advanced
 2019-04-14 04:10:15 -07:00
Jim
e5aa51afe4
Merge pull request #1599 from geemion/master 
win-capture/graphics-hook: Fix try_lock_shmem_tex mutex  deadlock bug
 2019-04-14 03:48:57 -07:00
geemion
f6581952bc win-capture/graphics-hook: Check if mutex abandoned 
It's possible that the mutexes used with shared memory capture to return
WAIT_ABANDONED if OBS is shut down abnormally while the mutex is locked.
 2019-04-14 03:44:48 -07:00
Jim
b2bc1e159b
Merge pull request #1589 from caffeinetv/minor-improvements 
Minor improvements
 2019-04-14 03:43:05 -07:00
Jim
30e90c3030
Merge pull request #1573 from DragoonAethis/master 
obs-ffmpeg: Bind network buffer size in the UI
 2019-04-14 02:51:14 -07:00
Jim
f1399b6d18
Merge pull request #1765 from jpark37/blend-alpha 
libobs: libobs-d3d11: Fix blend alpha overflow
 2019-04-14 00:22:20 -07:00
akapar
9249403c96 UI: Ignore wheelEvent for properties 
Ignore wheelEvent using subclass
slider,spinbox,combobox with eventhandlers:
wheelEvent - ignore if widget is not focused,
leaveEvent - clear focus when mouse leaves event.

Use these new subclass widgets in properties
to ignore wheelEvent when scrolling.
 2019-04-13 12:09:11 -04:00
Jim
975aed836c
Merge pull request #1755 from Xaymar/patch-generate-obs-rc 
obs-studio: Create obs.rc out-of-tree using the build path
 2019-04-13 04:14:05 -07:00
Jim
c68f847562
Merge pull request #1821 from cg2121/multiview-cursor 
UI: Don't hide cursor over multiview
 2019-04-13 03:46:27 -07:00
Jim
6457301294
Merge pull request #1820 from lorskun/onlyfans 
rtmp-services: added OnlyFans.com streaming service
 2019-04-13 03:44:47 -07:00
lorskun
f6f780acd2 rtmp-services: Add OnlyFans streaming service 2019-04-13 03:43:11 -07:00
Jim
23ed5ea7b4
Merge pull request #1816 from SCG82/patch-1 
UI: Fix size of output icon
 2019-04-13 03:40:12 -07:00
Jim
c7436ba127
Merge pull request #1826 from SuslikV/patch-14 
CONTRIBUTING.rst: Improve commit guidelines
 2019-04-13 01:54:49 -07:00
SuslikV
7031e2ec3a CONTRIBUTING.rst: Improve commit guidelines 
Few words about the commit's titles were added (capital letter).
 2019-04-13 01:52:25 -07:00
Jim
c7fd733b0e
Merge pull request #1825 from torresam/master 
UI: Fix remux dialog ignoring filename changes
 2019-04-12 22:26:43 -07:00
Anthony Torres
7ddab80d80 UI: Fix remux dialog ignoring filename changes 2019-04-12 22:25:28 -07:00
Anthony Torres
0e2fe10595 UI: Separate delegate class into header file 2019-04-12 22:25:23 -07:00
Jim
8d3ee5708f
Merge pull request #1769 from DDRBoxman/no-sources 
UI: Show a message in the empty source list
 2019-04-12 04:54:52 -07:00
Colin Edwards
ff72e9efc3 UI: Show a message in the empty source list 2019-04-12 04:17:39 -07:00
Jim
a9936d36d2
Merge pull request #1770 from jpark37/prefer-rgb 
Simplify YUV conversion, and direct YUV444P support
 2019-04-12 00:14:49 -07:00
James Park
df05f65d63 deps/media-playback: YUV444P support 
Use libobs for YUV444P conversion previously handled by FFmpeg. This
ensures the libobs path resists rot.
 2019-04-11 23:00:04 -07:00
James Park
69c215345a libobs: Simplify YUV conversion 
Currently several shaders need "DrawMatrix" techniques to support the
possibility that the input texture is a "YUV" format. Also, "DrawMatrix"
is overloaded for translation in both directions when it is written for
RGB to "YUV" only.

A cleaner solution is to handle "YUV" to RGB up-front as part of format
conversion, and ensure only RGB inputs reach the other shaders. This is
necessary to someday perform correct scale filtering without the cost of
redundant "YUV" conversions per texture tap.

A necessary prerequisite for this is to add conversion support for
VIDEO_FORMAT_I444, and that is now in place. There was already a hack in
place to cover VIDEO_FORMAT_Y800. All other "YUV" formats already have
conversion functions.

"DrawMatrix" has been removed from shaders that only supported "YUV" to
RGB conversions. It still exists in shaders that perform RGB to "YUV"
conversions, and the implementations have been sanitized accordingly.
 2019-04-11 23:00:03 -07:00
Jim
3031a11762
Merge pull request #1824 from stump/themename-fallback-null-check 
UI: Add null check for rename of default theme
 2019-04-10 19:46:54 -07:00
stump
bc99ec4d7c UI: Add null check for rename of default theme 
Without this, we strcmp a null pointer if no theme is set in the
configuration file.
 2019-04-10 22:09:37 -04:00