opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 09:41:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,299 Commits 20 Branches 251 Tags
5d87f3c00b3e0bfcaec3ac2f5be174d07ea0ffc5
Commit Graph
119 Commits
Author SHA1 Message Date
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