0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Commit Graph

188 Commits

Author SHA1 Message Date
Paul Hindt
8f8b522ca7 aja: Fix for invalid default settings and empty cardID string 2022-01-13 13:11:51 -06:00
Colin Edwards
ed329c433d decklink-output-ui: Stop outputs on OBS_FRONTEND_EVENT_EXIT 2022-01-12 06:53:49 -08:00
Paul Hindt
1cbf9421d4 aja-output-ui: Add the Multi View UI options for new device. 2022-01-11 17:28:05 -06:00
Paul Hindt
f09137a2e0 aja: Refactor, clean-up and fix bugs in the signal routing system, and add SDITransport UI option to assist signal routing. 2022-01-08 14:05:10 -06:00
Translation Updater
062de2c998 Update translations from Crowdin 2021-12-17 08:01:29 +00:00
Jim
83f08725e4
Merge pull request #5580 from VodBox/add-cpp-templates
libobs: Add AutoRelease OBSRef wrappers for OBS types
2021-12-13 21:31:27 -08:00
Colin Edwards
54e5252906
aja: Disable plugin if no devices are found 2021-12-07 18:52:12 -06:00
VodBox
c3409b5bb5 frontend-tools: Cleanup libobs C++ type use 2021-11-26 23:23:52 +13:00
Paul Hindt
ce3ae8e423
aja: Capture and Output plugin for AJA Video Systems IO devices
* aja: Initial commit of AJA capture/output plugin

* aja: Fix clang-format on aja-output-ui code

* aja: Remove script used during dev/testing

* aja: Address pull request feedback from @RytoEX

* aja: Remove the SDK sources and update CMakeLists to point to new headers-only/static libs dependency distribution.

* aja: Only build AJA plugin on x64 on macOS for now

* aja: Remove the non-English placeholder locale files. The english strings/files will be produced via crowdin, according to @ddrboxman.

* aja: Add FindLibAJANTV2.cmake script to locate the ajantv2 headers and static libs in the OBS external deps package(s). Tested on Windows x64. macOS and Linux x64 TBD.

* aja: Add ajantv2/includes to FindLibAJANTV2 include search paths

* aja: Remove commented code from aja CMakeLists

* aja: Remove debug code and comments that are no longer needed.

* aja: Fix indentation

* aja: Remove disablement of clang-format in routing table and SDIWireFormat map

* aja: Use spaces for all indentation in widget crosspoint arrays where we disable clang-format

* aja: Address code style comments made by @RytoEX

* aja: Fix uneven indentation

* aja: More fixes to if/else placement and remove superfluous comments.

* aja: Rename 'dwns' to 'deactivateWhileNotShowing' for clarity. The DeckLink plugin still uses the variable name 'dwns' and should be changed, if desired, in a separate PR.

* aja: Remove X11Extras dependency from AJA Output frontend plugin

* aja: Add patch from Jim to find AJA release/debug libs

* aja: Improve AV sync of queued video/audio sent to the AJA card in the AJA Output plugin.
2021-11-23 20:31:11 -06:00
Matt Gajownik
8f1d2458bf decklink-captions: Build with Windows file descriptor
Additional details: #1944
2021-10-17 18:25:58 +11:00
jpark37
e181a23bed UI: Remove NOMINMAX from CMake scripts
If we want NOMINMAX globally, we should probably define at top level.
2021-10-10 19:12:45 -07:00
Tommy Vercetti
5912074271 UI: Add -DNOMINMAX to CMake on MSVC 2021-09-11 15:50:06 -07:00
Richard Stanway
e8d4de6bec decklink-output-ui: Don't update UI during shutdown
Fixes a crash on exit if the user exited with the outputs running as the
parent window will have already destroyed doUI.
2021-08-19 00:04:52 +02:00
Exeldro
2f07107e88 frontend-tools: Fix crash on shutdown 2021-08-15 05:51:32 -07:00
Translation
ef2b1eb1c6 Update translations from Crowdin 2021-06-11 07:18:15 -07:00
Gol-D-Ace
90df8d44df Update translations from Crowdin 2021-05-30 20:33:35 +02:00
Clayton Groeneveld
f4c36460c8 decklink-output-ui: Stop outputs when unloading
When closing OBS, sometimes it would crash if the Decklink outputs
were active.
2021-05-15 14:08:49 -07:00
Clayton Groeneveld
b28f99d4cd decklink-output-ui: Render texrender once per frame
To prevent rendering the texrender more than necessary, only
render it once per frame in a tick callback.
2021-05-15 14:08:49 -07:00
jp9000
cec8e24630 frontend-plugins: Fix script properties not updating
Fixes a bug where script properties would not update correctly after the
Undo/Redo changes in the properties view. The properties view was using
the wrong callback, and had a bad cast.
2021-05-09 08:45:08 -07:00
Ryan Foster
4ed7cd463d frontend-tools: Remove Qt5X11Extras
Qt5X11Extras (QX11Info) was added in
762983b5d8, but it doesn't seem to
actually be used. Qt6 doesn't yet ship X11Extras, so let's remove it.
2021-03-17 12:48:21 -07:00
Ryan Foster
0b88bfbf09 decklink-output-ui: Remove Qt5X11Extras
Qt5X11Extras (QX11Info) was added in
762983b5d8, but it doesn't seem to
actually be used. Qt6 doesn't yet ship X11Extras, so let's remove it.
2021-03-17 12:48:21 -07:00
Exeldro
901a030adf frontend-tools: Add edit script button 2021-03-08 08:37:37 -08:00
Fred Emmott
e5f05473e7
decklink-ui: fix double free of settings
This leads to a crash when the output is stopped, either by clicking the
stop button or when exiting OBS studio.

