Skip to content

Commit

Permalink
obs-vst: Remove submodule in favour of direct merge
Browse files Browse the repository at this point in the history
Please visit the submodule repo for blame history:
https://github.com/obsproject/obs-vst

This also replaces the obs-vst .clang-format with obs-studio's.

Co-authored-by: Alex Anderson <anderson.john.alexander@gmail.com>
Co-authored-by: Anton <camotank12345@gmail.com>
Co-authored-by: Blue Cat Audio <support@bluecataudio.com>
Co-authored-by: Cephas Reis <c3r1c3@nevermindonline.com>
Co-authored-by: Colin Edwards <colin@recursivepenguin.com>
Co-authored-by: Florian Zwoch <fzwoch@gmail.com>
Co-authored-by: Fogmoon <i@fogmoon.com>
Co-authored-by: Gol-D-Ace <Gol-D-Ace@users.noreply.github.com>
Co-authored-by: Igor Bochkariov <ujifgc@gmail.com>
Co-authored-by: Jesse Chappell <jesse@sonosaurus.com>
Co-authored-by: Keen <523059842@qq.com>
Co-authored-by: Kurt Kartaltepe <kkartaltepe@gmail.com>
Co-authored-by: Matt Gajownik <matt@obsproject.com>
Co-authored-by: Matt Gajownik <matt@wizardcm.com>
Co-authored-by: Richard Stanway <notr1ch@users.noreply.github.com>
Co-authored-by: Ryan Foster <RytoEX@gmail.com>
Co-authored-by: follower <github@rancidbacon.com>
Co-authored-by: gxalpha <beckmann.sebastian@outlook.de>
Co-authored-by: jp9000 <obs.jim@gmail.com>
Co-authored-by: jpark37 <jpark37@users.noreply.github.com>
Co-authored-by: mntone <sd8@live.jp>
Co-authored-by: tytan652 <tytan652@tytanium.xyz>
Co-authored-by: wangshaohui <97082645@qq.com>
Co-authored-by: wangshaohui <wang.shaohui@navercorp.com>
  • Loading branch information
24 people committed Feb 13, 2022
1 parent 2720e6d commit 1f36f92
Show file tree
Hide file tree
Showing 67 changed files with 2,102 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
[submodule "plugins/obs-browser"]
path = plugins/obs-browser
url = https://github.com/obsproject/obs-browser.git
[submodule "plugins/obs-vst"]
path = plugins/obs-vst
url = https://github.com/obsproject/obs-vst.git
[submodule "plugins/obs-outputs/ftl-sdk"]
path = plugins/obs-outputs/ftl-sdk
url = https://github.com/Mixer/ftl-sdk.git
1 change: 0 additions & 1 deletion formatcode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ find . -type d \( -path ./deps \
-o -path ./plugins/enc-amf \
-o -path ./plugins/mac-syphon/syphon-framework \
-o -path ./plugins/obs-outputs/ftl-sdk \
-o -path ./plugins/obs-vst \
-o -path ./plugins/aja/sdk \
-o -path ./build \) -prune -type f -o -name '*.h' -or -name '*.hpp' -or -name '*.m' -or -name '*.mm' -or -name '*.c' -or -name '*.cpp' \
| xargs -L100 -P${NPROC} ${CLANG_FORMAT} -i -style=file -fallback-style=none
1 change: 0 additions & 1 deletion plugins/obs-vst
Submodule obs-vst deleted from 8ad3f6
84 changes: 84 additions & 0 deletions plugins/obs-vst/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
if(DISABLE_UI)
message(STATUS "UI disabled,so vst plugin disabled")
return()
endif()
if(DISABLE_VST)
message(STATUS "obs-vst is disabled")
return()
endif()

project(obs-vst)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}")

set(CMAKE_AUTOMOC TRUE)
find_package(Qt5Widgets REQUIRED)

option(VST_USE_BUNDLED_HEADERS "Build with Bundled Headers" ON)

if(VST_USE_BUNDLED_HEADERS)
message(STATUS "Using the bundled VST header.")
include_directories(vst_header)
set(vst_HEADER
vst_header/aeffectx.h)
else()
set(VST_INCLUDE_DIR "" CACHE PATH
"Path to Steinburg headers (e.g. C:/VST3 SDK/pluginterfaces/vst2.x)")

message(WARNING "You should only use the Steinburg headers for debugging or local
builds. It is illegal to distribute the Steinburg headers with anything, and
possibly against the GPL to distribute the binaries from the resultant compile.")
include_directories(${VST_INCLUDE_DIR})
set(vst_HEADER
${VST_INCLUDE_DIR}/aeffectx.h)
endif()

if(APPLE)
find_library(FOUNDATION_FRAMEWORK Foundation)
find_library(COCOA_FRAMEWORK Cocoa)
endif(APPLE)

set(obs-vst_SOURCES
obs-vst.cpp
VSTPlugin.cpp
EditorWidget.cpp)

if(APPLE)
list(APPEND obs-vst_SOURCES
mac/VSTPlugin-osx.mm
mac/EditorWidget-osx.mm)

elseif(WIN32)
list(APPEND obs-vst_SOURCES
win/VSTPlugin-win.cpp
win/EditorWidget-win.cpp)

elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
list (APPEND obs-vst_SOURCES
linux/VSTPlugin-linux.cpp
linux/EditorWidget-linux.cpp)
endif()

list(APPEND obs-vst_HEADERS
headers/vst-plugin-callbacks.hpp
headers/EditorWidget.h
headers/VSTPlugin.h)

add_library(obs-vst MODULE
${obs-vst_SOURCES}
${obs-vst_HEADERS}
${vst-HEADER})

target_link_libraries(obs-vst
libobs
Qt5::Widgets)

set_target_properties(obs-vst PROPERTIES FOLDER "plugins")

if(APPLE)
target_link_libraries(obs-vst
${COCOA_FRAMEWORK}
${FOUNDATION_FRAMEWORK})
endif(APPLE)

install_obs_plugin_with_data(obs-vst data)
32 changes: 32 additions & 0 deletions plugins/obs-vst/EditorWidget.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*****************************************************************************
Copyright (C) 2016-2017 by Colin Edwards.
Additional Code Copyright (C) 2016-2017 by c3r1c3 <c3r1c3@nevermindonline.com>
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
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

#include "headers/EditorWidget.h"
#include <QCloseEvent>

EditorWidget::EditorWidget(QWidget *parent, VSTPlugin *plugin)
: QWidget(parent), plugin(plugin)
{
setWindowFlags(this->windowFlags() |= Qt::MSWindowsFixedSizeDialogHint);
}

void EditorWidget::closeEvent(QCloseEvent *event)
{
plugin->onEditorClosed();
UNUSED_PARAMETER(event);
}
Loading

0 comments on commit 1f36f92

Please sign in to comment.