merge 0.16.2

.gitmodules

@@ -5,6 +5,15 @@
 [submodule "plugins/mac-syphon/syphon-framework"]
 	path = plugins/mac-syphon/syphon-framework
 	url = https://github.com/palana/Syphon-Framework.git
+
 [submodule "plugins/libftl/ftl-sdk"]
 	path = plugins/libftl/ftl-sdk
 	url = https://github.com/WatchBeam/ftl-sdk.git
+
+[submodule "plugins/enc-amf"]
+	path = plugins/enc-amf
+	url = https://github.com/Xaymar/OBS-AMD-Advanced-Media-Framework.git
+
+[submodule "plugins/obs-browser"]
+	path = plugins/obs-browser
+	url = https://github.com/kc5nra/obs-browser.git

CMakeLists.txt

@@ -95,7 +95,7 @@ if(NOT INSTALLER_RUN)
 
 	add_subdirectory(libobs-opengl)
 	add_subdirectory(libobs)
-	add_subdirectory(obs)
+	add_subdirectory(UI)
 	add_subdirectory(plugins)
 	if (BUILD_TESTS)
 		add_subdirectory(test)

CONTRIBUTING

@@ -7,6 +7,9 @@ Contributing Information:
        https://obsproject.com/forum/list/general-development.21/
 
  - Development IRC channel is primarily #obs-dev on QuakeNet
+
+ - To contribute translations, see:
+       https://obsproject.com/forum/threads/how-to-contribute-translations-for-obs.16327/
 
 
 Contributing Guidelines:

obs/CMakeLists.txt → UI/CMakeLists.txt

@@ -1,5 +1,3 @@
-project(obs)
-
 option(ENABLE_UI "Enables the OBS user interfaces" ON)
 if(DISABLE_UI)
 	message(STATUS "UI disabled")
@@ -10,6 +8,12 @@ else()
 	set(FIND_MODE QUIET)
 endif()
 
+add_subdirectory(obs-frontend-api)
+
+# ----------------------------------------------------------------------------
+
+project(obs)
+
 if(DEFINED QTDIR${_lib_suffix})
 	list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
 elseif(DEFINED QTDIR)
@@ -40,6 +44,7 @@ if(NOT Qt5Widgets_FOUND)
 	endif()
 endif()
 
+include_directories(SYSTEM "obs-frontend-api")
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
 
 find_package(Libcurl REQUIRED)
@@ -97,6 +102,7 @@ endif()
 set(obs_SOURCES
 	${obs_PLATFORM_SOURCES}
 	obs-app.cpp
+	api-interface.cpp
 	window-basic-main.cpp
 	window-basic-filters.cpp
 	window-basic-settings.cpp
@@ -106,6 +112,7 @@ set(obs_SOURCES
 	window-basic-source-select.cpp
 	window-basic-main-scene-collections.cpp
 	window-basic-main-transitions.cpp
+	window-basic-main-dropfiles.cpp
 	window-basic-main-profiles.cpp
 	window-license-agreement.cpp
 	window-basic-status-bar.cpp
@@ -219,6 +226,7 @@ target_link_libraries(obs
 	libobs
 	libff
 	Qt5::Widgets
+	obs-frontend-api
 	${LIBCURL_LIBRARIES}
 	${obs_PLATFORM_LIBRARIES})
 
@@ -232,3 +240,5 @@ if (UNIX AND UNIX_STRUCTURE AND NOT APPLE)
 	install(FILES forms/images/obs.png
 		DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/256x256/apps)
 endif()
+
+add_subdirectory(frontend-plugins)