This crash is:
- intermittent in release builds
- reliable for me in debug builds

It is held by an `OBSData`, which, if not null, will automatically
call `obs_data_release()` on scope exit.
2021-02-08 14:46:38 -06:00
Gol-D-Ace
7368a2c7cc Update translations from Crowdin 2020-12-14 00:29:44 +01:00
Gol-D-Ace
7ab98ca00f Update translations from Crowdin 2020-11-25 20:11:39 +01:00
jp9000
cac2ff31f4 cmake: Put decklink-captions in source folders 2020-11-14 04:40:47 -08:00
Colin Edwards
5b8f89d86e decklink: Clean up warnings introduced by caption code 2020-11-03 17:00:14 -08:00
Colin Edwards
7b0d7c6357 Remove BUILD_CAPTIONS build flag 2020-11-02 22:46:55 -06:00
Colin Edwards
923f06bfa6 decklink: Add ability to ingest/embed cea 708 captions
(This commit also modifies libobs, UI)
2020-11-01 22:28:49 -08:00
Gol-D-Ace
c66ebde080 Update translations from Crowdin 2020-09-27 23:07:27 +02:00
Clayton Groeneveld
13d43e9782 frontend-tools: Free xdisplay on Linux auto scene switcher
The xdisplay in the Linux scene switcher was never closed
when OBS exits.
2020-09-20 13:09:48 -05:00
Matt Gajownik
a4bef68b15 frontend-tools: Add "Open file location" menu item for scripts 2020-08-01 10:40:57 +10:00
Matt Gajownik
c39aef03fe frontend-tools: Add context menu to Scripts list 2020-08-01 10:40:57 +10:00
Jim
aa0a6526a8
Merge pull request #3177 from cg2121/linux-filedialog
UI: Use non-native file dialog w/ Linux
2020-07-19 21:40:52 -07:00
Matt Gajownik
2ca17e62ce frontend-tools: Make links in script description clickable 2020-07-18 11:14:26 -07:00
Clayton Groeneveld
762983b5d8 UI: Use non-native file dialog w/ Linux 2020-07-18 09:49:24 -07:00
Jim
35760fa2d0
Merge pull request #3125 from adalessa/fix-scene-switcher
UI: Fix scene switcher not detecting some windows
2020-07-10 20:30:04 -07:00
Jim
19743e19d2
Merge pull request #2917 from cg2121/script-select
frontend-tools: Automatically select scripts
2020-07-06 17:30:53 -07:00
Clayton Groeneveld
bb082e0a9d frontend-tools: Add defaults button to script dialog 2020-07-05 18:58:03 -07:00
Ariel D'Alessandro
a7587c0296 UI: Fix scene switcher not detecting some windows 2020-07-04 11:29:05 -03:00
Clayton Groeneveld
e9d6847fb6 UI: Hide script tabs if no python settings 2020-05-18 02:50:28 -05:00
jp9000
7993179466 cmake: Add cmake folders 2020-05-13 06:52:37 -07:00
Clayton Groeneveld
a4cfb7ab59 frontend-tools: Automatically select scripts
When script is added, automatically select script. Also when the dialog is opened,
select previous used script.
2020-05-11 18:04:37 -05:00
Colin Edwards
55e2985026
Merge pull request #1944 from WizardCM/windows-rc-definition
CMake: Build Windows modules with file descriptors
2020-04-18 18:27:22 -05:00
Gol-D-Ace
d74fc65047 Update translations from Crowdin 2020-03-16 20:14:50 +01:00
jp9000
b2302902a3 libobs: Fix source type versioning system
(This also modifies image-source, obs-text, text-freetype2, and UI)

