From 106c7aa61f3229be628a77ef840bce414580df82 Mon Sep 17 00:00:00 2001 From: Lain Date: Thu, 18 May 2023 17:37:26 -0700 Subject: [PATCH] Update copyrights/names --- .github/workflows/docs.yml | 2 +- .mailmap | 3 +- AUTHORS | 6 +- UI/cmake/macos/Info.plist.in | 2 +- UI/display-helpers.hpp | 2 +- UI/forms/OBSBasic.ui | 2 +- .../aja-output-ui/cmake/macos/Info.plist.in | 2 +- .../cmake/macos/Info.plist.in | 2 +- .../cmake/macos/Info.plist.in | 2 +- .../frontend-tools/cmake/macos/Info.plist.in | 2 +- .../frontend-tools/data/scripts/countdown.lua | 2 +- .../data/scripts/instant-replay.lua | 2 +- .../frontend-tools/data/scripts/url-text.py | 2 +- UI/item-widget-helpers.cpp | 2 +- UI/item-widget-helpers.hpp | 2 +- UI/obs-app.cpp | 2 +- UI/obs-app.hpp | 2 +- UI/obs.rc.in | 4 +- UI/platform-osx.mm | 2 +- UI/platform-windows.cpp | 2 +- UI/platform-x11.cpp | 2 +- UI/platform.hpp | 2 +- UI/qt-wrappers.cpp | 2 +- UI/qt-wrappers.hpp | 2 +- UI/remote-text.cpp | 2 +- UI/remote-text.hpp | 2 +- UI/screenshot-obj.hpp | 2 +- UI/source-tree.cpp | 2 +- UI/win-update/updater/hash.cpp | 2 +- UI/win-update/updater/http.cpp | 2 +- UI/win-update/updater/patch.cpp | 2 +- UI/win-update/updater/updater.cpp | 2 +- UI/win-update/updater/updater.hpp | 2 +- UI/window-basic-filters.cpp | 2 +- UI/window-basic-filters.hpp | 2 +- UI/window-basic-interaction.cpp | 2 +- UI/window-basic-interaction.hpp | 2 +- UI/window-basic-main-browser.cpp | 2 +- UI/window-basic-main-profiles.cpp | 2 +- UI/window-basic-main-scene-collections.cpp | 2 +- UI/window-basic-main-screenshot.cpp | 2 +- UI/window-basic-main-transitions.cpp | 2 +- UI/window-basic-main.cpp | 8 +-- UI/window-basic-main.hpp | 2 +- UI/window-basic-properties.cpp | 2 +- UI/window-basic-properties.hpp | 2 +- UI/window-basic-settings.cpp | 4 +- UI/window-basic-settings.hpp | 2 +- UI/window-basic-source-select.cpp | 2 +- UI/window-basic-source-select.hpp | 2 +- UI/window-log-reply.cpp | 2 +- UI/window-log-reply.hpp | 2 +- UI/window-namedialog.cpp | 2 +- UI/window-namedialog.hpp | 2 +- UI/window-permissions.cpp | 2 +- UI/window-permissions.hpp | 2 +- cmake/Modules/VersionConfig.cmake | 2 +- cmake/bundle/macOS/Info.plist.in | 2 +- cmake/bundle/macOS/Plugin-Info.plist.in | 2 +- cmake/bundle/macOS/Virtualcam-Info.plist.in | 2 +- cmake/common/bootstrap.cmake | 2 +- deps/ipc-util/ipc-util/pipe-posix.c | 2 +- deps/ipc-util/ipc-util/pipe-posix.h | 2 +- deps/ipc-util/ipc-util/pipe-windows.c | 2 +- deps/ipc-util/ipc-util/pipe-windows.h | 2 +- deps/ipc-util/ipc-util/pipe.h | 2 +- deps/libff/libff/ff-compat.h | 2 +- deps/libff/libff/ff-threading-posix.c | 2 +- deps/libff/libff/ff-threading-windows.c | 2 +- deps/media-playback/media-playback/cache.c | 2 +- deps/media-playback/media-playback/cache.h | 2 +- .../media-playback/closest-format.h | 2 +- deps/media-playback/media-playback/decode.c | 2 +- deps/media-playback/media-playback/decode.h | 2 +- .../media-playback/media-playback.c | 2 +- .../media-playback/media-playback.h | 2 +- deps/media-playback/media-playback/media.c | 2 +- deps/media-playback/media-playback/media.h | 2 +- deps/obs-scripting/obs-scripting-callback.h | 2 +- deps/obs-scripting/obs-scripting-internal.h | 2 +- deps/obs-scripting/obs-scripting-logging.c | 2 +- .../obs-scripting-lua-frontend.c | 2 +- deps/obs-scripting/obs-scripting-lua-source.c | 2 +- deps/obs-scripting/obs-scripting-lua.c | 2 +- deps/obs-scripting/obs-scripting-lua.h | 2 +- .../obs-scripting-python-frontend.c | 2 +- .../obs-scripting-python-import.c | 2 +- .../obs-scripting-python-import.h | 2 +- deps/obs-scripting/obs-scripting-python.c | 16 +++--- deps/obs-scripting/obs-scripting-python.h | 2 +- deps/obs-scripting/obs-scripting.c | 2 +- deps/obs-scripting/obs-scripting.h | 2 +- docs/sphinx/conf.py | 6 +- libobs-d3d11/d3d11-duplicator.cpp | 2 +- libobs-d3d11/d3d11-indexbuffer.cpp | 2 +- libobs-d3d11/d3d11-rebuild.cpp | 2 +- libobs-d3d11/d3d11-samplerstate.cpp | 2 +- libobs-d3d11/d3d11-shader.cpp | 2 +- libobs-d3d11/d3d11-shaderprocessor.cpp | 2 +- libobs-d3d11/d3d11-shaderprocessor.hpp | 2 +- libobs-d3d11/d3d11-stagesurf.cpp | 2 +- libobs-d3d11/d3d11-subsystem.cpp | 2 +- libobs-d3d11/d3d11-subsystem.hpp | 2 +- libobs-d3d11/d3d11-texture2d.cpp | 2 +- libobs-d3d11/d3d11-texture3d.cpp | 2 +- libobs-d3d11/d3d11-vertexbuffer.cpp | 2 +- libobs-d3d11/d3d11-zstencilbuffer.cpp | 2 +- libobs-opengl/gl-helpers.c | 2 +- libobs-opengl/gl-helpers.h | 2 +- libobs-opengl/gl-indexbuffer.c | 2 +- libobs-opengl/gl-shader.c | 2 +- libobs-opengl/gl-shaderparser.c | 2 +- libobs-opengl/gl-shaderparser.h | 2 +- libobs-opengl/gl-stagesurf.c | 2 +- libobs-opengl/gl-subsystem.c | 2 +- libobs-opengl/gl-subsystem.h | 2 +- libobs-opengl/gl-texture2d.c | 2 +- libobs-opengl/gl-texture3d.c | 2 +- libobs-opengl/gl-texturecube.c | 2 +- libobs-opengl/gl-vertexbuffer.c | 2 +- libobs-opengl/gl-windows.c | 2 +- libobs-opengl/gl-zstencil.c | 2 +- libobs/callback/calldata.c | 2 +- libobs/callback/calldata.h | 2 +- libobs/callback/decl.c | 2 +- libobs/callback/decl.h | 2 +- libobs/callback/proc.c | 2 +- libobs/callback/proc.h | 2 +- libobs/callback/signal.c | 2 +- libobs/callback/signal.h | 2 +- libobs/cmake/macos/Info.plist.in | 2 +- libobs/data/deinterlace_base.effect | 4 +- libobs/data/deinterlace_blend.effect | 4 +- libobs/data/deinterlace_blend_2x.effect | 4 +- libobs/data/deinterlace_discard.effect | 4 +- libobs/data/deinterlace_discard_2x.effect | 4 +- libobs/data/deinterlace_linear.effect | 4 +- libobs/data/deinterlace_linear_2x.effect | 4 +- libobs/data/deinterlace_yadif.effect | 4 +- libobs/data/deinterlace_yadif_2x.effect | 4 +- libobs/data/format_conversion.effect | 4 +- libobs/graphics/axisang.c | 2 +- libobs/graphics/axisang.h | 2 +- libobs/graphics/bounds.c | 2 +- libobs/graphics/bounds.h | 2 +- libobs/graphics/device-exports.h | 2 +- libobs/graphics/effect-parser.c | 2 +- libobs/graphics/effect-parser.h | 2 +- libobs/graphics/effect.c | 2 +- libobs/graphics/effect.h | 2 +- libobs/graphics/graphics-imports.c | 2 +- libobs/graphics/graphics-internal.h | 2 +- libobs/graphics/graphics.c | 2 +- libobs/graphics/graphics.h | 2 +- libobs/graphics/half.h | 2 +- libobs/graphics/image-file.c | 2 +- libobs/graphics/image-file.h | 2 +- libobs/graphics/input.h | 2 +- libobs/graphics/math-defs.h | 2 +- libobs/graphics/math-extra.c | 2 +- libobs/graphics/math-extra.h | 2 +- libobs/graphics/matrix3.c | 2 +- libobs/graphics/matrix3.h | 2 +- libobs/graphics/matrix4.c | 2 +- libobs/graphics/matrix4.h | 2 +- libobs/graphics/plane.c | 2 +- libobs/graphics/plane.h | 2 +- libobs/graphics/quat.c | 2 +- libobs/graphics/quat.h | 2 +- libobs/graphics/shader-parser.c | 2 +- libobs/graphics/shader-parser.h | 2 +- libobs/graphics/srgb.h | 2 +- libobs/graphics/texture-render.c | 2 +- libobs/graphics/vec2.c | 2 +- libobs/graphics/vec2.h | 2 +- libobs/graphics/vec3.c | 2 +- libobs/graphics/vec3.h | 2 +- libobs/graphics/vec4.c | 2 +- libobs/graphics/vec4.h | 2 +- libobs/media-io/audio-io.c | 2 +- libobs/media-io/audio-io.h | 2 +- libobs/media-io/audio-math.h | 2 +- libobs/media-io/audio-resampler-ffmpeg.c | 2 +- libobs/media-io/audio-resampler.h | 2 +- libobs/media-io/format-conversion.c | 2 +- libobs/media-io/format-conversion.h | 2 +- libobs/media-io/media-io-defs.h | 2 +- libobs/media-io/media-remux.c | 2 +- libobs/media-io/video-frame.c | 2 +- libobs/media-io/video-frame.h | 2 +- libobs/media-io/video-io.c | 2 +- libobs/media-io/video-io.h | 2 +- libobs/media-io/video-scaler-ffmpeg.c | 2 +- libobs/media-io/video-scaler.h | 2 +- libobs/obs-audio.c | 2 +- libobs/obs-avc.c | 2 +- libobs/obs-avc.h | 2 +- libobs/obs-config.h | 2 +- libobs/obs-data.c | 2 +- libobs/obs-data.h | 2 +- libobs/obs-defs.h | 2 +- libobs/obs-display.c | 2 +- libobs/obs-encoder.c | 2 +- libobs/obs-encoder.h | 2 +- libobs/obs-hevc.c | 2 +- libobs/obs-hevc.h | 2 +- libobs/obs-interaction.h | 2 +- libobs/obs-internal.h | 2 +- libobs/obs-module.c | 2 +- libobs/obs-module.h | 2 +- libobs/obs-nal.c | 2 +- libobs/obs-nal.h | 2 +- libobs/obs-nix-x11.c | 2 +- libobs/obs-nix.c | 2 +- libobs/obs-output-delay.c | 2 +- libobs/obs-output.c | 2 +- libobs/obs-output.h | 2 +- libobs/obs-properties.c | 2 +- libobs/obs-properties.h | 2 +- libobs/obs-scene.c | 4 +- libobs/obs-scene.h | 2 +- libobs/obs-service.c | 2 +- libobs/obs-service.h | 2 +- libobs/obs-source-deinterlace.c | 2 +- libobs/obs-source-transition.c | 2 +- libobs/obs-source.c | 2 +- libobs/obs-source.h | 4 +- libobs/obs-ui.h | 2 +- libobs/obs-video-gpu-encode.c | 2 +- libobs/obs-video.c | 2 +- libobs/obs-view.c | 2 +- libobs/obs-win-crash-handler.c | 2 +- libobs/obs-windows.c | 2 +- libobs/obs.c | 2 +- libobs/obs.h | 4 +- libobs/obs.hpp | 2 +- libobs/util/AlignedNew.hpp | 2 +- libobs/util/array-serializer.c | 2 +- libobs/util/array-serializer.h | 2 +- libobs/util/base.c | 2 +- libobs/util/base.h | 2 +- libobs/util/bmem.c | 2 +- libobs/util/bmem.h | 2 +- libobs/util/c99defs.h | 2 +- libobs/util/cf-lexer.c | 2 +- libobs/util/cf-lexer.h | 4 +- libobs/util/cf-parser.c | 2 +- libobs/util/cf-parser.h | 2 +- libobs/util/circlebuf.h | 2 +- libobs/util/config-file.c | 2 +- libobs/util/config-file.h | 2 +- libobs/util/crc32.c | 2 +- libobs/util/crc32.h | 2 +- libobs/util/curl/curl-helper.h | 2 +- libobs/util/darray.h | 2 +- libobs/util/dstr.c | 2 +- libobs/util/dstr.h | 2 +- libobs/util/dstr.hpp | 2 +- libobs/util/file-serializer.c | 2 +- libobs/util/file-serializer.h | 2 +- libobs/util/lexer.c | 2 +- libobs/util/lexer.h | 4 +- libobs/util/pipe-posix.c | 2 +- libobs/util/pipe-windows.c | 2 +- libobs/util/pipe.h | 2 +- libobs/util/platform-cocoa.m | 6 +- libobs/util/platform-nix-dbus.c | 2 +- libobs/util/platform-nix-portal.c | 2 +- libobs/util/platform-nix.c | 2 +- libobs/util/platform-windows.c | 2 +- libobs/util/platform.c | 2 +- libobs/util/platform.h | 2 +- libobs/util/serializer.h | 2 +- libobs/util/text-lookup.c | 2 +- libobs/util/text-lookup.h | 2 +- libobs/util/threading-posix.c | 2 +- libobs/util/threading-posix.h | 2 +- libobs/util/threading-windows.c | 2 +- libobs/util/threading-windows.h | 2 +- libobs/util/threading.h | 2 +- libobs/util/util.hpp | 2 +- libobs/util/util_uint128.h | 2 +- libobs/util/windows/CoTaskMemPtr.hpp | 2 +- libobs/util/windows/ComPtr.hpp | 2 +- libobs/util/windows/HRError.hpp | 2 +- libobs/util/windows/WinHandle.hpp | 2 +- libobs/util/windows/win-registry.h | 2 +- libobs/util/windows/win-version.h | 2 +- plugins/aja/cmake/macos/Info.plist.in | 2 +- .../cmake/macos/Info.plist.in | 2 +- plugins/decklink/cmake/macos/Info.plist.in | 2 +- .../image-source/cmake/macos/Info.plist.in | 2 +- .../mac-avcapture/cmake/macos/Info.plist.in | 2 +- plugins/mac-capture/cmake/macos/Info.plist.in | 2 +- plugins/mac-syphon/cmake/macos/Info.plist.in | 2 +- .../cmake/macos/Info.plist.in | 2 +- .../src/dal-plugin/cmake/macos/Info.plist.in | 2 +- plugins/obs-browser | 2 +- plugins/obs-ffmpeg/CMakeLists.txt | 8 +-- plugins/obs-ffmpeg/cmake/legacy.cmake | 8 +-- plugins/obs-ffmpeg/cmake/macos/Info.plist.in | 2 +- plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 2 +- plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.h | 2 +- .../obs-ffmpeg/obs-ffmpeg-audio-encoders.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg-av1.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg-mux.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg-output.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg.c | 10 ++-- ...im-nvenc-helpers.c => obs-nvenc-helpers.c} | 8 +-- .../obs-ffmpeg/obs-nvenc-test/CMakeLists.txt | 2 +- .../{jim-nvenc-test.c => obs-nvenc-test.c} | 2 +- .../{jim-nvenc-ver.h => obs-nvenc-ver.h} | 0 .../obs-ffmpeg/{jim-nvenc.c => obs-nvenc.c} | 16 +++--- .../obs-ffmpeg/{jim-nvenc.h => obs-nvenc.h} | 2 +- plugins/obs-filters/cmake/macos/Info.plist.in | 2 +- plugins/obs-filters/color-correction-filter.c | 2 +- plugins/obs-outputs/cmake/macos/Info.plist.in | 2 +- plugins/obs-outputs/flv-mux.c | 2 +- plugins/obs-outputs/flv-mux.h | 2 +- plugins/obs-outputs/flv-output.c | 2 +- plugins/obs-outputs/null-output.c | 2 +- plugins/obs-outputs/rtmp-av1.c | 2 +- plugins/obs-outputs/rtmp-av1.h | 2 +- plugins/obs-outputs/rtmp-helpers.h | 2 +- plugins/obs-outputs/rtmp-hevc.c | 2 +- plugins/obs-outputs/rtmp-hevc.h | 2 +- plugins/obs-outputs/rtmp-stream.c | 2 +- plugins/obs-qsv11/common_directx11.cpp | 2 +- plugins/obs-qsv11/common_utils_windows.cpp | 6 +- .../obs-transitions/cmake/macos/Info.plist.in | 2 +- plugins/obs-vst/cmake/macos/Info.plist.in | 2 +- plugins/obs-x264/cmake/macos/Info.plist.in | 2 +- plugins/obs-x264/obs-x264.c | 2 +- .../rtmp-services/cmake/macos/Info.plist.in | 2 +- .../text-freetype2/cmake/macos/Info.plist.in | 2 +- plugins/vlc-video/cmake/macos/Info.plist.in | 2 +- plugins/win-capture/graphics-hook-ver.h | 4 +- .../win-capture/graphics-hook/gl-capture.c | 56 +++++++++---------- plugins/win-capture/graphics-hook/gl-decs.h | 24 ++++---- .../graphics-hook/graphics-hook.rc | 6 +- plugins/win-dshow/ffmpeg-decode.c | 2 +- plugins/win-dshow/ffmpeg-decode.h | 2 +- plugins/win-dshow/libdshowcapture | 2 +- 346 files changed, 442 insertions(+), 441 deletions(-) rename plugins/obs-ffmpeg/{jim-nvenc-helpers.c => obs-nvenc-helpers.c} (97%) rename plugins/obs-ffmpeg/obs-nvenc-test/{jim-nvenc-test.c => obs-nvenc-test.c} (99%) rename plugins/obs-ffmpeg/{jim-nvenc-ver.h => obs-nvenc-ver.h} (100%) rename plugins/obs-ffmpeg/{jim-nvenc.c => obs-nvenc.c} (98%) rename plugins/obs-ffmpeg/{jim-nvenc.h => obs-nvenc.h} (96%) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d78351733..96cccc15f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -54,7 +54,7 @@ jobs: SREL="release = '([0-9\.]+)'" RREL="release = '$VER'" SCOPY="copyright = '([A-Za-z0-9, ]+)'" - RCOPY="copyright = '2017-$(date +"%Y"), Hugh Bailey'" + RCOPY="copyright = '2017-$(date +"%Y"), Lain Bailey'" sed -i -E -e "s/${SVER}/${RVER}/g" -e "s/${SREL}/${RREL}/g" -e "s/${SCOPY}/${RCOPY}/g" docs/sphinx/conf.py - uses: totaldebug/sphinx-publish-action@1.2.0 diff --git a/.mailmap b/.mailmap index 92c8c3f3d..246f7788a 100644 --- a/.mailmap +++ b/.mailmap @@ -1,7 +1,8 @@ # # Manually defined # -Jim +Lain +Lain Benjamin Klettbach BtbN kc5nra diff --git a/AUTHORS b/AUTHORS index 9606e6a44..659f64aed 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,9 +1,9 @@ -Original Author: Hugh Bailey ("Jim") +Original Author: Lain Bailey Contributors are sorted by their amount of commits / translated words. Contributors: - Jim + Lain jpark37 Palana R1CH @@ -603,7 +603,7 @@ Contributors: zhaolong 张昆 练亮斌 - + Translators: Albanian: Aredio Vani (aredio.vani) diff --git a/UI/cmake/macos/Info.plist.in b/UI/cmake/macos/Info.plist.in index 5598019af..d55c2c0f8 100644 --- a/UI/cmake/macos/Info.plist.in +++ b/UI/cmake/macos/Info.plist.in @@ -35,7 +35,7 @@ NSMicrophoneUsageDescription OBS needs to access the microphone to enable audio input. NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey SUFeedURL ${SPARKLE_APPCAST_URL} SUPublicEDKey diff --git a/UI/display-helpers.hpp b/UI/display-helpers.hpp index 42f813de1..19f85c194 100644 --- a/UI/display-helpers.hpp +++ b/UI/display-helpers.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui index 55af294c6..89d7c97ce 100644 --- a/UI/forms/OBSBasic.ui +++ b/UI/forms/OBSBasic.ui @@ -1,6 +1,6 @@ - Jim + Lain OBSBasic diff --git a/UI/frontend-plugins/aja-output-ui/cmake/macos/Info.plist.in b/UI/frontend-plugins/aja-output-ui/cmake/macos/Info.plist.in index fdf293c5d..010046d85 100644 --- a/UI/frontend-plugins/aja-output-ui/cmake/macos/Info.plist.in +++ b/UI/frontend-plugins/aja-output-ui/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/UI/frontend-plugins/decklink-captions/cmake/macos/Info.plist.in b/UI/frontend-plugins/decklink-captions/cmake/macos/Info.plist.in index a00c8d4b6..dd637c575 100644 --- a/UI/frontend-plugins/decklink-captions/cmake/macos/Info.plist.in +++ b/UI/frontend-plugins/decklink-captions/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/UI/frontend-plugins/decklink-output-ui/cmake/macos/Info.plist.in b/UI/frontend-plugins/decklink-output-ui/cmake/macos/Info.plist.in index 3eae8b91d..893ff64f0 100644 --- a/UI/frontend-plugins/decklink-output-ui/cmake/macos/Info.plist.in +++ b/UI/frontend-plugins/decklink-output-ui/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/UI/frontend-plugins/frontend-tools/cmake/macos/Info.plist.in b/UI/frontend-plugins/frontend-tools/cmake/macos/Info.plist.in index df3568c23..a700c20c4 100644 --- a/UI/frontend-plugins/frontend-tools/cmake/macos/Info.plist.in +++ b/UI/frontend-plugins/frontend-tools/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/UI/frontend-plugins/frontend-tools/data/scripts/countdown.lua b/UI/frontend-plugins/frontend-tools/data/scripts/countdown.lua index 66d797a9d..42e991027 100644 --- a/UI/frontend-plugins/frontend-tools/data/scripts/countdown.lua +++ b/UI/frontend-plugins/frontend-tools/data/scripts/countdown.lua @@ -129,7 +129,7 @@ end -- A function named script_description returns the description shown to -- the user function script_description() - return "Sets a text source to act as a countdown timer when the source is active.\n\nMade by Jim" + return "Sets a text source to act as a countdown timer when the source is active.\n\nMade by Lain" end -- A function named script_update will be called when settings are changed diff --git a/UI/frontend-plugins/frontend-tools/data/scripts/instant-replay.lua b/UI/frontend-plugins/frontend-tools/data/scripts/instant-replay.lua index b1f82ff32..8a7b486f5 100644 --- a/UI/frontend-plugins/frontend-tools/data/scripts/instant-replay.lua +++ b/UI/frontend-plugins/frontend-tools/data/scripts/instant-replay.lua @@ -109,7 +109,7 @@ end -- A function named script_description returns the description shown to -- the user function script_description() - return "When the \"Instant Replay\" hotkey is triggered, saves a replay with the replay buffer, and then plays it in a media source as soon as the replay is ready. Requires an active replay buffer.\n\nMade by Jim and Exeldro" + return "When the \"Instant Replay\" hotkey is triggered, saves a replay with the replay buffer, and then plays it in a media source as soon as the replay is ready. Requires an active replay buffer.\n\nMade by Lain and Exeldro" end -- A function named script_properties defines the properties that the user diff --git a/UI/frontend-plugins/frontend-tools/data/scripts/url-text.py b/UI/frontend-plugins/frontend-tools/data/scripts/url-text.py index b44c444ac..c0c5fe4de 100644 --- a/UI/frontend-plugins/frontend-tools/data/scripts/url-text.py +++ b/UI/frontend-plugins/frontend-tools/data/scripts/url-text.py @@ -37,7 +37,7 @@ def refresh_pressed(props, prop): # ------------------------------------------------------------ def script_description(): - return "Updates a text source to the text retrieved from a URL at every specified interval.\n\nBy Jim" + return "Updates a text source to the text retrieved from a URL at every specified interval.\n\nBy Lain" def script_update(settings): global url diff --git a/UI/item-widget-helpers.cpp b/UI/item-widget-helpers.cpp index b10c957c1..cd8ee8dc6 100644 --- a/UI/item-widget-helpers.cpp +++ b/UI/item-widget-helpers.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/item-widget-helpers.hpp b/UI/item-widget-helpers.hpp index 0d1ed1808..20d1affd7 100644 --- a/UI/item-widget-helpers.hpp +++ b/UI/item-widget-helpers.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp index a8d564494..ffce2e998 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/obs-app.hpp b/UI/obs-app.hpp index 8ce62968d..65e3d6471 100644 --- a/UI/obs-app.hpp +++ b/UI/obs-app.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/obs.rc.in b/UI/obs.rc.in index 7bf7e2fe0..f1f06b697 100644 --- a/UI/obs.rc.in +++ b/UI/obs.rc.in @@ -15,7 +15,7 @@ BEGIN VALUE "ProductName", "OBS Studio" VALUE "ProductVersion", "${UI_VERSION}" VALUE "Comments", "Free and open source software for video recording and live streaming" - VALUE "LegalCopyright", "(C) Hugh Bailey" + VALUE "LegalCopyright", "(C) Lain Bailey" END END @@ -23,4 +23,4 @@ BEGIN BEGIN VALUE "Translation", 0x0409, 0x04B0 END -END \ No newline at end of file +END diff --git a/UI/platform-osx.mm b/UI/platform-osx.mm index 61a81947e..8506163cd 100644 --- a/UI/platform-osx.mm +++ b/UI/platform-osx.mm @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/platform-windows.cpp b/UI/platform-windows.cpp index 22d64ae1f..a75293689 100644 --- a/UI/platform-windows.cpp +++ b/UI/platform-windows.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/platform-x11.cpp b/UI/platform-x11.cpp index b4dcc54dd..6e49d8db4 100644 --- a/UI/platform-x11.cpp +++ b/UI/platform-x11.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey Copyright (C) 2014 by Zachary Lund This program is free software: you can redistribute it and/or modify diff --git a/UI/platform.hpp b/UI/platform.hpp index 22ce5ca9c..6fddfa9a9 100644 --- a/UI/platform.hpp +++ b/UI/platform.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/qt-wrappers.cpp b/UI/qt-wrappers.cpp index b836fcaa0..3a8966724 100644 --- a/UI/qt-wrappers.cpp +++ b/UI/qt-wrappers.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/qt-wrappers.hpp b/UI/qt-wrappers.hpp index c841e0bbd..33f013ac2 100644 --- a/UI/qt-wrappers.hpp +++ b/UI/qt-wrappers.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/remote-text.cpp b/UI/remote-text.cpp index c99d356db..839381f59 100644 --- a/UI/remote-text.cpp +++ b/UI/remote-text.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/remote-text.hpp b/UI/remote-text.hpp index 66113c8c0..5b8454f84 100644 --- a/UI/remote-text.hpp +++ b/UI/remote-text.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/screenshot-obj.hpp b/UI/screenshot-obj.hpp index ccb68c8e3..3a2603ff4 100644 --- a/UI/screenshot-obj.hpp +++ b/UI/screenshot-obj.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2020 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp index 91e83bb9a..d0ce4d9da 100644 --- a/UI/source-tree.cpp +++ b/UI/source-tree.cpp @@ -1525,7 +1525,7 @@ void SourceTree::NewGroupEdit(int row) "theoretically, it should be\nimpossible " "for this code to be reached. But if this " "code is reached,\nfeel free to laugh at " - "Jim, because apparently it is, in fact, " + "Lain, because apparently it is, in fact, " "actually\npossible for this code to be " "reached. But I mean, again, theoretically\n" "it should be impossible. So if you see " diff --git a/UI/win-update/updater/hash.cpp b/UI/win-update/updater/hash.cpp index 9591c84b6..2dd96a462 100644 --- a/UI/win-update/updater/hash.cpp +++ b/UI/win-update/updater/hash.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/UI/win-update/updater/http.cpp b/UI/win-update/updater/http.cpp index d32dd68ad..2124823a4 100644 --- a/UI/win-update/updater/http.cpp +++ b/UI/win-update/updater/http.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/UI/win-update/updater/patch.cpp b/UI/win-update/updater/patch.cpp index c2cd70631..2336b32dd 100644 --- a/UI/win-update/updater/patch.cpp +++ b/UI/win-update/updater/patch.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/UI/win-update/updater/updater.cpp b/UI/win-update/updater/updater.cpp index 14af8924a..463969395 100644 --- a/UI/win-update/updater/updater.cpp +++ b/UI/win-update/updater/updater.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/UI/win-update/updater/updater.hpp b/UI/win-update/updater/updater.hpp index ffc3ed0af..d750c0f43 100644 --- a/UI/win-update/updater/updater.hpp +++ b/UI/win-update/updater/updater.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp index 5a9c023df..c83dd921b 100644 --- a/UI/window-basic-filters.cpp +++ b/UI/window-basic-filters.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-filters.hpp b/UI/window-basic-filters.hpp index 2a14e7931..b3e86b0df 100644 --- a/UI/window-basic-filters.hpp +++ b/UI/window-basic-filters.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-interaction.cpp b/UI/window-basic-interaction.cpp index 8fb79f48a..921ff8021 100644 --- a/UI/window-basic-interaction.cpp +++ b/UI/window-basic-interaction.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-interaction.hpp b/UI/window-basic-interaction.hpp index 3b9241848..1f97af74f 100644 --- a/UI/window-basic-interaction.hpp +++ b/UI/window-basic-interaction.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-main-browser.cpp b/UI/window-basic-main-browser.cpp index 0434a676d..ec99f141e 100644 --- a/UI/window-basic-main-browser.cpp +++ b/UI/window-basic-main-browser.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2018 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-main-profiles.cpp b/UI/window-basic-main-profiles.cpp index 4941359ea..4f0acaa34 100644 --- a/UI/window-basic-main-profiles.cpp +++ b/UI/window-basic-main-profiles.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-main-scene-collections.cpp b/UI/window-basic-main-scene-collections.cpp index c3a1aaecd..ab0ab70e8 100644 --- a/UI/window-basic-main-scene-collections.cpp +++ b/UI/window-basic-main-scene-collections.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-main-screenshot.cpp b/UI/window-basic-main-screenshot.cpp index a2c9f09bd..cf1a1dceb 100644 --- a/UI/window-basic-main-screenshot.cpp +++ b/UI/window-basic-main-screenshot.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2020 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp index beb5b1f60..f54d75d40 100644 --- a/UI/window-basic-main-transitions.cpp +++ b/UI/window-basic-main-transitions.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2016 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 517c34ae3..28a5f2ae6 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -1,7 +1,7 @@ /****************************************************************************** - Copyright (C) 2013-2015 by Hugh Bailey - Zachary Lund - Philippe Groarke + Copyright (C) 2023 by Lain Bailey + Zachary Lund + Philippe Groarke This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -6725,7 +6725,7 @@ void OBSBasic::YoutubeStreamCheck(const std::string &key) YoutubeApiWrappers *apiYouTube( dynamic_cast(GetAuth())); if (!apiYouTube) { - /* technically we should never get here -Jim */ + /* technically we should never get here -Lain */ QMetaObject::invokeMethod(this, "ForceStopStreaming", Qt::QueuedConnection); youtubeStreamCheckThread->deleteLater(); diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 55abea8fe..18bc02d04 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp index aa5331111..c90fc3f32 100644 --- a/UI/window-basic-properties.cpp +++ b/UI/window-basic-properties.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-properties.hpp b/UI/window-basic-properties.hpp index 9b2144432..7c03f3fa6 100644 --- a/UI/window-basic-properties.hpp +++ b/UI/window-basic-properties.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 769a3e409..ef147e317 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey - Philippe Groarke + Copyright (C) 2023 by Lain Bailey + Philippe Groarke This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-settings.hpp b/UI/window-basic-settings.hpp index 6c91532ae..e9083ad08 100644 --- a/UI/window-basic-settings.hpp +++ b/UI/window-basic-settings.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey Philippe Groarke This program is free software: you can redistribute it and/or modify diff --git a/UI/window-basic-source-select.cpp b/UI/window-basic-source-select.cpp index 38308b5be..88dacdced 100644 --- a/UI/window-basic-source-select.cpp +++ b/UI/window-basic-source-select.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-basic-source-select.hpp b/UI/window-basic-source-select.hpp index 01f024fed..e847c1357 100644 --- a/UI/window-basic-source-select.hpp +++ b/UI/window-basic-source-select.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-log-reply.cpp b/UI/window-log-reply.cpp index 099f85765..fa4a18df5 100644 --- a/UI/window-log-reply.cpp +++ b/UI/window-log-reply.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-log-reply.hpp b/UI/window-log-reply.hpp index 746d1f466..598a7f172 100644 --- a/UI/window-log-reply.hpp +++ b/UI/window-log-reply.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-namedialog.cpp b/UI/window-namedialog.cpp index a9d69d340..c25cae214 100644 --- a/UI/window-namedialog.cpp +++ b/UI/window-namedialog.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-namedialog.hpp b/UI/window-namedialog.hpp index 14e9fed71..869822911 100644 --- a/UI/window-namedialog.hpp +++ b/UI/window-namedialog.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-permissions.cpp b/UI/window-permissions.cpp index c36e52497..d292b6397 100644 --- a/UI/window-permissions.cpp +++ b/UI/window-permissions.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UI/window-permissions.hpp b/UI/window-permissions.hpp index 6d0efaa45..f542f12ea 100644 --- a/UI/window-permissions.hpp +++ b/UI/window-permissions.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cmake/Modules/VersionConfig.cmake b/cmake/Modules/VersionConfig.cmake index 33f4d5e5e..e567f3a19 100644 --- a/cmake/Modules/VersionConfig.cmake +++ b/cmake/Modules/VersionConfig.cmake @@ -2,7 +2,7 @@ set(OBS_COMPANY_NAME "OBS Project") set(OBS_PRODUCT_NAME "OBS Studio") set(OBS_WEBSITE "https://www.obsproject.com") set(OBS_COMMENTS "Free and open source software for video recording and live streaming") -set(OBS_LEGAL_COPYRIGHT "(C) Hugh Bailey") +set(OBS_LEGAL_COPYRIGHT "(C) Lain Bailey") # Configure default version strings set(_OBS_DEFAULT_VERSION "0" "0" "1") diff --git a/cmake/bundle/macOS/Info.plist.in b/cmake/bundle/macOS/Info.plist.in index 84d131eb9..e1d3af2ec 100644 --- a/cmake/bundle/macOS/Info.plist.in +++ b/cmake/bundle/macOS/Info.plist.in @@ -33,6 +33,6 @@ NSMicrophoneUsageDescription OBS needs to access the microphone to enable audio input. NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/cmake/bundle/macOS/Plugin-Info.plist.in b/cmake/bundle/macOS/Plugin-Info.plist.in index be3690b75..a9830d1fe 100644 --- a/cmake/bundle/macOS/Plugin-Info.plist.in +++ b/cmake/bundle/macOS/Plugin-Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/cmake/bundle/macOS/Virtualcam-Info.plist.in b/cmake/bundle/macOS/Virtualcam-Info.plist.in index fdbfa72a4..49bef653e 100644 --- a/cmake/bundle/macOS/Virtualcam-Info.plist.in +++ b/cmake/bundle/macOS/Virtualcam-Info.plist.in @@ -23,7 +23,7 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey CFPlugInFactories 7E950B8C-5E49-4B9E-B7D0-B3608A08E8F6 diff --git a/cmake/common/bootstrap.cmake b/cmake/common/bootstrap.cmake index 8d72a36db..c17ef91c6 100644 --- a/cmake/common/bootstrap.cmake +++ b/cmake/common/bootstrap.cmake @@ -22,7 +22,7 @@ set(OBS_COMPANY_NAME "OBS Project") set(OBS_PRODUCT_NAME "OBS Studio") set(OBS_WEBSITE "https://www.obsproject.com") set(OBS_COMMENTS "Free and open source software for video recording and live streaming") -set(OBS_LEGAL_COPYRIGHT "(C) Hugh Bailey") +set(OBS_LEGAL_COPYRIGHT "(C) Lain Bailey") # Configure default version strings message(DEBUG "Setting default project version variables...") diff --git a/deps/ipc-util/ipc-util/pipe-posix.c b/deps/ipc-util/ipc-util/pipe-posix.c index 1a2978a61..accc7c068 100644 --- a/deps/ipc-util/ipc-util/pipe-posix.c +++ b/deps/ipc-util/ipc-util/pipe-posix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/ipc-util/ipc-util/pipe-posix.h b/deps/ipc-util/ipc-util/pipe-posix.h index 757ebceb0..2eb73c495 100644 --- a/deps/ipc-util/ipc-util/pipe-posix.h +++ b/deps/ipc-util/ipc-util/pipe-posix.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/ipc-util/ipc-util/pipe-windows.c b/deps/ipc-util/ipc-util/pipe-windows.c index 1ce1ae12e..cdecf9cf3 100644 --- a/deps/ipc-util/ipc-util/pipe-windows.c +++ b/deps/ipc-util/ipc-util/pipe-windows.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/ipc-util/ipc-util/pipe-windows.h b/deps/ipc-util/ipc-util/pipe-windows.h index 0928151ee..3002260a1 100644 --- a/deps/ipc-util/ipc-util/pipe-windows.h +++ b/deps/ipc-util/ipc-util/pipe-windows.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/ipc-util/ipc-util/pipe.h b/deps/ipc-util/ipc-util/pipe.h index 5182d651c..348e7103a 100644 --- a/deps/ipc-util/ipc-util/pipe.h +++ b/deps/ipc-util/ipc-util/pipe.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/libff/libff/ff-compat.h b/deps/libff/libff/ff-compat.h index ba2bdf39a..a74415b98 100644 --- a/deps/libff/libff/ff-compat.h +++ b/deps/libff/libff/ff-compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/libff/libff/ff-threading-posix.c b/deps/libff/libff/ff-threading-posix.c index 1491fd6fd..6c7845b56 100644 --- a/deps/libff/libff/ff-threading-posix.c +++ b/deps/libff/libff/ff-threading-posix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/libff/libff/ff-threading-windows.c b/deps/libff/libff/ff-threading-windows.c index 56b034e0d..40b5837b0 100644 --- a/deps/libff/libff/ff-threading-windows.c +++ b/deps/libff/libff/ff-threading-windows.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/cache.c b/deps/media-playback/media-playback/cache.c index 43d81d7f1..dc5a5eb7d 100644 --- a/deps/media-playback/media-playback/cache.c +++ b/deps/media-playback/media-playback/cache.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/cache.h b/deps/media-playback/media-playback/cache.h index feda6bbbf..863e31e51 100644 --- a/deps/media-playback/media-playback/cache.h +++ b/deps/media-playback/media-playback/cache.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/closest-format.h b/deps/media-playback/media-playback/closest-format.h index 1e4ea87eb..a2cc69ba6 100644 --- a/deps/media-playback/media-playback/closest-format.h +++ b/deps/media-playback/media-playback/closest-format.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c index b827c662a..1340e892c 100644 --- a/deps/media-playback/media-playback/decode.c +++ b/deps/media-playback/media-playback/decode.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/decode.h b/deps/media-playback/media-playback/decode.h index 6da34061b..08e12fc7a 100644 --- a/deps/media-playback/media-playback/decode.h +++ b/deps/media-playback/media-playback/decode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/media-playback.c b/deps/media-playback/media-playback/media-playback.c index 2f616c63b..ea5142c08 100644 --- a/deps/media-playback/media-playback/media-playback.c +++ b/deps/media-playback/media-playback/media-playback.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/media-playback.h b/deps/media-playback/media-playback/media-playback.h index 64b5818ae..607e50b8f 100644 --- a/deps/media-playback/media-playback/media-playback.h +++ b/deps/media-playback/media-playback/media-playback.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c index 1446643e6..2a0753f81 100644 --- a/deps/media-playback/media-playback/media.c +++ b/deps/media-playback/media-playback/media.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/media-playback/media-playback/media.h b/deps/media-playback/media-playback/media.h index 391f1831f..281d4e098 100644 --- a/deps/media-playback/media-playback/media.h +++ b/deps/media-playback/media-playback/media.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/deps/obs-scripting/obs-scripting-callback.h b/deps/obs-scripting/obs-scripting-callback.h index f83119eea..b6975ac00 100644 --- a/deps/obs-scripting/obs-scripting-callback.h +++ b/deps/obs-scripting/obs-scripting-callback.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-internal.h b/deps/obs-scripting/obs-scripting-internal.h index 89fe2fdf7..d7806ea6d 100644 --- a/deps/obs-scripting/obs-scripting-internal.h +++ b/deps/obs-scripting/obs-scripting-internal.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-logging.c b/deps/obs-scripting/obs-scripting-logging.c index 97406c3a8..3bd2d5d32 100644 --- a/deps/obs-scripting/obs-scripting-logging.c +++ b/deps/obs-scripting/obs-scripting-logging.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-lua-frontend.c b/deps/obs-scripting/obs-scripting-lua-frontend.c index b175967c7..a818a8dfc 100644 --- a/deps/obs-scripting/obs-scripting-lua-frontend.c +++ b/deps/obs-scripting/obs-scripting-lua-frontend.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-lua-source.c b/deps/obs-scripting/obs-scripting-lua-source.c index 5be86aee6..2be90ed41 100644 --- a/deps/obs-scripting/obs-scripting-lua-source.c +++ b/deps/obs-scripting/obs-scripting-lua-source.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-lua.c b/deps/obs-scripting/obs-scripting-lua.c index e4cf186f2..2f827b354 100644 --- a/deps/obs-scripting/obs-scripting-lua.c +++ b/deps/obs-scripting/obs-scripting-lua.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-lua.h b/deps/obs-scripting/obs-scripting-lua.h index dda1042e3..d5f635060 100644 --- a/deps/obs-scripting/obs-scripting-lua.h +++ b/deps/obs-scripting/obs-scripting-lua.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-python-frontend.c b/deps/obs-scripting/obs-scripting-python-frontend.c index 94787ffb4..392c61d68 100644 --- a/deps/obs-scripting/obs-scripting-python-frontend.c +++ b/deps/obs-scripting/obs-scripting-python-frontend.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-python-import.c b/deps/obs-scripting/obs-scripting-python-import.c index 7efac9678..ff9809a5f 100644 --- a/deps/obs-scripting/obs-scripting-python-import.c +++ b/deps/obs-scripting/obs-scripting-python-import.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-python-import.h b/deps/obs-scripting/obs-scripting-python-import.h index b0b9e1db9..a892e8ac7 100644 --- a/deps/obs-scripting/obs-scripting-python-import.h +++ b/deps/obs-scripting/obs-scripting-python-import.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting-python.c b/deps/obs-scripting/obs-scripting-python.c index a3b3b3c20..3a4f9fbf6 100644 --- a/deps/obs-scripting/obs-scripting-python.c +++ b/deps/obs-scripting/obs-scripting-python.c @@ -1,6 +1,6 @@ /****************************************************************************** Copyright (C) 2015 by Andrew Skinner - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -499,7 +499,7 @@ static PyObject *obs_python_remove_tick_callback(PyObject *self, PyObject *args) if (!script) { PyErr_SetString(PyExc_RuntimeError, - "No active script, report this to Jim"); + "No active script, report this to Lain"); return NULL; } @@ -524,7 +524,7 @@ static PyObject *obs_python_add_tick_callback(PyObject *self, PyObject *args) if (!script) { PyErr_SetString(PyExc_RuntimeError, - "No active script, report this to Jim"); + "No active script, report this to Lain"); return NULL; } @@ -577,7 +577,7 @@ static PyObject *obs_python_signal_handler_disconnect(PyObject *self, if (!script) { PyErr_SetString(PyExc_RuntimeError, - "No active script, report this to Jim"); + "No active script, report this to Lain"); return NULL; } @@ -623,7 +623,7 @@ static PyObject *obs_python_signal_handler_connect(PyObject *self, if (!script) { PyErr_SetString(PyExc_RuntimeError, - "No active script, report this to Jim"); + "No active script, report this to Lain"); return NULL; } @@ -682,7 +682,7 @@ static PyObject *obs_python_signal_handler_disconnect_global(PyObject *self, if (!script) { PyErr_SetString(PyExc_RuntimeError, - "No active script, report this to Jim"); + "No active script, report this to Lain"); return NULL; } @@ -724,7 +724,7 @@ static PyObject *obs_python_signal_handler_connect_global(PyObject *self, if (!script) { PyErr_SetString(PyExc_RuntimeError, - "No active script, report this to Jim"); + "No active script, report this to Lain"); return NULL; } @@ -822,7 +822,7 @@ static PyObject *hotkey_unregister(PyObject *self, PyObject *args) if (!script) { PyErr_SetString(PyExc_RuntimeError, - "No active script, report this to Jim"); + "No active script, report this to Lain"); return NULL; } diff --git a/deps/obs-scripting/obs-scripting-python.h b/deps/obs-scripting/obs-scripting-python.h index c573817da..93ff2a150 100644 --- a/deps/obs-scripting/obs-scripting-python.h +++ b/deps/obs-scripting/obs-scripting-python.h @@ -1,6 +1,6 @@ /****************************************************************************** Copyright (C) 2015 by Andrew Skinner - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting.c b/deps/obs-scripting/obs-scripting.c index 83a45ae25..595b6ee83 100644 --- a/deps/obs-scripting/obs-scripting.c +++ b/deps/obs-scripting/obs-scripting.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deps/obs-scripting/obs-scripting.h b/deps/obs-scripting/obs-scripting.h index 420c4b19a..5a691c103 100644 --- a/deps/obs-scripting/obs-scripting.h +++ b/deps/obs-scripting/obs-scripting.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index fa08135d5..54e46de00 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -57,8 +57,8 @@ master_doc = 'index' # General information about the project. project = 'OBS Studio' -copyright = '2017-2022, Hugh Bailey' -author = 'Hugh Bailey' +copyright = '2017-2022, Lain Bailey' +author = 'Lain Bailey' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -176,7 +176,7 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ (master_doc, 'OBSStudio.tex', 'OBS Studio Documentation', - 'Hugh Bailey', 'manual'), + 'Lain Bailey', 'manual'), ] diff --git a/libobs-d3d11/d3d11-duplicator.cpp b/libobs-d3d11/d3d11-duplicator.cpp index 132f3a782..dff6e1af9 100644 --- a/libobs-d3d11/d3d11-duplicator.cpp +++ b/libobs-d3d11/d3d11-duplicator.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-indexbuffer.cpp b/libobs-d3d11/d3d11-indexbuffer.cpp index 8cd48c720..bf301d863 100644 --- a/libobs-d3d11/d3d11-indexbuffer.cpp +++ b/libobs-d3d11/d3d11-indexbuffer.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-rebuild.cpp b/libobs-d3d11/d3d11-rebuild.cpp index 2cee84041..109f44031 100644 --- a/libobs-d3d11/d3d11-rebuild.cpp +++ b/libobs-d3d11/d3d11-rebuild.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2016 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-samplerstate.cpp b/libobs-d3d11/d3d11-samplerstate.cpp index 520b3cac1..e2feac76d 100644 --- a/libobs-d3d11/d3d11-samplerstate.cpp +++ b/libobs-d3d11/d3d11-samplerstate.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-shader.cpp b/libobs-d3d11/d3d11-shader.cpp index 66bb7b3d3..2525aed22 100644 --- a/libobs-d3d11/d3d11-shader.cpp +++ b/libobs-d3d11/d3d11-shader.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-shaderprocessor.cpp b/libobs-d3d11/d3d11-shaderprocessor.cpp index fbbc9d1ce..f4c2756cf 100644 --- a/libobs-d3d11/d3d11-shaderprocessor.cpp +++ b/libobs-d3d11/d3d11-shaderprocessor.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-shaderprocessor.hpp b/libobs-d3d11/d3d11-shaderprocessor.hpp index 6d09d5bac..b15a94d54 100644 --- a/libobs-d3d11/d3d11-shaderprocessor.hpp +++ b/libobs-d3d11/d3d11-shaderprocessor.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-stagesurf.cpp b/libobs-d3d11/d3d11-stagesurf.cpp index 3e533f3cd..64640b94a 100644 --- a/libobs-d3d11/d3d11-stagesurf.cpp +++ b/libobs-d3d11/d3d11-stagesurf.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp index 6e7e0e334..c0db7d4e3 100644 --- a/libobs-d3d11/d3d11-subsystem.cpp +++ b/libobs-d3d11/d3d11-subsystem.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-subsystem.hpp b/libobs-d3d11/d3d11-subsystem.hpp index 1d167051d..a216a2fd2 100644 --- a/libobs-d3d11/d3d11-subsystem.hpp +++ b/libobs-d3d11/d3d11-subsystem.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-texture2d.cpp b/libobs-d3d11/d3d11-texture2d.cpp index bc1596e06..9785ef6f5 100644 --- a/libobs-d3d11/d3d11-texture2d.cpp +++ b/libobs-d3d11/d3d11-texture2d.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-texture3d.cpp b/libobs-d3d11/d3d11-texture3d.cpp index 6291b9cbf..31eea0065 100644 --- a/libobs-d3d11/d3d11-texture3d.cpp +++ b/libobs-d3d11/d3d11-texture3d.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-vertexbuffer.cpp b/libobs-d3d11/d3d11-vertexbuffer.cpp index c37769acd..e7879ce7e 100644 --- a/libobs-d3d11/d3d11-vertexbuffer.cpp +++ b/libobs-d3d11/d3d11-vertexbuffer.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-d3d11/d3d11-zstencilbuffer.cpp b/libobs-d3d11/d3d11-zstencilbuffer.cpp index 34b7e498e..7f74e9a42 100644 --- a/libobs-d3d11/d3d11-zstencilbuffer.cpp +++ b/libobs-d3d11/d3d11-zstencilbuffer.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-helpers.c b/libobs-opengl/gl-helpers.c index 82c564393..0e69c1e4c 100644 --- a/libobs-opengl/gl-helpers.c +++ b/libobs-opengl/gl-helpers.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-helpers.h b/libobs-opengl/gl-helpers.h index 216cca28a..98b8c5061 100644 --- a/libobs-opengl/gl-helpers.h +++ b/libobs-opengl/gl-helpers.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-indexbuffer.c b/libobs-opengl/gl-indexbuffer.c index ec09c1ef4..f3248ebbf 100644 --- a/libobs-opengl/gl-indexbuffer.c +++ b/libobs-opengl/gl-indexbuffer.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-shader.c b/libobs-opengl/gl-shader.c index 0c3c9c115..56eefca69 100644 --- a/libobs-opengl/gl-shader.c +++ b/libobs-opengl/gl-shader.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-shaderparser.c b/libobs-opengl/gl-shaderparser.c index bb653d0a8..0361b2eab 100644 --- a/libobs-opengl/gl-shaderparser.c +++ b/libobs-opengl/gl-shaderparser.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-shaderparser.h b/libobs-opengl/gl-shaderparser.h index af837fc4d..d481c1c80 100644 --- a/libobs-opengl/gl-shaderparser.h +++ b/libobs-opengl/gl-shaderparser.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-stagesurf.c b/libobs-opengl/gl-stagesurf.c index 7f03064bc..ba2e9da7f 100644 --- a/libobs-opengl/gl-stagesurf.c +++ b/libobs-opengl/gl-stagesurf.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-subsystem.c b/libobs-opengl/gl-subsystem.c index 0cdd46d08..0fd554497 100644 --- a/libobs-opengl/gl-subsystem.c +++ b/libobs-opengl/gl-subsystem.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey Copyright (C) 2014 by Zachary Lund This program is free software: you can redistribute it and/or modify diff --git a/libobs-opengl/gl-subsystem.h b/libobs-opengl/gl-subsystem.h index daddffffc..33bcc2a35 100644 --- a/libobs-opengl/gl-subsystem.h +++ b/libobs-opengl/gl-subsystem.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-texture2d.c b/libobs-opengl/gl-texture2d.c index 6c4aafb6f..fe98353ed 100644 --- a/libobs-opengl/gl-texture2d.c +++ b/libobs-opengl/gl-texture2d.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-texture3d.c b/libobs-opengl/gl-texture3d.c index a63bd90d6..69bab3938 100644 --- a/libobs-opengl/gl-texture3d.c +++ b/libobs-opengl/gl-texture3d.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-texturecube.c b/libobs-opengl/gl-texturecube.c index 880e2f319..efc7e343b 100644 --- a/libobs-opengl/gl-texturecube.c +++ b/libobs-opengl/gl-texturecube.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-vertexbuffer.c b/libobs-opengl/gl-vertexbuffer.c index 2d212ced0..9bb674f5e 100644 --- a/libobs-opengl/gl-vertexbuffer.c +++ b/libobs-opengl/gl-vertexbuffer.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-windows.c b/libobs-opengl/gl-windows.c index b93396c63..b9825e384 100644 --- a/libobs-opengl/gl-windows.c +++ b/libobs-opengl/gl-windows.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs-opengl/gl-zstencil.c b/libobs-opengl/gl-zstencil.c index 65ffa7d17..48bcfbab2 100644 --- a/libobs-opengl/gl-zstencil.c +++ b/libobs-opengl/gl-zstencil.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/callback/calldata.c b/libobs/callback/calldata.c index 53941d825..e99570783 100644 --- a/libobs/callback/calldata.c +++ b/libobs/callback/calldata.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/callback/calldata.h b/libobs/callback/calldata.h index 90931d5b7..0f7945468 100644 --- a/libobs/callback/calldata.h +++ b/libobs/callback/calldata.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/callback/decl.c b/libobs/callback/decl.c index 1f7835010..eb989962d 100644 --- a/libobs/callback/decl.c +++ b/libobs/callback/decl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/callback/decl.h b/libobs/callback/decl.h index 4e7a28c56..1d359b288 100644 --- a/libobs/callback/decl.h +++ b/libobs/callback/decl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/callback/proc.c b/libobs/callback/proc.c index e8a650510..4039fd544 100644 --- a/libobs/callback/proc.c +++ b/libobs/callback/proc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/callback/proc.h b/libobs/callback/proc.h index 617df2eb1..0dd540b96 100644 --- a/libobs/callback/proc.h +++ b/libobs/callback/proc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/callback/signal.c b/libobs/callback/signal.c index db7d1460b..46215d789 100644 --- a/libobs/callback/signal.c +++ b/libobs/callback/signal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/callback/signal.h b/libobs/callback/signal.h index 841aa496a..7e546f9b5 100644 --- a/libobs/callback/signal.h +++ b/libobs/callback/signal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/cmake/macos/Info.plist.in b/libobs/cmake/macos/Info.plist.in index 6d0e507af..7fe549f8d 100644 --- a/libobs/cmake/macos/Info.plist.in +++ b/libobs/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/libobs/data/deinterlace_base.effect b/libobs/data/deinterlace_base.effect index 0ec480742..f20e8105e 100644 --- a/libobs/data/deinterlace_base.effect +++ b/libobs/data/deinterlace_base.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2015 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_blend.effect b/libobs/data/deinterlace_blend.effect index bedd1b900..69ecb2eee 100644 --- a/libobs/data/deinterlace_blend.effect +++ b/libobs/data/deinterlace_blend.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_blend_2x.effect b/libobs/data/deinterlace_blend_2x.effect index dace32ae0..62d9cdd35 100644 --- a/libobs/data/deinterlace_blend_2x.effect +++ b/libobs/data/deinterlace_blend_2x.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_discard.effect b/libobs/data/deinterlace_discard.effect index 33872d7f2..66cc313f3 100644 --- a/libobs/data/deinterlace_discard.effect +++ b/libobs/data/deinterlace_discard.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_discard_2x.effect b/libobs/data/deinterlace_discard_2x.effect index d7b1acbd0..0bafb41b3 100644 --- a/libobs/data/deinterlace_discard_2x.effect +++ b/libobs/data/deinterlace_discard_2x.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_linear.effect b/libobs/data/deinterlace_linear.effect index 909646e1c..7e9a03a45 100644 --- a/libobs/data/deinterlace_linear.effect +++ b/libobs/data/deinterlace_linear.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_linear_2x.effect b/libobs/data/deinterlace_linear_2x.effect index 2a20ea623..561dc50a1 100644 --- a/libobs/data/deinterlace_linear_2x.effect +++ b/libobs/data/deinterlace_linear_2x.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_yadif.effect b/libobs/data/deinterlace_yadif.effect index 5d8fdca71..e04b665c9 100644 --- a/libobs/data/deinterlace_yadif.effect +++ b/libobs/data/deinterlace_yadif.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/deinterlace_yadif_2x.effect b/libobs/data/deinterlace_yadif_2x.effect index 500590cec..ee0e170b5 100644 --- a/libobs/data/deinterlace_yadif_2x.effect +++ b/libobs/data/deinterlace_yadif_2x.effect @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016 Ruwen Hahn + * Copyright (c) 2023 Ruwen Hahn * John R. Bradley - * Hugh Bailey "Jim" + * Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/data/format_conversion.effect b/libobs/data/format_conversion.effect index 734f14032..28f7160fd 100644 --- a/libobs/data/format_conversion.effect +++ b/libobs/data/format_conversion.effect @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -596,7 +596,7 @@ float4 PSYUY2_PQ_Reverse(FragTexTex frag_in) : TARGET float2 cbcr = image.Sample(def_sampler, frag_in.uvuv.zw, 0).yw; float leftover = frac(frag_in.uvuv.x); float y = (leftover < 0.5) ? y01.x : y01.y; - float3 yuv = float3(y, cbcr); + float3 yuv = float3(y, cbcr); float3 pq = YUV_to_RGB(yuv); float3 hdr2020 = st2084_to_linear_eetf(pq, hdr_lw, hdr_lmax) * maximum_over_sdr_white_nits; float3 rgb = rec2020_to_rec709(hdr2020); diff --git a/libobs/graphics/axisang.c b/libobs/graphics/axisang.c index 75a48a749..80830d88c 100644 --- a/libobs/graphics/axisang.c +++ b/libobs/graphics/axisang.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/axisang.h b/libobs/graphics/axisang.h index 112baf15c..ddbcd7d01 100644 --- a/libobs/graphics/axisang.h +++ b/libobs/graphics/axisang.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/bounds.c b/libobs/graphics/bounds.c index 7300b3325..cee018ed6 100644 --- a/libobs/graphics/bounds.c +++ b/libobs/graphics/bounds.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/bounds.h b/libobs/graphics/bounds.h index 6a66d90b4..8f2ab343f 100644 --- a/libobs/graphics/bounds.h +++ b/libobs/graphics/bounds.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/device-exports.h b/libobs/graphics/device-exports.h index bff578951..4a11d50ee 100644 --- a/libobs/graphics/device-exports.h +++ b/libobs/graphics/device-exports.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/effect-parser.c b/libobs/graphics/effect-parser.c index fc9f68ce7..6dcf86d2f 100644 --- a/libobs/graphics/effect-parser.c +++ b/libobs/graphics/effect-parser.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/effect-parser.h b/libobs/graphics/effect-parser.h index 63925b768..43b2c430c 100644 --- a/libobs/graphics/effect-parser.h +++ b/libobs/graphics/effect-parser.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/effect.c b/libobs/graphics/effect.c index e8f36598f..cb5a2b31f 100644 --- a/libobs/graphics/effect.c +++ b/libobs/graphics/effect.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/effect.h b/libobs/graphics/effect.h index 6aae0ce65..948523817 100644 --- a/libobs/graphics/effect.h +++ b/libobs/graphics/effect.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/graphics-imports.c b/libobs/graphics/graphics-imports.c index d6eaccccc..ddf8e96e4 100644 --- a/libobs/graphics/graphics-imports.c +++ b/libobs/graphics/graphics-imports.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/graphics-internal.h b/libobs/graphics/graphics-internal.h index d0ae5b895..6cf5cf577 100644 --- a/libobs/graphics/graphics-internal.h +++ b/libobs/graphics/graphics-internal.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/graphics.c b/libobs/graphics/graphics.c index 288fb1db6..d84df70c8 100644 --- a/libobs/graphics/graphics.c +++ b/libobs/graphics/graphics.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/graphics.h b/libobs/graphics/graphics.h index 0f62d5b95..759f0b1b3 100644 --- a/libobs/graphics/graphics.h +++ b/libobs/graphics/graphics.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/half.h b/libobs/graphics/half.h index 16416d80a..0d864cab6 100644 --- a/libobs/graphics/half.h +++ b/libobs/graphics/half.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2020 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/image-file.c b/libobs/graphics/image-file.c index d53a1c853..7bfb16f58 100644 --- a/libobs/graphics/image-file.c +++ b/libobs/graphics/image-file.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2016 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/image-file.h b/libobs/graphics/image-file.h index df1e597c2..1f6bc97aa 100644 --- a/libobs/graphics/image-file.h +++ b/libobs/graphics/image-file.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2016 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/input.h b/libobs/graphics/input.h index 0a83d3a66..fecde6a95 100644 --- a/libobs/graphics/input.h +++ b/libobs/graphics/input.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/math-defs.h b/libobs/graphics/math-defs.h index 748bea1cd..be724c396 100644 --- a/libobs/graphics/math-defs.h +++ b/libobs/graphics/math-defs.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/math-extra.c b/libobs/graphics/math-extra.c index b162b5ad2..f9c41786e 100644 --- a/libobs/graphics/math-extra.c +++ b/libobs/graphics/math-extra.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/math-extra.h b/libobs/graphics/math-extra.h index 1c5f36493..43c178df9 100644 --- a/libobs/graphics/math-extra.h +++ b/libobs/graphics/math-extra.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/matrix3.c b/libobs/graphics/matrix3.c index 98f63f948..2fe5ea848 100644 --- a/libobs/graphics/matrix3.c +++ b/libobs/graphics/matrix3.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/matrix3.h b/libobs/graphics/matrix3.h index 22b0c80c3..eeb9c751e 100644 --- a/libobs/graphics/matrix3.h +++ b/libobs/graphics/matrix3.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/matrix4.c b/libobs/graphics/matrix4.c index b03c7d4f2..8cf4096a2 100644 --- a/libobs/graphics/matrix4.c +++ b/libobs/graphics/matrix4.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/matrix4.h b/libobs/graphics/matrix4.h index 40a677d4b..fad8884d2 100644 --- a/libobs/graphics/matrix4.h +++ b/libobs/graphics/matrix4.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/plane.c b/libobs/graphics/plane.c index 237a32e8c..926063a7d 100644 --- a/libobs/graphics/plane.c +++ b/libobs/graphics/plane.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/plane.h b/libobs/graphics/plane.h index c9d3dc5d3..74d05e90f 100644 --- a/libobs/graphics/plane.h +++ b/libobs/graphics/plane.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/quat.c b/libobs/graphics/quat.c index b27ad0415..47ee1266d 100644 --- a/libobs/graphics/quat.c +++ b/libobs/graphics/quat.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/quat.h b/libobs/graphics/quat.h index 95cd1c12c..3cf237987 100644 --- a/libobs/graphics/quat.h +++ b/libobs/graphics/quat.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/shader-parser.c b/libobs/graphics/shader-parser.c index ceddd368a..23d7add64 100644 --- a/libobs/graphics/shader-parser.c +++ b/libobs/graphics/shader-parser.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/shader-parser.h b/libobs/graphics/shader-parser.h index 3776734e3..1069628b2 100644 --- a/libobs/graphics/shader-parser.h +++ b/libobs/graphics/shader-parser.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/srgb.h b/libobs/graphics/srgb.h index e7837872d..a4050a58a 100644 --- a/libobs/graphics/srgb.h +++ b/libobs/graphics/srgb.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2021 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/texture-render.c b/libobs/graphics/texture-render.c index 476073178..cd7eac5d1 100644 --- a/libobs/graphics/texture-render.c +++ b/libobs/graphics/texture-render.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/vec2.c b/libobs/graphics/vec2.c index 67c6d6c49..06dc466cf 100644 --- a/libobs/graphics/vec2.c +++ b/libobs/graphics/vec2.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/vec2.h b/libobs/graphics/vec2.h index f0ca985d4..a845c31f1 100644 --- a/libobs/graphics/vec2.h +++ b/libobs/graphics/vec2.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/vec3.c b/libobs/graphics/vec3.c index 7e7fd4e14..6df99ce2e 100644 --- a/libobs/graphics/vec3.c +++ b/libobs/graphics/vec3.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/vec3.h b/libobs/graphics/vec3.h index 497897426..9879612cb 100644 --- a/libobs/graphics/vec3.h +++ b/libobs/graphics/vec3.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/vec4.c b/libobs/graphics/vec4.c index 30234058b..3ce998a28 100644 --- a/libobs/graphics/vec4.c +++ b/libobs/graphics/vec4.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/graphics/vec4.h b/libobs/graphics/vec4.h index d72a96714..9e84b2e32 100644 --- a/libobs/graphics/vec4.h +++ b/libobs/graphics/vec4.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/audio-io.c b/libobs/media-io/audio-io.c index 6786990e4..0d964a3b9 100644 --- a/libobs/media-io/audio-io.c +++ b/libobs/media-io/audio-io.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/audio-io.h b/libobs/media-io/audio-io.h index 77a1fad81..05b48ceb8 100644 --- a/libobs/media-io/audio-io.h +++ b/libobs/media-io/audio-io.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/audio-math.h b/libobs/media-io/audio-math.h index 8a23d898d..d4096316f 100644 --- a/libobs/media-io/audio-math.h +++ b/libobs/media-io/audio-math.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/audio-resampler-ffmpeg.c b/libobs/media-io/audio-resampler-ffmpeg.c index 855a57ad3..0b41a694b 100644 --- a/libobs/media-io/audio-resampler-ffmpeg.c +++ b/libobs/media-io/audio-resampler-ffmpeg.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/audio-resampler.h b/libobs/media-io/audio-resampler.h index 7cca54d65..376f98ad1 100644 --- a/libobs/media-io/audio-resampler.h +++ b/libobs/media-io/audio-resampler.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/format-conversion.c b/libobs/media-io/format-conversion.c index 9d1df0673..8f5091cee 100644 --- a/libobs/media-io/format-conversion.c +++ b/libobs/media-io/format-conversion.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/format-conversion.h b/libobs/media-io/format-conversion.h index edc52946c..fe3ba7dfb 100644 --- a/libobs/media-io/format-conversion.h +++ b/libobs/media-io/format-conversion.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/media-io-defs.h b/libobs/media-io/media-io-defs.h index 28c970f75..fcf90d31f 100644 --- a/libobs/media-io/media-io-defs.h +++ b/libobs/media-io/media-io-defs.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/media-remux.c b/libobs/media-io/media-remux.c index dd060a4f2..9bd353ad3 100644 --- a/libobs/media-io/media-remux.c +++ b/libobs/media-io/media-remux.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Ruwen Hahn + Copyright (C) 2023 by Ruwen Hahn This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/video-frame.c b/libobs/media-io/video-frame.c index 5615468ef..ebf51dafa 100644 --- a/libobs/media-io/video-frame.c +++ b/libobs/media-io/video-frame.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/video-frame.h b/libobs/media-io/video-frame.h index f0d021d7e..c73b2121d 100644 --- a/libobs/media-io/video-frame.h +++ b/libobs/media-io/video-frame.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/video-io.c b/libobs/media-io/video-io.c index afa0fe5c4..9189188c3 100644 --- a/libobs/media-io/video-io.c +++ b/libobs/media-io/video-io.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/video-io.h b/libobs/media-io/video-io.h index aef5cadad..21f723932 100644 --- a/libobs/media-io/video-io.h +++ b/libobs/media-io/video-io.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/video-scaler-ffmpeg.c b/libobs/media-io/video-scaler-ffmpeg.c index 102ca3d81..343b3d7e2 100644 --- a/libobs/media-io/video-scaler-ffmpeg.c +++ b/libobs/media-io/video-scaler-ffmpeg.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/media-io/video-scaler.h b/libobs/media-io/video-scaler.h index de56de176..9c4fa515b 100644 --- a/libobs/media-io/video-scaler.h +++ b/libobs/media-io/video-scaler.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-audio.c b/libobs/obs-audio.c index 4603441b7..c603ea651 100644 --- a/libobs/obs-audio.c +++ b/libobs/obs-audio.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-avc.c b/libobs/obs-avc.c index 950c29347..f95367a6c 100644 --- a/libobs/obs-avc.c +++ b/libobs/obs-avc.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-avc.h b/libobs/obs-avc.h index 256099c28..133f28685 100644 --- a/libobs/obs-avc.h +++ b/libobs/obs-avc.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-config.h b/libobs/obs-config.h index 9de519b1a..553fbf105 100644 --- a/libobs/obs-config.h +++ b/libobs/obs-config.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-data.c b/libobs/obs-data.c index 6d6d76f4b..7c9be118a 100644 --- a/libobs/obs-data.c +++ b/libobs/obs-data.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-data.h b/libobs/obs-data.h index 438acbcff..3b55fc0a1 100644 --- a/libobs/obs-data.h +++ b/libobs/obs-data.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-defs.h b/libobs/obs-defs.h index 141b03fa1..39b3b4d53 100644 --- a/libobs/obs-defs.h +++ b/libobs/obs-defs.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-display.c b/libobs/obs-display.c index accd7e30b..688e5f1dc 100644 --- a/libobs/obs-display.c +++ b/libobs/obs-display.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-encoder.c b/libobs/obs-encoder.c index 677b92f7d..cf5b5e70c 100644 --- a/libobs/obs-encoder.c +++ b/libobs/obs-encoder.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-encoder.h b/libobs/obs-encoder.h index 6e831af5c..828045f0f 100644 --- a/libobs/obs-encoder.h +++ b/libobs/obs-encoder.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-hevc.c b/libobs/obs-hevc.c index 37c4e0e48..2fd8d0ecb 100644 --- a/libobs/obs-hevc.c +++ b/libobs/obs-hevc.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2022 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-hevc.h b/libobs/obs-hevc.h index 91da1c35f..fd7404f22 100644 --- a/libobs/obs-hevc.h +++ b/libobs/obs-hevc.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2022 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-interaction.h b/libobs/obs-interaction.h index dd9d038ff..d0438ed92 100644 --- a/libobs/obs-interaction.h +++ b/libobs/obs-interaction.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-internal.h b/libobs/obs-internal.h index 1ea555c3a..46402a9f8 100644 --- a/libobs/obs-internal.h +++ b/libobs/obs-internal.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-module.c b/libobs/obs-module.c index cd7841b6c..aa0f51fcb 100644 --- a/libobs/obs-module.c +++ b/libobs/obs-module.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-module.h b/libobs/obs-module.h index 5f9980671..7b1776580 100644 --- a/libobs/obs-module.h +++ b/libobs/obs-module.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-nal.c b/libobs/obs-nal.c index add217be0..97dcacae4 100644 --- a/libobs/obs-nal.c +++ b/libobs/obs-nal.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2022 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-nal.h b/libobs/obs-nal.h index e9488c056..8ef4134b9 100644 --- a/libobs/obs-nal.h +++ b/libobs/obs-nal.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2022 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-nix-x11.c b/libobs/obs-nix-x11.c index 7ba79cb5b..924892e82 100644 --- a/libobs/obs-nix-x11.c +++ b/libobs/obs-nix-x11.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey Copyright (C) 2014 by Zachary Lund Copyright (C) 2019 by Jason Francis diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c index 36aac7097..b006a5598 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey Copyright (C) 2014 by Zachary Lund This program is free software: you can redistribute it and/or modify diff --git a/libobs/obs-output-delay.c b/libobs/obs-output-delay.c index e32532832..3b232f1f5 100644 --- a/libobs/obs-output-delay.c +++ b/libobs/obs-output-delay.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-output.c b/libobs/obs-output.c index 194fd94f1..62818ac1d 100644 --- a/libobs/obs-output.c +++ b/libobs/obs-output.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-output.h b/libobs/obs-output.h index 0469d39a1..56f6ba1e2 100644 --- a/libobs/obs-output.h +++ b/libobs/obs-output.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-properties.c b/libobs/obs-properties.c index ab683ed1d..9253630f1 100644 --- a/libobs/obs-properties.c +++ b/libobs/obs-properties.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-properties.h b/libobs/obs-properties.h index 511deffe1..d3fc69aa9 100644 --- a/libobs/obs-properties.h +++ b/libobs/obs-properties.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-scene.c b/libobs/obs-scene.c index 530c2f04a..66e06ee6f 100644 --- a/libobs/obs-scene.c +++ b/libobs/obs-scene.c @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (C) 2013-2015 by Hugh Bailey - Philippe Groarke + Copyright (C) 2023 by Lain Bailey + Philippe Groarke This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-scene.h b/libobs/obs-scene.h index 8af2dd7cf..386cff466 100644 --- a/libobs/obs-scene.h +++ b/libobs/obs-scene.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-service.c b/libobs/obs-service.c index 8ade7cb92..f4d358bf6 100644 --- a/libobs/obs-service.c +++ b/libobs/obs-service.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-service.h b/libobs/obs-service.h index 7f74fc1da..709f1c2c5 100644 --- a/libobs/obs-service.h +++ b/libobs/obs-service.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-source-deinterlace.c b/libobs/obs-source-deinterlace.c index 05f756353..60ee5dec8 100644 --- a/libobs/obs-source-deinterlace.c +++ b/libobs/obs-source-deinterlace.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2016 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-source-transition.c b/libobs/obs-source-transition.c index 9c50f4a99..d18b3c355 100644 --- a/libobs/obs-source-transition.c +++ b/libobs/obs-source-transition.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-source.c b/libobs/obs-source.c index 230ab1345..68a6dbf5b 100644 --- a/libobs/obs-source.c +++ b/libobs/obs-source.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-source.h b/libobs/obs-source.h index 0edbf0bf6..a2ee03c96 100644 --- a/libobs/obs-source.h +++ b/libobs/obs-source.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -505,7 +505,7 @@ struct obs_source_info { /** * Gets the default settings for this source - * + * * If get_defaults is also defined both will be called, and the first * call will be to get_defaults, then to get_defaults2. * diff --git a/libobs/obs-ui.h b/libobs/obs-ui.h index db05fb3c3..b152e9636 100644 --- a/libobs/obs-ui.h +++ b/libobs/obs-ui.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-video-gpu-encode.c b/libobs/obs-video-gpu-encode.c index 0dfb11df0..85687e006 100644 --- a/libobs/obs-video-gpu-encode.c +++ b/libobs/obs-video-gpu-encode.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2018 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-video.c b/libobs/obs-video.c index 60acaaf6f..282f2a5d5 100644 --- a/libobs/obs-video.c +++ b/libobs/obs-video.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-view.c b/libobs/obs-view.c index 820941a36..a2973c893 100644 --- a/libobs/obs-view.c +++ b/libobs/obs-view.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-win-crash-handler.c b/libobs/obs-win-crash-handler.c index 0310896e0..57172c830 100644 --- a/libobs/obs-win-crash-handler.c +++ b/libobs/obs-win-crash-handler.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs-windows.c b/libobs/obs-windows.c index 4d16b011c..f6329be0d 100644 --- a/libobs/obs-windows.c +++ b/libobs/obs-windows.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs.c b/libobs/obs.c index 1850ecc75..14ea82b66 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/obs.h b/libobs/obs.h index 3e31a59fa..bb86da74c 100644 --- a/libobs/obs.h +++ b/libobs/obs.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013-2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1811,7 +1811,7 @@ EXPORT obs_scene_t *obs_sceneitem_get_scene(const obs_sceneitem_t *item); EXPORT obs_source_t *obs_sceneitem_get_source(const obs_sceneitem_t *item); /* FIXME: The following functions should be deprecated and replaced with a way - * to specify saveable private user data. -Jim */ + * to specify saveable private user data. -Lain */ EXPORT void obs_sceneitem_select(obs_sceneitem_t *item, bool select); EXPORT bool obs_sceneitem_selected(const obs_sceneitem_t *item); EXPORT bool obs_sceneitem_locked(const obs_sceneitem_t *item); diff --git a/libobs/obs.hpp b/libobs/obs.hpp index 01c81698b..c357f2152 100644 --- a/libobs/obs.hpp +++ b/libobs/obs.hpp @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2013 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libobs/util/AlignedNew.hpp b/libobs/util/AlignedNew.hpp index 3fb16f15f..04261a548 100644 --- a/libobs/util/AlignedNew.hpp +++ b/libobs/util/AlignedNew.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/array-serializer.c b/libobs/util/array-serializer.c index 05cbf1d6f..6e8a36842 100644 --- a/libobs/util/array-serializer.c +++ b/libobs/util/array-serializer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/array-serializer.h b/libobs/util/array-serializer.h index b3143d3ec..9a5f73299 100644 --- a/libobs/util/array-serializer.h +++ b/libobs/util/array-serializer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/base.c b/libobs/util/base.c index 7f7cc6af3..831ad47cd 100644 --- a/libobs/util/base.c +++ b/libobs/util/base.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/base.h b/libobs/util/base.h index b6436045e..6b0df4c08 100644 --- a/libobs/util/base.h +++ b/libobs/util/base.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/bmem.c b/libobs/util/bmem.c index 814c9da94..3f941ed01 100644 --- a/libobs/util/bmem.c +++ b/libobs/util/bmem.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/bmem.h b/libobs/util/bmem.h index c01afd92b..046dba940 100644 --- a/libobs/util/bmem.h +++ b/libobs/util/bmem.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/c99defs.h b/libobs/util/c99defs.h index a05a1cdfc..a236b3d2c 100644 --- a/libobs/util/c99defs.h +++ b/libobs/util/c99defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/cf-lexer.c b/libobs/util/cf-lexer.c index 726c12c1d..19d558bb0 100644 --- a/libobs/util/cf-lexer.c +++ b/libobs/util/cf-lexer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/cf-lexer.h b/libobs/util/cf-lexer.h index 844d39a8b..9da60e349 100644 --- a/libobs/util/cf-lexer.h +++ b/libobs/util/cf-lexer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -156,7 +156,7 @@ static inline void cf_def_free(struct cf_def *cfd) * Still left to implement (TODO): * + #if/#elif * + "defined" preprocessor keyword - * + system includes + * + system includes * + variadic macros * + custom callbacks (for things like pragma) * + option to exclude features such as #import, variadic macros, and other diff --git a/libobs/util/cf-parser.c b/libobs/util/cf-parser.c index c17b608fb..944b4a48e 100644 --- a/libobs/util/cf-parser.c +++ b/libobs/util/cf-parser.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/cf-parser.h b/libobs/util/cf-parser.h index a90976de0..9f5d63600 100644 --- a/libobs/util/cf-parser.h +++ b/libobs/util/cf-parser.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/circlebuf.h b/libobs/util/circlebuf.h index 60ec9b4f6..2630f5955 100644 --- a/libobs/util/circlebuf.h +++ b/libobs/util/circlebuf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/config-file.c b/libobs/util/config-file.c index 8a844147a..ac9bfe1cb 100644 --- a/libobs/util/config-file.c +++ b/libobs/util/config-file.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/config-file.h b/libobs/util/config-file.h index ff8bfc4a2..b9505354f 100644 --- a/libobs/util/config-file.h +++ b/libobs/util/config-file.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/crc32.c b/libobs/util/crc32.c index 61eb99aed..4a5565f9b 100644 --- a/libobs/util/crc32.c +++ b/libobs/util/crc32.c @@ -1,6 +1,6 @@ /* * Copyright (c) 1986 Gary S. Brown - * 2015 Hugh Bailey + * 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/crc32.h b/libobs/util/crc32.h index 8e8801ac9..620c49dc3 100644 --- a/libobs/util/crc32.h +++ b/libobs/util/crc32.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/curl/curl-helper.h b/libobs/util/curl/curl-helper.h index 5f71a16d3..04abb4f0c 100644 --- a/libobs/util/curl/curl-helper.h +++ b/libobs/util/curl/curl-helper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/darray.h b/libobs/util/darray.h index 2b308eb22..717bfb4a7 100644 --- a/libobs/util/darray.h +++ b/libobs/util/darray.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/dstr.c b/libobs/util/dstr.c index c7890039a..1f4645362 100644 --- a/libobs/util/dstr.c +++ b/libobs/util/dstr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/dstr.h b/libobs/util/dstr.h index e03e86de3..0ff70754d 100644 --- a/libobs/util/dstr.h +++ b/libobs/util/dstr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/dstr.hpp b/libobs/util/dstr.hpp index df277495a..f1bfc7bfc 100644 --- a/libobs/util/dstr.hpp +++ b/libobs/util/dstr.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/file-serializer.c b/libobs/util/file-serializer.c index 346842487..f9ba2b004 100644 --- a/libobs/util/file-serializer.c +++ b/libobs/util/file-serializer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/file-serializer.h b/libobs/util/file-serializer.h index 17dcbaefe..07ade858a 100644 --- a/libobs/util/file-serializer.h +++ b/libobs/util/file-serializer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/lexer.c b/libobs/util/lexer.c index e98af1967..98fefa878 100644 --- a/libobs/util/lexer.c +++ b/libobs/util/lexer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/lexer.h b/libobs/util/lexer.h index 986b1b22b..ad65174f2 100644 --- a/libobs/util/lexer.h +++ b/libobs/util/lexer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -117,7 +117,7 @@ static inline int newline_size(const char *array) /* ------------------------------------------------------------------------- */ -/* +/* * A "base" token is one of four things: * 1.) A sequence of alpha characters * 2.) A sequence of numeric characters diff --git a/libobs/util/pipe-posix.c b/libobs/util/pipe-posix.c index 09bd6f623..d1bc1249d 100644 --- a/libobs/util/pipe-posix.c +++ b/libobs/util/pipe-posix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/pipe-windows.c b/libobs/util/pipe-windows.c index 18c177911..fe32dbdc2 100644 --- a/libobs/util/pipe-windows.c +++ b/libobs/util/pipe-windows.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/pipe.h b/libobs/util/pipe.h index 2e8480511..23353b8be 100644 --- a/libobs/util/pipe.h +++ b/libobs/util/pipe.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/platform-cocoa.m b/libobs/util/platform-cocoa.m index fa3aaeab1..678fc010b 100644 --- a/libobs/util/platform-cocoa.m +++ b/libobs/util/platform-cocoa.m @@ -1,7 +1,7 @@ /* - * Copyright (c) 2013-2018 Ruwen Hahn - * Hugh "Jim" Bailey - * Marvin Scholz + * Copyright (c) 2023 Ruwen Hahn + * Lain Bailey + * Marvin Scholz * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/platform-nix-dbus.c b/libobs/util/platform-nix-dbus.c index 8773d70e4..e137c5b99 100644 --- a/libobs/util/platform-nix-dbus.c +++ b/libobs/util/platform-nix-dbus.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/platform-nix-portal.c b/libobs/util/platform-nix-portal.c index e084beb74..2f0206fec 100644 --- a/libobs/util/platform-nix-portal.c +++ b/libobs/util/platform-nix-portal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * 2021 Georges Basile Stavracas Neto * * Permission to use, copy, modify, and distribute this software for any diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c index 7ee85a35d..59a3e4bfd 100644 --- a/libobs/util/platform-nix.c +++ b/libobs/util/platform-nix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/platform-windows.c b/libobs/util/platform-windows.c index bb1785c4c..3a6706c36 100644 --- a/libobs/util/platform-windows.c +++ b/libobs/util/platform-windows.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/platform.c b/libobs/util/platform.c index c80c80275..af2e80840 100644 --- a/libobs/util/platform.c +++ b/libobs/util/platform.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/platform.h b/libobs/util/platform.h index fbf4687bd..a3a2b74c4 100644 --- a/libobs/util/platform.h +++ b/libobs/util/platform.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/serializer.h b/libobs/util/serializer.h index c9c73781a..336806ba7 100644 --- a/libobs/util/serializer.h +++ b/libobs/util/serializer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/text-lookup.c b/libobs/util/text-lookup.c index 7a74fb928..7206b039b 100644 --- a/libobs/util/text-lookup.c +++ b/libobs/util/text-lookup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/text-lookup.h b/libobs/util/text-lookup.h index 4042f75c6..118b9fa86 100644 --- a/libobs/util/text-lookup.h +++ b/libobs/util/text-lookup.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/threading-posix.c b/libobs/util/threading-posix.c index 57bf2388c..6d7c40ee7 100644 --- a/libobs/util/threading-posix.c +++ b/libobs/util/threading-posix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/threading-posix.h b/libobs/util/threading-posix.h index 33149032a..7ac14e510 100644 --- a/libobs/util/threading-posix.h +++ b/libobs/util/threading-posix.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/threading-windows.c b/libobs/util/threading-windows.c index 8c50b4adb..3d690bb69 100644 --- a/libobs/util/threading-windows.c +++ b/libobs/util/threading-windows.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/threading-windows.h b/libobs/util/threading-windows.h index ce083d4af..4dfb46a9f 100644 --- a/libobs/util/threading-windows.h +++ b/libobs/util/threading-windows.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/threading.h b/libobs/util/threading.h index f3c987237..8ee35bc56 100644 --- a/libobs/util/threading.h +++ b/libobs/util/threading.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/util.hpp b/libobs/util/util.hpp index 066aefdad..a55ea3f9c 100644 --- a/libobs/util/util.hpp +++ b/libobs/util/util.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/util_uint128.h b/libobs/util/util_uint128.h index ac96f3ee0..5f6d2d302 100644 --- a/libobs/util/util_uint128.h +++ b/libobs/util/util_uint128.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/windows/CoTaskMemPtr.hpp b/libobs/util/windows/CoTaskMemPtr.hpp index 97206b315..91c92eed2 100644 --- a/libobs/util/windows/CoTaskMemPtr.hpp +++ b/libobs/util/windows/CoTaskMemPtr.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/windows/ComPtr.hpp b/libobs/util/windows/ComPtr.hpp index 15c48bc15..297f0c3ac 100644 --- a/libobs/util/windows/ComPtr.hpp +++ b/libobs/util/windows/ComPtr.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/windows/HRError.hpp b/libobs/util/windows/HRError.hpp index 444499de5..0f343799a 100644 --- a/libobs/util/windows/HRError.hpp +++ b/libobs/util/windows/HRError.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/windows/WinHandle.hpp b/libobs/util/windows/WinHandle.hpp index 6b670f532..c21cfb6bc 100644 --- a/libobs/util/windows/WinHandle.hpp +++ b/libobs/util/windows/WinHandle.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/libobs/util/windows/win-registry.h b/libobs/util/windows/win-registry.h index 7248ec96a..d58eb83c5 100644 --- a/libobs/util/windows/win-registry.h +++ b/libobs/util/windows/win-registry.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * Copyright (c) 2017 Ryan Foster * * Permission to use, copy, modify, and distribute this software for any diff --git a/libobs/util/windows/win-version.h b/libobs/util/windows/win-version.h index 3f99e8b18..a0cae80a0 100644 --- a/libobs/util/windows/win-version.h +++ b/libobs/util/windows/win-version.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/plugins/aja/cmake/macos/Info.plist.in b/plugins/aja/cmake/macos/Info.plist.in index 40483850f..7fb6314a2 100644 --- a/plugins/aja/cmake/macos/Info.plist.in +++ b/plugins/aja/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/coreaudio-encoder/cmake/macos/Info.plist.in b/plugins/coreaudio-encoder/cmake/macos/Info.plist.in index bfbbcf31e..2017f51e4 100644 --- a/plugins/coreaudio-encoder/cmake/macos/Info.plist.in +++ b/plugins/coreaudio-encoder/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/decklink/cmake/macos/Info.plist.in b/plugins/decklink/cmake/macos/Info.plist.in index 6ad684bdf..82d99f5c5 100644 --- a/plugins/decklink/cmake/macos/Info.plist.in +++ b/plugins/decklink/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/image-source/cmake/macos/Info.plist.in b/plugins/image-source/cmake/macos/Info.plist.in index 8c9f2474d..4e97f0de5 100644 --- a/plugins/image-source/cmake/macos/Info.plist.in +++ b/plugins/image-source/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/mac-avcapture/cmake/macos/Info.plist.in b/plugins/mac-avcapture/cmake/macos/Info.plist.in index a67e7d6aa..e6f9e6e10 100644 --- a/plugins/mac-avcapture/cmake/macos/Info.plist.in +++ b/plugins/mac-avcapture/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/mac-capture/cmake/macos/Info.plist.in b/plugins/mac-capture/cmake/macos/Info.plist.in index 79a87cb77..8ae63aa11 100644 --- a/plugins/mac-capture/cmake/macos/Info.plist.in +++ b/plugins/mac-capture/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/mac-syphon/cmake/macos/Info.plist.in b/plugins/mac-syphon/cmake/macos/Info.plist.in index e5be1da2f..4c6bee1ed 100644 --- a/plugins/mac-syphon/cmake/macos/Info.plist.in +++ b/plugins/mac-syphon/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/mac-videotoolbox/cmake/macos/Info.plist.in b/plugins/mac-videotoolbox/cmake/macos/Info.plist.in index f317311a8..1bb5af4e6 100644 --- a/plugins/mac-videotoolbox/cmake/macos/Info.plist.in +++ b/plugins/mac-videotoolbox/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/mac-virtualcam/src/dal-plugin/cmake/macos/Info.plist.in b/plugins/mac-virtualcam/src/dal-plugin/cmake/macos/Info.plist.in index 181549079..d611d692a 100644 --- a/plugins/mac-virtualcam/src/dal-plugin/cmake/macos/Info.plist.in +++ b/plugins/mac-virtualcam/src/dal-plugin/cmake/macos/Info.plist.in @@ -23,7 +23,7 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey CFPlugInFactories 7E950B8C-5E49-4B9E-B7D0-B3608A08E8F6 diff --git a/plugins/obs-browser b/plugins/obs-browser index 594115a27..995ad53cf 160000 --- a/plugins/obs-browser +++ b/plugins/obs-browser @@ -1 +1 @@ -Subproject commit 594115a27d40f0916e55db97cb61f7c7130cbe28 +Subproject commit 995ad53cf3b774928a690d9de813fc8cb43175fe diff --git a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt index 3636a367c..92420436b 100644 --- a/plugins/obs-ffmpeg/CMakeLists.txt +++ b/plugins/obs-ffmpeg/CMakeLists.txt @@ -95,10 +95,10 @@ if(OS_WINDOWS) obs-ffmpeg PRIVATE texture-amf.cpp texture-amf-opts.hpp - jim-nvenc.c - jim-nvenc.h - jim-nvenc-helpers.c - jim-nvenc-ver.h + obs-nvenc.c + obs-nvenc.h + obs-nvenc-helpers.c + obs-nvenc-ver.h obs-ffmpeg.rc) elseif(OS_LINUX OR OS_FREEBSD) find_package(Libva REQUIRED) diff --git a/plugins/obs-ffmpeg/cmake/legacy.cmake b/plugins/obs-ffmpeg/cmake/legacy.cmake index 66c78edc3..4cc75b341 100644 --- a/plugins/obs-ffmpeg/cmake/legacy.cmake +++ b/plugins/obs-ffmpeg/cmake/legacy.cmake @@ -100,10 +100,10 @@ if(OS_WINDOWS) obs-ffmpeg PRIVATE texture-amf.cpp texture-amf-opts.hpp - jim-nvenc.c - jim-nvenc.h - jim-nvenc-helpers.c - jim-nvenc-ver.h + obs-nvenc.c + obs-nvenc.h + obs-nvenc-helpers.c + obs-nvenc-ver.h obs-ffmpeg.rc) elseif(OS_POSIX AND NOT OS_MACOS) diff --git a/plugins/obs-ffmpeg/cmake/macos/Info.plist.in b/plugins/obs-ffmpeg/cmake/macos/Info.plist.in index 068ccaf07..51f1ee46b 100644 --- a/plugins/obs-ffmpeg/cmake/macos/Info.plist.in +++ b/plugins/obs-ffmpeg/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c index a3c4f925c..168001aa8 100644 --- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.h b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.h index b6b472fb7..12b901475 100644 --- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.h +++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Hugh Bailey + * Copyright (c) 2023 Lain Bailey * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c index 0d1edd54c..603c71afd 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-av1.c b/plugins/obs-ffmpeg/obs-ffmpeg-av1.c index 0b671ae5c..11c7d90ab 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-av1.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-av1.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2022 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c index a59f04cca..f7a899f1d 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c index 554c15576..92912a7f3 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2015 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c index b2d4cffa7..592dd5645 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2016 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c index 41d72dd39..7c587fdd6 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c index 134efb5ec..5829fb246 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2016 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c index da0b2c2b4..c62d0d65f 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg.c @@ -9,7 +9,7 @@ #include #include -#include "jim-nvenc.h" +#include "obs-nvenc.h" #endif #if !defined(_WIN32) && !defined(__APPLE__) && \ @@ -358,8 +358,8 @@ static bool hevc_vaapi_supported(void) #endif #ifdef _WIN32 -extern void jim_nvenc_load(bool h264, bool hevc, bool av1); -extern void jim_nvenc_unload(void); +extern void obs_nvenc_load(bool h264, bool hevc, bool av1); +extern void obs_nvenc_unload(void); extern void amf_load(void); extern void amf_unload(void); #endif @@ -409,7 +409,7 @@ bool obs_module_load(void) #ifdef _WIN32 if (get_win_ver_int() > 0x0601) { - jim_nvenc_load(h264, hevc, av1); + obs_nvenc_load(h264, hevc, av1); } else { // if on Win 7, new nvenc isn't available so there's // no nvenc encoder for the user to select, expose @@ -477,6 +477,6 @@ void obs_module_unload(void) #ifdef _WIN32 amf_unload(); - jim_nvenc_unload(); + obs_nvenc_unload(); #endif } diff --git a/plugins/obs-ffmpeg/jim-nvenc-helpers.c b/plugins/obs-ffmpeg/obs-nvenc-helpers.c similarity index 97% rename from plugins/obs-ffmpeg/jim-nvenc-helpers.c rename to plugins/obs-ffmpeg/obs-nvenc-helpers.c index 44fa487c8..1641e2b53 100644 --- a/plugins/obs-ffmpeg/jim-nvenc-helpers.c +++ b/plugins/obs-ffmpeg/obs-nvenc-helpers.c @@ -1,4 +1,4 @@ -#include "jim-nvenc.h" +#include "obs-nvenc.h" #include #include #include @@ -11,7 +11,7 @@ static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER; NV_ENCODE_API_FUNCTION_LIST nv = {NV_ENCODE_API_FUNCTION_LIST_VER}; NV_CREATE_INSTANCE_FUNC nv_create_instance = NULL; -#define error(format, ...) blog(LOG_ERROR, "[jim-nvenc] " format, ##__VA_ARGS__) +#define error(format, ...) blog(LOG_ERROR, "[obs-nvenc] " format, ##__VA_ARGS__) bool nv_fail2(obs_encoder_t *encoder, void *session, const char *format, ...) { @@ -316,7 +316,7 @@ fail: return av1_supported; } -void jim_nvenc_load(bool h264, bool hevc, bool av1) +void obs_nvenc_load(bool h264, bool hevc, bool av1) { pthread_mutex_init(&init_mutex, NULL); if (h264) @@ -331,7 +331,7 @@ void jim_nvenc_load(bool h264, bool hevc, bool av1) blog(LOG_WARNING, "[NVENC] AV1 is not supported"); } -void jim_nvenc_unload(void) +void obs_nvenc_unload(void) { pthread_mutex_destroy(&init_mutex); } diff --git a/plugins/obs-ffmpeg/obs-nvenc-test/CMakeLists.txt b/plugins/obs-ffmpeg/obs-nvenc-test/CMakeLists.txt index 709a97d1b..9bffa73e7 100644 --- a/plugins/obs-ffmpeg/obs-nvenc-test/CMakeLists.txt +++ b/plugins/obs-ffmpeg/obs-nvenc-test/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable(obs-nvenc-test) find_package(FFnvcodec 12 REQUIRED) -target_sources(obs-nvenc-test PRIVATE jim-nvenc-test.c ../jim-nvenc-ver.h) +target_sources(obs-nvenc-test PRIVATE obs-nvenc-test.c ../obs-nvenc-ver.h) target_link_libraries(obs-nvenc-test d3d11 dxgi dxguid FFnvcodec::FFnvcodec) set_target_properties(obs-nvenc-test PROPERTIES FOLDER "plugins/obs-ffmpeg") diff --git a/plugins/obs-ffmpeg/obs-nvenc-test/jim-nvenc-test.c b/plugins/obs-ffmpeg/obs-nvenc-test/obs-nvenc-test.c similarity index 99% rename from plugins/obs-ffmpeg/obs-nvenc-test/jim-nvenc-test.c rename to plugins/obs-ffmpeg/obs-nvenc-test/obs-nvenc-test.c index 8d63acc1f..ccc5ecd99 100644 --- a/plugins/obs-ffmpeg/obs-nvenc-test/jim-nvenc-test.c +++ b/plugins/obs-ffmpeg/obs-nvenc-test/obs-nvenc-test.c @@ -3,7 +3,7 @@ #include #include -#include "../jim-nvenc-ver.h" +#include "../obs-nvenc-ver.h" #include #include diff --git a/plugins/obs-ffmpeg/jim-nvenc-ver.h b/plugins/obs-ffmpeg/obs-nvenc-ver.h similarity index 100% rename from plugins/obs-ffmpeg/jim-nvenc-ver.h rename to plugins/obs-ffmpeg/obs-nvenc-ver.h diff --git a/plugins/obs-ffmpeg/jim-nvenc.c b/plugins/obs-ffmpeg/obs-nvenc.c similarity index 98% rename from plugins/obs-ffmpeg/jim-nvenc.c rename to plugins/obs-ffmpeg/obs-nvenc.c index ff67ab7e7..f06f9e0b6 100644 --- a/plugins/obs-ffmpeg/jim-nvenc.c +++ b/plugins/obs-ffmpeg/obs-nvenc.c @@ -1,4 +1,4 @@ -#include "jim-nvenc.h" +#include "obs-nvenc.h" #include #include #include @@ -41,7 +41,7 @@ #define EXTRA_BUFFERS 5 #define do_log(level, format, ...) \ - blog(level, "[jim-nvenc: '%s'] " format, \ + blog(level, "[obs-nvenc: '%s'] " format, \ obs_encoder_get_name(enc->encoder), ##__VA_ARGS__) #define error(format, ...) do_log(LOG_ERROR, format, ##__VA_ARGS__) @@ -879,7 +879,7 @@ static bool init_encoder_hevc(struct nvenc_data *enc, obs_data_t *settings, if (astrcmpi(profile, "main10") == 0) { config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN10_GUID; } else if (obs_p010_tex_active()) { - blog(LOG_WARNING, "[jim-nvenc] Forcing main10 for P010"); + blog(LOG_WARNING, "[obs-nvenc] Forcing main10 for P010"); config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN10_GUID; } else { config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID; @@ -1048,14 +1048,14 @@ static bool init_encoder(struct nvenc_data *enc, enum codec_type codec, if (bf > bf_max) { blog(LOG_WARNING, - "[jim-nvenc] Max B-frames setting (%d) is more than encoder supports (%d).\n" + "[obs-nvenc] Max B-frames setting (%d) is more than encoder supports (%d).\n" "Setting B-frames to %d", bf, bf_max, bf_max); bf = bf_max; } if (!init_specific_encoder(enc, settings, bf, false)) { - blog(LOG_WARNING, "[jim-nvenc] init_specific_encoder failed, " + blog(LOG_WARNING, "[obs-nvenc] init_specific_encoder failed, " "trying again with compatibility options"); nv.nvEncDestroyEncoder(enc->session); @@ -1135,19 +1135,19 @@ static void *nvenc_create_base(enum codec_type codec, obs_data_t *settings, const int gpu = (int)obs_data_get_int(settings, "gpu"); if (gpu != 0) { blog(LOG_INFO, - "[jim-nvenc] different GPU selected by user, falling back to ffmpeg"); + "[obs-nvenc] different GPU selected by user, falling back to ffmpeg"); goto reroute; } if (obs_encoder_scaling_enabled(encoder)) { blog(LOG_INFO, - "[jim-nvenc] scaling enabled, falling back to ffmpeg"); + "[obs-nvenc] scaling enabled, falling back to ffmpeg"); goto reroute; } if (!obs_p010_tex_active() && !obs_nv12_tex_active()) { blog(LOG_INFO, - "[jim-nvenc] nv12/p010 not active, falling back to ffmpeg"); + "[obs-nvenc] nv12/p010 not active, falling back to ffmpeg"); goto reroute; } diff --git a/plugins/obs-ffmpeg/jim-nvenc.h b/plugins/obs-ffmpeg/obs-nvenc.h similarity index 96% rename from plugins/obs-ffmpeg/jim-nvenc.h rename to plugins/obs-ffmpeg/obs-nvenc.h index 6bb9ad62c..5dca72f0c 100644 --- a/plugins/obs-ffmpeg/jim-nvenc.h +++ b/plugins/obs-ffmpeg/obs-nvenc.h @@ -5,7 +5,7 @@ #include #include -#include "jim-nvenc-ver.h" +#include "obs-nvenc-ver.h" typedef NVENCSTATUS(NVENCAPI *NV_CREATE_INSTANCE_FUNC)( NV_ENCODE_API_FUNCTION_LIST *); diff --git a/plugins/obs-filters/cmake/macos/Info.plist.in b/plugins/obs-filters/cmake/macos/Info.plist.in index 550fafc13..1d7360e30 100644 --- a/plugins/obs-filters/cmake/macos/Info.plist.in +++ b/plugins/obs-filters/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/obs-filters/color-correction-filter.c b/plugins/obs-filters/color-correction-filter.c index 00e6814e2..fdfb4c052 100644 --- a/plugins/obs-filters/color-correction-filter.c +++ b/plugins/obs-filters/color-correction-filter.c @@ -416,7 +416,7 @@ static void color_correction_filter_update_v2(void *data, obs_data_t *settings) /* * Since this is C we have to be careful when destroying/removing items from - * OBS. Jim has added several useful functions to help keep memory leaks to + * OBS. Lain has added several useful functions to help keep memory leaks to * a minimum, and handle the destruction and construction of these filters. */ static void color_correction_filter_destroy_v1(void *data) diff --git a/plugins/obs-outputs/cmake/macos/Info.plist.in b/plugins/obs-outputs/cmake/macos/Info.plist.in index 5294581f9..2831c460c 100644 --- a/plugins/obs-outputs/cmake/macos/Info.plist.in +++ b/plugins/obs-outputs/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/obs-outputs/flv-mux.c b/plugins/obs-outputs/flv-mux.c index 0989366f0..3d29934fb 100644 --- a/plugins/obs-outputs/flv-mux.c +++ b/plugins/obs-outputs/flv-mux.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/flv-mux.h b/plugins/obs-outputs/flv-mux.h index 705afb273..df4fe629e 100644 --- a/plugins/obs-outputs/flv-mux.h +++ b/plugins/obs-outputs/flv-mux.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/flv-output.c b/plugins/obs-outputs/flv-output.c index d7863ba43..3d5d3c10e 100644 --- a/plugins/obs-outputs/flv-output.c +++ b/plugins/obs-outputs/flv-output.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/null-output.c b/plugins/obs-outputs/null-output.c index f9606d1af..c8997b3c3 100644 --- a/plugins/obs-outputs/null-output.c +++ b/plugins/obs-outputs/null-output.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2017 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/rtmp-av1.c b/plugins/obs-outputs/rtmp-av1.c index e4a2ee0c7..a4dc77b15 100644 --- a/plugins/obs-outputs/rtmp-av1.c +++ b/plugins/obs-outputs/rtmp-av1.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2023 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/rtmp-av1.h b/plugins/obs-outputs/rtmp-av1.h index 20309b525..76fb7bcbe 100644 --- a/plugins/obs-outputs/rtmp-av1.h +++ b/plugins/obs-outputs/rtmp-av1.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2023 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/rtmp-helpers.h b/plugins/obs-outputs/rtmp-helpers.h index adb3e8cb9..1228f2090 100644 --- a/plugins/obs-outputs/rtmp-helpers.h +++ b/plugins/obs-outputs/rtmp-helpers.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/rtmp-hevc.c b/plugins/obs-outputs/rtmp-hevc.c index c02a8e552..78315e1bc 100644 --- a/plugins/obs-outputs/rtmp-hevc.c +++ b/plugins/obs-outputs/rtmp-hevc.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2023 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/rtmp-hevc.h b/plugins/obs-outputs/rtmp-hevc.h index d479b479e..d13432dbb 100644 --- a/plugins/obs-outputs/rtmp-hevc.h +++ b/plugins/obs-outputs/rtmp-hevc.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2023 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-outputs/rtmp-stream.c b/plugins/obs-outputs/rtmp-stream.c index 899881765..4d7479f61 100644 --- a/plugins/obs-outputs/rtmp-stream.c +++ b/plugins/obs-outputs/rtmp-stream.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/obs-qsv11/common_directx11.cpp b/plugins/obs-qsv11/common_directx11.cpp index 046583e75..bd8cd605f 100644 --- a/plugins/obs-qsv11/common_directx11.cpp +++ b/plugins/obs-qsv11/common_directx11.cpp @@ -136,7 +136,7 @@ CComPtr GetHWDeviceContext() return g_pD3D11Ctx; } -/* (Hugh) Functions currently unused */ +/* (Lain) Functions currently unused */ #if 0 void ClearYUVSurfaceD3D(mfxMemId memId) { diff --git a/plugins/obs-qsv11/common_utils_windows.cpp b/plugins/obs-qsv11/common_utils_windows.cpp index 2a383877d..6f4c0cdd5 100644 --- a/plugins/obs-qsv11/common_utils_windows.cpp +++ b/plugins/obs-qsv11/common_utils_windows.cpp @@ -17,8 +17,8 @@ mfxStatus Initialize(mfxIMPL impl, mfxVersion ver, MFXVideoSession *pSession, mfxFrameAllocator *pmfxAllocator, mfxHDL *deviceHandle, bool bCreateSharedHandles, bool dx9hack) { - bCreateSharedHandles; // (Hugh) Currently unused - pmfxAllocator; // (Hugh) Currently unused + bCreateSharedHandles; // (Lain) Currently unused + pmfxAllocator; // (Lain) Currently unused mfxStatus sts = MFX_ERR_NONE; @@ -118,7 +118,7 @@ double TimeDiffMsec(mfxTime tfinish, mfxTime tstart) freq; } -/* (Hugh) Functions currently unused */ +/* (Lain) Functions currently unused */ #if 0 void ClearYUVSurfaceVMem(mfxMemId memId) { diff --git a/plugins/obs-transitions/cmake/macos/Info.plist.in b/plugins/obs-transitions/cmake/macos/Info.plist.in index 543fca2be..85d3bdfaa 100644 --- a/plugins/obs-transitions/cmake/macos/Info.plist.in +++ b/plugins/obs-transitions/cmake/macos/Info.plist.in @@ -35,7 +35,7 @@ NSMicrophoneUsageDescription OBS needs to access the microphone to enable audio input. NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey SUFeedURL ${OBS_SPARKLE_FEED_URL} SUPublicDSAKeyFile diff --git a/plugins/obs-vst/cmake/macos/Info.plist.in b/plugins/obs-vst/cmake/macos/Info.plist.in index 66bb94ef9..8007af9bb 100644 --- a/plugins/obs-vst/cmake/macos/Info.plist.in +++ b/plugins/obs-vst/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/obs-x264/cmake/macos/Info.plist.in b/plugins/obs-x264/cmake/macos/Info.plist.in index ec7320973..cb6b73a51 100644 --- a/plugins/obs-x264/cmake/macos/Info.plist.in +++ b/plugins/obs-x264/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/obs-x264/obs-x264.c b/plugins/obs-x264/obs-x264.c index 4a8910659..5ae1e8dec 100644 --- a/plugins/obs-x264/obs-x264.c +++ b/plugins/obs-x264/obs-x264.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/rtmp-services/cmake/macos/Info.plist.in b/plugins/rtmp-services/cmake/macos/Info.plist.in index 1eab50939..3ff6ba9fc 100644 --- a/plugins/rtmp-services/cmake/macos/Info.plist.in +++ b/plugins/rtmp-services/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/text-freetype2/cmake/macos/Info.plist.in b/plugins/text-freetype2/cmake/macos/Info.plist.in index 75942aecc..57658ce6e 100644 --- a/plugins/text-freetype2/cmake/macos/Info.plist.in +++ b/plugins/text-freetype2/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/vlc-video/cmake/macos/Info.plist.in b/plugins/vlc-video/cmake/macos/Info.plist.in index 4d37677e1..34decdbb4 100644 --- a/plugins/vlc-video/cmake/macos/Info.plist.in +++ b/plugins/vlc-video/cmake/macos/Info.plist.in @@ -23,6 +23,6 @@ LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - (c) 2012-${CURRENT_YEAR} Hugh Bailey + (c) 2012-${CURRENT_YEAR} Lain Bailey diff --git a/plugins/win-capture/graphics-hook-ver.h b/plugins/win-capture/graphics-hook-ver.h index 92aaf5a73..d0663996b 100644 --- a/plugins/win-capture/graphics-hook-ver.h +++ b/plugins/win-capture/graphics-hook-ver.h @@ -1,5 +1,5 @@ -/* DO NOT MODIFY THIS FILE WITHOUT CONSULTING JIM. OTHERWISE, JIM WILL DO - * EVERYTHING IN HIS POWER TO MAKE YOUR LIFE MISERABLE FROM THEREON OUT WITH A +/* DO NOT MODIFY THIS FILE WITHOUT CONSULTING LAIN. OTHERWISE, LAIN WILL DO + * EVERYTHING IN HER POWER TO MAKE YOUR LIFE MISERABLE FROM THEREON OUT WITH A * LEVEL OF DETERMINATION UNLIKE ANYTHING ANYONE HAS EVER SEEN IN THE HISTORY * OF MANKIND. * diff --git a/plugins/win-capture/graphics-hook/gl-capture.c b/plugins/win-capture/graphics-hook/gl-capture.c index 657fc32a3..c30ac0679 100644 --- a/plugins/win-capture/graphics-hook/gl-capture.c +++ b/plugins/win-capture/graphics-hook/gl-capture.c @@ -96,10 +96,10 @@ static void gl_free(void) if (data.using_shtex) { if (data.gl_dxobj) - jimglDXUnregisterObjectNV(data.gl_device, + obsglDXUnregisterObjectNV(data.gl_device, data.gl_dxobj); if (data.gl_device) - jimglDXCloseDeviceNV(data.gl_device); + obsglDXCloseDeviceNV(data.gl_device); if (data.texture) glDeleteTextures(1, &data.texture); if (data.d3d11_tex) @@ -147,7 +147,7 @@ static inline void *base_get_proc(const char *name) static inline void *wgl_get_proc(const char *name) { - return (void *)jimglGetProcAddress(name); + return (void *)obsglGetProcAddress(name); } static inline void *get_proc(const char *name) @@ -161,21 +161,21 @@ static inline void *get_proc(const char *name) static void init_nv_functions(void) { - jimglDXSetResourceShareHandleNV = + obsglDXSetResourceShareHandleNV = get_proc("wglDXSetResourceShareHandleNV"); - jimglDXOpenDeviceNV = get_proc("wglDXOpenDeviceNV"); - jimglDXCloseDeviceNV = get_proc("wglDXCloseDeviceNV"); - jimglDXRegisterObjectNV = get_proc("wglDXRegisterObjectNV"); - jimglDXUnregisterObjectNV = get_proc("wglDXUnregisterObjectNV"); - jimglDXObjectAccessNV = get_proc("wglDXObjectAccessNV"); - jimglDXLockObjectsNV = get_proc("wglDXLockObjectsNV"); - jimglDXUnlockObjectsNV = get_proc("wglDXUnlockObjectsNV"); + obsglDXOpenDeviceNV = get_proc("wglDXOpenDeviceNV"); + obsglDXCloseDeviceNV = get_proc("wglDXCloseDeviceNV"); + obsglDXRegisterObjectNV = get_proc("wglDXRegisterObjectNV"); + obsglDXUnregisterObjectNV = get_proc("wglDXUnregisterObjectNV"); + obsglDXObjectAccessNV = get_proc("wglDXObjectAccessNV"); + obsglDXLockObjectsNV = get_proc("wglDXLockObjectsNV"); + obsglDXUnlockObjectsNV = get_proc("wglDXUnlockObjectsNV"); nv_capture_available = - !!jimglDXSetResourceShareHandleNV && !!jimglDXOpenDeviceNV && - !!jimglDXCloseDeviceNV && !!jimglDXRegisterObjectNV && - !!jimglDXUnregisterObjectNV && !!jimglDXObjectAccessNV && - !!jimglDXLockObjectsNV && !!jimglDXUnlockObjectsNV; + !!obsglDXSetResourceShareHandleNV && !!obsglDXOpenDeviceNV && + !!obsglDXCloseDeviceNV && !!obsglDXRegisterObjectNV && + !!obsglDXUnregisterObjectNV && !!obsglDXObjectAccessNV && + !!obsglDXLockObjectsNV && !!obsglDXUnlockObjectsNV; if (nv_capture_available) hlog("Shared-texture OpenGL capture available"); @@ -195,15 +195,15 @@ static bool init_gl_functions(void) { bool success = true; - jimglGetProcAddress = base_get_proc("wglGetProcAddress"); - if (!jimglGetProcAddress) { + obsglGetProcAddress = base_get_proc("wglGetProcAddress"); + if (!obsglGetProcAddress) { hlog("init_gl_functions: failed to get wglGetProcAddress"); return false; } - GET_PROC(init_gl_functions, jimglMakeCurrent, wglMakeCurrent); - GET_PROC(init_gl_functions, jimglGetCurrentDC, wglGetCurrentDC); - GET_PROC(init_gl_functions, jimglGetCurrentContext, + GET_PROC(init_gl_functions, obsglMakeCurrent, wglMakeCurrent); + GET_PROC(init_gl_functions, obsglGetCurrentDC, wglGetCurrentDC); + GET_PROC(init_gl_functions, obsglGetCurrentContext, wglGetCurrentContext); GET_PROC(init_gl_functions, glTexImage2D, glTexImage2D); GET_PROC(init_gl_functions, glReadBuffer, glReadBuffer); @@ -393,7 +393,7 @@ static inline bool gl_shtex_init_d3d11_tex(void) static inline bool gl_shtex_init_gl_tex(void) { - data.gl_device = jimglDXOpenDeviceNV(data.d3d11_device); + data.gl_device = obsglDXOpenDeviceNV(data.d3d11_device); if (!data.gl_device) { hlog("gl_shtex_init_gl_tex: failed to open device"); return false; @@ -404,7 +404,7 @@ static inline bool gl_shtex_init_gl_tex(void) return false; } - data.gl_dxobj = jimglDXRegisterObjectNV(data.gl_device, data.d3d11_tex, + data.gl_dxobj = obsglDXRegisterObjectNV(data.gl_device, data.d3d11_tex, data.texture, GL_TEXTURE_2D, WGL_ACCESS_WRITE_DISCARD_NV); if (!data.gl_dxobj) { @@ -609,7 +609,7 @@ static void gl_shtex_capture(void) GLint last_fbo; GLint last_tex; - jimglDXLockObjectsNV(data.gl_device, 1, &data.gl_dxobj); + obsglDXLockObjectsNV(data.gl_device, 1, &data.gl_dxobj); glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &last_fbo); if (gl_error("gl_shtex_capture", "failed to get last fbo")) { @@ -626,7 +626,7 @@ static void gl_shtex_capture(void) glBindTexture(GL_TEXTURE_2D, last_tex); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, last_fbo); - jimglDXUnlockObjectsNV(data.gl_device, 1, &data.gl_dxobj); + obsglDXUnlockObjectsNV(data.gl_device, 1, &data.gl_dxobj); IDXGISwapChain_Present(data.dxgi_swap, 0, 0); } @@ -820,12 +820,12 @@ static BOOL WINAPI hook_wgl_swap_layer_buffers(HDC hdc, UINT planes) static BOOL WINAPI hook_wgl_delete_context(HGLRC hrc) { if (capture_active() && functions_initialized) { - HDC last_hdc = jimglGetCurrentDC(); - HGLRC last_hrc = jimglGetCurrentContext(); + HDC last_hdc = obsglGetCurrentDC(); + HGLRC last_hrc = obsglGetCurrentContext(); - jimglMakeCurrent(data.hdc, hrc); + obsglMakeCurrent(data.hdc, hrc); gl_free(); - jimglMakeCurrent(last_hdc, last_hrc); + obsglMakeCurrent(last_hdc, last_hrc); } return RealWglDeleteContext(hrc); diff --git a/plugins/win-capture/graphics-hook/gl-decs.h b/plugins/win-capture/graphics-hook/gl-decs.h index 10a1cc0a2..d6a124ccd 100644 --- a/plugins/win-capture/graphics-hook/gl-decs.h +++ b/plugins/win-capture/graphics-hook/gl-decs.h @@ -127,10 +127,10 @@ static GLREADBUFFERPROC glReadBuffer = NULL; static GLDRAWBUFFERPROC glDrawBuffer = NULL; static GLGETINTEGERVPROC glGetIntegerv = NULL; static GLGETERRORPROC glGetError = NULL; -static WGLGETPROCADDRESSPROC jimglGetProcAddress = NULL; -static WGLMAKECURRENTPROC jimglMakeCurrent = NULL; -static WGLGETCURRENTDCPROC jimglGetCurrentDC = NULL; -static WGLGETCURRENTCONTEXTPROC jimglGetCurrentContext = NULL; +static WGLGETPROCADDRESSPROC obsglGetProcAddress = NULL; +static WGLMAKECURRENTPROC obsglMakeCurrent = NULL; +static WGLGETCURRENTDCPROC obsglGetCurrentDC = NULL; +static WGLGETCURRENTCONTEXTPROC obsglGetCurrentContext = NULL; static GLBUFFERDATAARBPROC glBufferData = NULL; static GLDELETEBUFFERSARBPROC glDeleteBuffers = NULL; static GLDELETETEXTURESPROC glDeleteTextures = NULL; @@ -146,11 +146,11 @@ static GLBINDFRAMEBUFFERPROC glBindFramebuffer = NULL; static GLBLITFRAMEBUFFERPROC glBlitFramebuffer = NULL; static GLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D = NULL; -static WGLSETRESOURCESHAREHANDLENVPROC jimglDXSetResourceShareHandleNV = NULL; -static WGLDXOPENDEVICENVPROC jimglDXOpenDeviceNV = NULL; -static WGLDXCLOSEDEVICENVPROC jimglDXCloseDeviceNV = NULL; -static WGLDXREGISTEROBJECTNVPROC jimglDXRegisterObjectNV = NULL; -static WGLDXUNREGISTEROBJECTNVPROC jimglDXUnregisterObjectNV = NULL; -static WGLDXOBJECTACCESSNVPROC jimglDXObjectAccessNV = NULL; -static WGLDXLOCKOBJECTSNVPROC jimglDXLockObjectsNV = NULL; -static WGLDXUNLOCKOBJECTSNVPROC jimglDXUnlockObjectsNV = NULL; +static WGLSETRESOURCESHAREHANDLENVPROC obsglDXSetResourceShareHandleNV = NULL; +static WGLDXOPENDEVICENVPROC obsglDXOpenDeviceNV = NULL; +static WGLDXCLOSEDEVICENVPROC obsglDXCloseDeviceNV = NULL; +static WGLDXREGISTEROBJECTNVPROC obsglDXRegisterObjectNV = NULL; +static WGLDXUNREGISTEROBJECTNVPROC obsglDXUnregisterObjectNV = NULL; +static WGLDXOBJECTACCESSNVPROC obsglDXObjectAccessNV = NULL; +static WGLDXLOCKOBJECTSNVPROC obsglDXLockObjectsNV = NULL; +static WGLDXUNLOCKOBJECTSNVPROC obsglDXUnlockObjectsNV = NULL; diff --git a/plugins/win-capture/graphics-hook/graphics-hook.rc b/plugins/win-capture/graphics-hook/graphics-hook.rc index a9b283cb2..3ea6376a2 100644 --- a/plugins/win-capture/graphics-hook/graphics-hook.rc +++ b/plugins/win-capture/graphics-hook/graphics-hook.rc @@ -1,5 +1,5 @@ -/* DO NOT MODIFY THIS FILE WITHOUT CONSULTING JIM. OTHERWISE, JIM WILL DO - * EVERYTHING IN HIS POWER TO MAKE YOUR LIFE MISERABLE FROM THEREON OUT WITH A +/* DO NOT MODIFY THIS FILE WITHOUT CONSULTING LAIN. OTHERWISE, LAIN WILL DO + * EVERYTHING IN HER POWER TO MAKE YOUR LIFE MISERABLE FROM THEREON OUT WITH A * LEVEL OF DETERMINATION UNLIKE ANYTHING ANYONE HAS EVER SEEN IN THE HISTORY * OF MANKIND. * @@ -28,7 +28,7 @@ BEGIN VALUE "ProductName", "OBS Graphics Hook" VALUE "ProductVersion", HOOK_VERSION_NAME VALUE "Comments", "Free and open source software for video recording and live streaming" - VALUE "LegalCopyright", "(C) Hugh Bailey" + VALUE "LegalCopyright", "(C) Lain Bailey" END END diff --git a/plugins/win-dshow/ffmpeg-decode.c b/plugins/win-dshow/ffmpeg-decode.c index 49df62b7a..d26f61a1b 100644 --- a/plugins/win-dshow/ffmpeg-decode.c +++ b/plugins/win-dshow/ffmpeg-decode.c @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/win-dshow/ffmpeg-decode.h b/plugins/win-dshow/ffmpeg-decode.h index b4cdee4ad..f67bbd28a 100644 --- a/plugins/win-dshow/ffmpeg-decode.h +++ b/plugins/win-dshow/ffmpeg-decode.h @@ -1,5 +1,5 @@ /****************************************************************************** - Copyright (C) 2014 by Hugh Bailey + Copyright (C) 2023 by Lain Bailey This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/win-dshow/libdshowcapture b/plugins/win-dshow/libdshowcapture index bac23f2ca..7a2cd1924 160000 --- a/plugins/win-dshow/libdshowcapture +++ b/plugins/win-dshow/libdshowcapture @@ -1 +1 @@ -Subproject commit bac23f2ca01b712b9740c6a3822d32c134ab6325 +Subproject commit 7a2cd192431013f1ff18b7cb6a377af7a74c44b4