This improves source definition versioning.  To do this, it now stores
two identifier names.  One "unversioned" which is the original name, and
one "versioned" with the version number appended.

This fixes both backward compatibility with older OBS versions, and
fixes the inability to use "add existing" in OBS itself on sources
created from older version definitions.
2020-03-09 06:12:22 -07:00
Clayton Groeneveld
fa9dccb7be frontend-plugins: Refactor Decklink out UI 2020-02-26 23:06:20 -06:00
Clayton Groeneveld
44bb7e690b obs-scripting: Update text source IDs 2020-02-21 22:54:34 -06:00
jpark37
263bf48baa UI: Fix Qt 5.14 deprecation warnings
These functions should be available on current Qt.
2020-01-20 22:13:16 -08:00
Jim
fc54a3b708
Merge pull request #1974 from DDRBoxman/state
decklink-ui: Show the state of outputs in the decklink dialog
2019-11-11 07:13:52 -08:00
Colin Edwards
a469d14264 decklink-ui: Show the state of outputs in the decklink dialog 2019-11-09 14:48:24 -06:00
Devin Neal
7e25b0dc1e UI: Fallback to XGetWMName if XFetchName fails 2019-10-27 14:39:58 -07:00
Matt Gajownik
51be039cf8 CMake: Build Windows modules with file descriptors 2019-10-15 21:34:12 +11:00
Exeldro
a833d6bb9a frontend-tools: output timer tab stop order 2019-09-25 22:25:30 +02:00
Gol-D-Ace
03b5be75e4 Update translations from Crowdin 2019-09-17 23:21:00 +02:00
Clayton Groeneveld
5f7f2c1c97 UI: Fix compiler/Acri warnings 2019-08-15 03:00:06 -05:00
Clayton Groeneveld
bbaad30be6 obs-scripting: Add pause scene script 2019-08-04 06:21:22 -05:00
Clayton Groeneveld
42c6984771 frontend-tools: Make start/stop buttons checkable 2019-07-18 07:07:34 -05:00
Clayton Groeneveld
64598732a6 frontend-tools: Add option to pause output timer when rec is paused 2019-07-17 00:02:15 -05:00
jp9000
f53df7da64 clang-format: Apply formatting
Code submissions have continually suffered from formatting
inconsistencies that constantly have to be addressed.  Using
clang-format simplifies this by making code formatting more consistent,
and allows automation of the code formatting so that maintainers can
focus more on the code itself instead of code formatting.
2019-06-23 23:49:10 -07:00
Gol-D-Ace
973bc481ce Update translations from Crowdin 2019-06-11 01:42:42 +02:00
jp9000
72ccefff5f UI: Rename UI files for consistency
Changes comboBox-* and spinBox-* files to lowercase to be more
consistent with the rest of the files in the UI directory.
2019-04-21 04:10:46 -07:00
jp9000
d2b107bc9d decklink-output-ui: Fix memory leak 2019-04-20 01:43:01 -07:00
Colin Edwards
6d07885b08 Decklink: inital preview out work 2019-04-17 21:21:39 -05:00
Jim
88391b818d
Merge pull request #1811 from akapar2016/UI_scrollWheelEvents
Ui scroll wheel events
2019-04-14 13:58:54 -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
a0ead6f974
Merge pull request #1800 from cg2121/add-pragma-once
UI, libobs, text-freetype2: Add missing pragma once in header files
2019-04-06 23:40:43 -07:00
Gol-D-Ace
e78ac5ebef Update translations from Crowdin 2019-04-04 16:19:51 +02:00
Clayton Groeneveld
d1be93ae69 UI, libobs, text-freetype2: Add missing pragma once in header files 2019-04-01 02:48:28 -05:00
VodBox
9968772028 frontend-tools: Fix memory leak when reloading scripts 2019-03-03 21:45:37 +13:00
Gol-D-Ace
98f78fe3a7 Update translations from Crowdin 2019-02-25 15:11:33 +01:00
Gol-D-Ace
c3711bdd5e Update translations from Crowdin 2019-02-20 22:26:07 +01:00
Richard Stanway
0d8fa3fbb1 frontend-tools: Remove unused help icon 2019-02-14 22:19:07 +01:00
Colin Edwards
22f856bb7d decklink-output-ui: Add note about keyer output 2019-02-13 00:23:05 -06:00
Richard Stanway
3d27e7c2c9 decklink-ouput-ui: Remove unused help icon 2019-02-12 12:58:28 +01:00
Richard Stanway
917318d8e8 frontend-tools: Remove unused help icons 2019-02-12 12:57:18 +01:00
Colin Edwards
c8b58d8749 decklink-output-ui: Fix memory leak in save settings 2019-02-11 19:33:41 -06:00
Colin Edwards
1af8789ce0 decklink-output-ui: Fix memory leak
Closes obsproject/obs-studio#1656
2019-02-10 18:16:10 -08:00
Jim
e60023daf5
Merge pull request #1502 from DDRBoxman/decklinkoutui
Decklink: Add UI to control output
2019-02-07 22:12:54 -08:00
VodBox
86ce0e9652 frontend-tools: Call modified prop callbacks on script load/reload
This change means that the modified callback for a scripts properties is
always called when first loaded or on a reload. This behavior matches
the properties view for sources, where all modified callbacks are called
when the window opens. This change therefore treats reloading as
equivalent to reopening.
2019-02-04 19:49:34 +13:00
Colin Edwards
22fdda311d Decklink: add UI to control output 2018-10-23 18:57:17 -05:00
Dmitry-Me
5b92cee48f UI: Fix array length computation 2018-09-18 16:27:23 +03:00
jp9000
7bbdace1a9 frontend-tools: Increase instant replay playback retry interval 2018-09-15 12:05:45 -07:00
Exeldro
79ff554f90 frontend-tools: Add VLC support to instant replay script
Add support for using the VLC source to play instant replays.

Closes obsproject/obs-studio#1334
2018-09-15 12:04:25 -07:00
Gol-D-Ace
a79aaa28ab Update translations from Crowdin 2018-08-18 04:16:35 +02:00
Ryan Foster
2129d12143 frontend-tools: Add QAction explicitly for Qt 5.11 compatibility 2018-07-25 11:59:58 -04:00
Shaolin
c7c328dc83 UI: Add Vertical Mixer option 2018-05-19 00:17:58 -03:00
Jimi Huotari
4fd06b9825
frontend-tools: Include 'QAction' to fix build against Qt 5.11
Some headers are no longer unconditionally included, leading to
build failures.

http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
2018-03-17 18:38:27 +02:00
Gol-D-Ace
88282c168c Update translations from Crowdin 2018-03-15 09:00:28 +01:00
jp9000
a2ae16e98c deps/obs-scripting: Allow NULL script with script_log
(This commit also modifies the frontend-tools module)

Prevents a potential crash when script_log is called by a thread spawned
by a python library.
2018-01-31 16:20:45 -08:00
jp9000
dce311cf1a deps/obs-scripting: Make ENABLE_SCRIPTING a user variable
Makes it so that the scripting cmake variable ENABLE_SCRIPTING is a user
variable rather than a global internal cmake variable, and defers the
internal global cmake variable to SCRIPTING_ENABLED instead.
2018-01-23 20:57:48 -08:00
Gol-D-Ace
ae22886f67 Update translations from Crowdin 2018-01-22 04:55:52 +01:00
jp9000
f09f94b8a8 frontend-plugins: Only show script file names in script dialog
Showing the full directory path is sort of unnecessary and makes the
list look pretty unsightly.
2018-01-20 13:58:02 -08:00
jp9000
f956203764 frontend-tools: Fix a few issues with the clock source script
Fix the image files not being freed, and remove the unused source
definition function 'update', which was additionally calling
image_source_load with the wrong number of parameters.
2018-01-19 11:28:44 -08:00
jp9000
a95a8723fb frontend-tools: Add script to update text source from URL
Adds a python example script which updates a text source to the text
retrieved from a specific URL that refreshes every specified interval.
2018-01-19 11:17:38 -08:00
Colin Edwards
1c3f18a75a frontend-tools: Add a lua script that draws an analog clock
Closes jp9000/obs-studio#1159
2018-01-19 08:27:55 -08:00
jp9000
00e7a84050 frontend-tools: Add "Clear" button to script log window 2018-01-18 14:42:24 -08:00
jp9000
b1e6af319c frontend-tools: Warn if no active replay buffer w/ instant replay 2018-01-18 14:41:19 -08:00
jp9000
5982a8cd28 frontend-tools: Make instant replay script also save replay
With the "instant-replay.lua" script, it would only play the last replay
buffer saved, meaning the user would have to save a replay with the
replay buffer hotkey, and then press the "Play Last Replay" hotkey to
play the last replay buffer.

Instead, combine the two and make the script save the replay
automatically first, and then play it back as soon as it's available.
This makes it actually qualify as an "instant replay" script, as its
name implies.
2018-01-18 14:24:17 -08:00
jp9000
ba1a70c1a0 frontend-tools: Add "instant replay" script
A script that plays back the last replay buffer in the specified media
source.
2018-01-18 08:59:59 -08:00