2014-09-15 14:20:43 -07:00
|
|
|
if(DISABLE_UI)
|
|
|
|
message(STATUS "UI disabled")
|
|
|
|
return()
|
|
|
|
elseif(ENABLE_UI)
|
|
|
|
set(FIND_MODE REQUIRED)
|
2014-01-20 07:58:58 -08:00
|
|
|
else()
|
2014-09-15 14:20:43 -07:00
|
|
|
set(FIND_MODE QUIET)
|
2014-01-20 07:58:58 -08:00
|
|
|
endif()
|
|
|
|
|
UI: Remove mac browser workarounds, improve stability
The workarounds were made because of conflicts with running multiple UI
threads at once on macOS, which macOS can't do very well, and would be
susceptible to crashes. This would cause crashes not only on startup
but seemingly at random when using the browser source on macOS. The
original "fix" was a hack to try to minimize UI code and browser UI code
from executing at the same time. The macOS initial scene loading was
deferred until all Qt-related and main window initialization was
completed. Although this worked to some extent to prevent conflicts, it
made it so that there was an initial period on startup where the entire
UI seemed "blank" for users, and it was still possible for the main UI
thread and the browser UI thread to clash, causing crashes seemingly at
random for users.
The external message pump method of CEF is the solution to the problem,
which is the method which allows the main UI thread to share events with
CEF. To do this, all CEF operations need to be performed in the UI
thread (Qt's main thread), and CefDoMessageLoopWork() needs to be called
when CefApp::OnScheduleMessagePumpWork callback is triggered. A number
of other issues had to be solved as well, such as CefBrowser references
getting "stuck" in the Qt event queue.
With this, macOS no longer needs to do the "deferred load" hack, and
browsers are now much more stable and no longer as susceptible to
seemingly random crashes, improving overall program stability when
browsers are used.
2019-05-01 12:13:35 -07:00
|
|
|
if(BROWSER_AVAILABLE_INTERNAL)
|
2018-09-18 08:54:30 -07:00
|
|
|
add_definitions(-DBROWSER_AVAILABLE)
|
|
|
|
endif()
|
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
add_subdirectory(obs-frontend-api)
|
|
|
|
|
|
|
|
# ----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
project(obs)
|
|
|
|
|
2018-05-12 17:11:02 -07:00
|
|
|
set(DISABLE_UPDATE_MODULE TRUE CACHE BOOL "Disables building the update module")
|
2017-02-20 04:46:29 -08:00
|
|
|
|
2019-02-06 22:45:06 -08:00
|
|
|
if(NOT DEFINED TWITCH_CLIENTID OR "${TWITCH_CLIENTID}" STREQUAL "" OR
|
|
|
|
NOT DEFINED TWITCH_HASH OR "${TWITCH_HASH}" STREQUAL "" OR
|
|
|
|
NOT BROWSER_AVAILABLE_INTERNAL)
|
|
|
|
set(TWITCH_ENABLED FALSE)
|
|
|
|
set(TWITCH_CLIENTID "")
|
|
|
|
set(TWITCH_HASH "0")
|
|
|
|
else()
|
|
|
|
set(TWITCH_ENABLED TRUE)
|
|
|
|
endif()
|
|
|
|
|
2019-02-06 22:44:28 -08:00
|
|
|
if(NOT DEFINED MIXER_CLIENTID OR "${MIXER_CLIENTID}" STREQUAL "" OR
|
|
|
|
NOT DEFINED MIXER_HASH OR "${MIXER_HASH}" STREQUAL "" OR
|
|
|
|
NOT BROWSER_AVAILABLE_INTERNAL)
|
|
|
|
set(MIXER_ENABLED FALSE)
|
|
|
|
set(MIXER_CLIENTID "")
|
|
|
|
set(MIXER_HASH "0")
|
|
|
|
else()
|
|
|
|
set(MIXER_ENABLED TRUE)
|
|
|
|
endif()
|
|
|
|
|
2019-02-14 10:35:47 -08:00
|
|
|
if(NOT DEFINED RESTREAM_CLIENTID OR "${RESTREAM_CLIENTID}" STREQUAL "" OR
|
|
|
|
NOT DEFINED RESTREAM_HASH OR "${RESTREAM_HASH}" STREQUAL "" OR
|
|
|
|
NOT BROWSER_AVAILABLE_INTERNAL)
|
|
|
|
set(RESTREAM_ENABLED FALSE)
|
|
|
|
set(RESTREAM_CLIENTID "")
|
|
|
|
set(RESTREAM_HASH "0")
|
|
|
|
else()
|
|
|
|
set(RESTREAM_ENABLED TRUE)
|
|
|
|
endif()
|
|
|
|
|
2019-02-06 22:44:28 -08:00
|
|
|
configure_file(
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/ui-config.h.in"
|
|
|
|
"${CMAKE_CURRENT_BINARY_DIR}/ui-config.h")
|
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
|
|
|
|
set(CMAKE_AUTOMOC TRUE)
|
|
|
|
|
2018-12-14 05:42:05 -08:00
|
|
|
find_package(Qt5Svg ${FIND_MODE})
|
|
|
|
|
2017-03-26 12:39:59 -07:00
|
|
|
find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)
|
2014-09-15 14:20:43 -07:00
|
|
|
|
2018-02-06 17:08:57 -08:00
|
|
|
if(APPLE)
|
|
|
|
find_package(Qt5MacExtras REQUIRED)
|
|
|
|
endif(APPLE)
|
|
|
|
|
2015-05-23 23:40:15 -07:00
|
|
|
if(NOT Qt5Widgets_FOUND)
|
2014-09-15 14:20:43 -07:00
|
|
|
if (ENABLE_UI)
|
|
|
|
message(FATAL_ERROR "Failed to find Qt5")
|
|
|
|
else()
|
|
|
|
message(STATUS "Qt5 not found - UI disabled")
|
|
|
|
return()
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
|
2017-03-26 12:39:59 -07:00
|
|
|
|
|
|
|
include_directories(${FFMPEG_INCLUDE_DIRS})
|
2019-02-06 22:44:28 -08:00
|
|
|
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
2016-08-28 14:24:14 -07:00
|
|
|
include_directories(SYSTEM "obs-frontend-api")
|
2014-09-15 14:20:43 -07:00
|
|
|
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
|
2017-03-26 12:39:59 -07:00
|
|
|
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/deps/libff")
|
2018-07-27 21:35:08 -07:00
|
|
|
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/deps/json11")
|
2018-09-18 08:54:30 -07:00
|
|
|
if(BROWSER_AVAILABLE_INTERNAL)
|
|
|
|
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/plugins/obs-browser/panel")
|
|
|
|
endif()
|
2014-01-20 07:58:58 -08:00
|
|
|
|
2015-05-23 23:37:07 -07:00
|
|
|
find_package(Libcurl REQUIRED)
|
|
|
|
include_directories(${LIBCURL_INCLUDE_DIRS})
|
|
|
|
add_definitions(${LIBCURL_DEFINITIONS})
|
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
if(WIN32)
|
2017-02-20 04:46:29 -08:00
|
|
|
include_directories(${OBS_JANSSON_INCLUDE_DIRS})
|
2017-02-23 08:38:43 -08:00
|
|
|
include_directories(${BLAKE2_INCLUDE_DIR})
|
2017-02-20 04:46:29 -08:00
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
set(obs_PLATFORM_SOURCES
|
2015-04-04 15:35:15 -07:00
|
|
|
platform-windows.cpp
|
2017-02-20 04:46:29 -08:00
|
|
|
win-update/update-window.cpp
|
|
|
|
win-update/win-update.cpp
|
|
|
|
win-update/win-update-helpers.cpp
|
2019-03-15 20:28:19 -07:00
|
|
|
${obs-studio_BINARY_DIR}/obs.rc)
|
2017-02-20 04:46:29 -08:00
|
|
|
set(obs_PLATFORM_HEADERS
|
|
|
|
win-update/update-window.hpp
|
|
|
|
win-update/win-update.hpp
|
|
|
|
win-update/win-update-helpers.hpp)
|
|
|
|
set(obs_PLATFORM_LIBRARIES
|
|
|
|
crypt32
|
2017-02-23 08:38:43 -08:00
|
|
|
blake2
|
2017-02-20 04:46:29 -08:00
|
|
|
${OBS_JANSSON_IMPORT})
|
2018-12-04 08:39:53 -08:00
|
|
|
|
|
|
|
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
|
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
|
|
|
|
endif()
|
2014-01-20 07:58:58 -08:00
|
|
|
elseif(APPLE)
|
|
|
|
set(obs_PLATFORM_SOURCES
|
|
|
|
platform-osx.mm)
|
2014-01-24 14:04:42 -08:00
|
|
|
|
|
|
|
find_package(AppKit REQUIRED)
|
2014-09-15 10:38:18 -07:00
|
|
|
set(obs_PLATFORM_LIBRARIES ${APPKIT_LIBRARIES})
|
2014-01-24 14:04:42 -08:00
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
add_definitions(-fobjc-arc)
|
2014-10-05 15:32:18 -07:00
|
|
|
|
|
|
|
option(ENABLE_SPARKLE_UPDATER "Enables updates via the Sparkle framework (don't forget to update the Info.plist for your .app)" OFF)
|
|
|
|
if(ENABLE_SPARKLE_UPDATER)
|
|
|
|
find_library(SPARKLE Sparkle)
|
|
|
|
include_directories(${SPARKLE})
|
|
|
|
set(obs_PLATFORM_SOURCES
|
|
|
|
${obs_PLATFORM_SOURCES}
|
|
|
|
sparkle-updater.mm)
|
|
|
|
set(obs_PLATFORM_LIBRARIES
|
|
|
|
${obs_PLATFORM_LIBRARIES}
|
|
|
|
${SPARKLE})
|
|
|
|
add_definitions(-DUPDATE_SPARKLE=1)
|
|
|
|
endif()
|
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
elseif(UNIX)
|
2014-04-03 14:41:22 -07:00
|
|
|
find_package(Qt5X11Extras REQUIRED)
|
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
set(obs_PLATFORM_SOURCES
|
|
|
|
platform-x11.cpp)
|
|
|
|
|
2016-10-03 23:50:13 -07:00
|
|
|
set(obs_PLATFORM_LIBRARIES
|
2014-05-18 18:02:57 -07:00
|
|
|
Qt5::X11Extras)
|
2014-01-20 07:58:58 -08:00
|
|
|
endif()
|
|
|
|
|
2019-02-06 22:24:25 -08:00
|
|
|
if(BROWSER_AVAILABLE_INTERNAL)
|
|
|
|
list(APPEND obs_PLATFORM_SOURCES
|
2019-02-06 22:29:52 -08:00
|
|
|
obf.c
|
2019-02-06 22:24:25 -08:00
|
|
|
auth-oauth.cpp
|
2019-09-03 19:11:14 -07:00
|
|
|
window-dock-browser.cpp
|
2019-08-08 03:27:45 -07:00
|
|
|
window-extra-browsers.cpp
|
2019-02-06 22:24:25 -08:00
|
|
|
)
|
|
|
|
list(APPEND obs_PLATFORM_HEADERS
|
2019-02-06 22:29:52 -08:00
|
|
|
obf.h
|
2019-02-06 22:24:25 -08:00
|
|
|
auth-oauth.hpp
|
2019-09-03 16:08:48 -07:00
|
|
|
window-dock-browser.hpp
|
2019-08-08 03:27:45 -07:00
|
|
|
window-extra-browsers.hpp
|
2019-02-06 22:24:25 -08:00
|
|
|
)
|
2019-02-06 22:44:28 -08:00
|
|
|
|
2019-02-06 22:45:06 -08:00
|
|
|
if(TWITCH_ENABLED)
|
|
|
|
list(APPEND obs_PLATFORM_SOURCES
|
|
|
|
auth-twitch.cpp
|
|
|
|
)
|
|
|
|
list(APPEND obs_PLATFORM_HEADERS
|
|
|
|
auth-twitch.hpp
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
|
2019-02-06 22:44:28 -08:00
|
|
|
if(MIXER_ENABLED)
|
|
|
|
list(APPEND obs_PLATFORM_SOURCES
|
|
|
|
auth-mixer.cpp
|
|
|
|
)
|
|
|
|
list(APPEND obs_PLATFORM_HEADERS
|
|
|
|
auth-mixer.hpp
|
|
|
|
)
|
|
|
|
endif()
|
2019-02-14 10:35:47 -08:00
|
|
|
|
|
|
|
if(RESTREAM_ENABLED)
|
|
|
|
list(APPEND obs_PLATFORM_SOURCES
|
|
|
|
auth-restream.cpp
|
|
|
|
)
|
|
|
|
list(APPEND obs_PLATFORM_HEADERS
|
|
|
|
auth-restream.hpp
|
|
|
|
)
|
|
|
|
endif()
|
2019-02-06 22:24:25 -08:00
|
|
|
endif()
|
|
|
|
|
2017-03-26 12:39:59 -07:00
|
|
|
set(obs_libffutil_SOURCES
|
|
|
|
../deps/libff/libff/ff-util.c
|
|
|
|
)
|
|
|
|
set(obs_libffutil_HEADERS
|
|
|
|
../deps/libff/libff/ff-util.h
|
|
|
|
)
|
|
|
|
|
|
|
|
if(MSVC)
|
|
|
|
set_source_files_properties(
|
|
|
|
../deps/libff/libff/ff-util.c
|
|
|
|
PROPERTIES COMPILE_FLAGS -Dinline=__inline
|
|
|
|
)
|
2019-07-23 18:08:08 -07:00
|
|
|
set(obs_PLATFORM_LIBRARIES
|
|
|
|
${obs_PLATFORM_LIBRARIES}
|
|
|
|
w32-pthreads)
|
2017-03-26 12:39:59 -07:00
|
|
|
endif()
|
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
set(obs_SOURCES
|
|
|
|
${obs_PLATFORM_SOURCES}
|
2017-03-26 12:39:59 -07:00
|
|
|
${obs_libffutil_SOURCES}
|
2018-07-27 21:35:08 -07:00
|
|
|
../deps/json11/json11.cpp
|
2014-01-20 07:58:58 -08:00
|
|
|
obs-app.cpp
|
2019-03-05 14:37:01 -08:00
|
|
|
window-dock.cpp
|
2016-08-28 14:24:14 -07:00
|
|
|
api-interface.cpp
|
2014-01-20 07:58:58 -08:00
|
|
|
window-basic-main.cpp
|
2017-05-10 19:37:45 -07:00
|
|
|
window-basic-stats.cpp
|
2015-02-25 21:23:57 -08:00
|
|
|
window-basic-filters.cpp
|
2014-01-24 20:31:25 -08:00
|
|
|
window-basic-settings.cpp
|
2014-09-15 16:16:16 -07:00
|
|
|
window-basic-interaction.cpp
|
2014-03-23 01:07:54 -07:00
|
|
|
window-basic-properties.cpp
|
2017-05-06 12:13:56 -07:00
|
|
|
window-basic-auto-config.cpp
|
2015-02-06 03:17:33 -08:00
|
|
|
window-basic-main-outputs.cpp
|
2014-05-10 18:47:48 -07:00
|
|
|
window-basic-source-select.cpp
|
2019-02-06 19:19:17 -08:00
|
|
|
window-basic-settings-stream.cpp
|
2017-05-06 12:13:56 -07:00
|
|
|
window-basic-auto-config-test.cpp
|
2015-06-23 19:29:07 -07:00
|
|
|
window-basic-main-scene-collections.cpp
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
window-basic-main-transitions.cpp
|
2016-09-26 12:40:23 -07:00
|
|
|
window-basic-main-dropfiles.cpp
|
2015-06-23 19:38:01 -07:00
|
|
|
window-basic-main-profiles.cpp
|
2019-02-06 22:10:08 -08:00
|
|
|
window-basic-main-browser.cpp
|
2019-07-27 21:59:16 -07:00
|
|
|
window-basic-main-icons.cpp
|
2014-07-06 16:19:27 -07:00
|
|
|
window-basic-status-bar.cpp
|
2014-12-28 00:38:00 -08:00
|
|
|
window-basic-adv-audio.cpp
|
UI: Add scene editing
So, scene editing was interesting (and by interesting I mean
excruciating). I almost implemented 'manipulator' visuals (ala 3dsmax
for example), and used 3 modes for controlling position/rotation/size,
but in a 2D editing, it felt clunky, so I defaulted back to simply
click-and-drag for movement, and then took a similar though slightly
different looking approach for handling scaling and reszing.
I also added a number of menu item helpers related to positioning,
scaling, rotating, flipping, and resetting the transform back to
default.
There is also a new 'transform' dialog (accessible via menu) which will
allow you to manually edit every single transform variable of a scene
item directly if desired.
If a scene item does not have bounds active, pulling on the sides of a
source will cause it to resize it via base scale rather than by the
bounding box system (if the source resizes that scale will apply). If
bounds are active, it will modify the bounding box only instead.
How a source scales when a bounding box is active depends on the type of
bounds being used. You can set it to scale to the inner bounds, the
outer bounds, scale to bounds width only, scale to bounds height only,
and a setting to stretch to bounds (which forces a source to always draw
at the bounding box size rather than be affected by its internal size).
You can also set it to be used as a 'maximum' size, so that the source
doesn't necessarily get scaled unless it extends beyond the bounds.
Like in OBS1, objects will snap to the edges unless the control key is
pressed. However, this will now happen even if the object is rotated or
oriented in any strange way. Snapping will also occur when stretching
or changing the bounding box size.
2014-06-15 00:54:48 -07:00
|
|
|
window-basic-transform.cpp
|
|
|
|
window-basic-preview.cpp
|
2018-08-17 23:13:20 -07:00
|
|
|
window-basic-about.cpp
|
2014-01-20 07:58:58 -08:00
|
|
|
window-namedialog.cpp
|
2014-05-18 17:44:10 -07:00
|
|
|
window-log-reply.cpp
|
2015-04-04 00:37:02 -07:00
|
|
|
window-projector.cpp
|
2014-09-02 19:11:55 -07:00
|
|
|
window-remux.cpp
|
2019-02-06 22:24:25 -08:00
|
|
|
auth-base.cpp
|
2018-06-02 09:45:01 -07:00
|
|
|
source-tree.cpp
|
2014-03-23 01:07:54 -07:00
|
|
|
properties-view.cpp
|
2015-03-23 19:15:19 -07:00
|
|
|
focus-list.cpp
|
2016-01-18 12:57:37 -08:00
|
|
|
menu-button.cpp
|
2015-03-17 18:33:21 -07:00
|
|
|
double-slider.cpp
|
2019-04-06 17:56:52 -07:00
|
|
|
slider-ignorewheel.cpp
|
2019-04-21 04:10:46 -07:00
|
|
|
combobox-ignorewheel.cpp
|
|
|
|
spinbox-ignorewheel.cpp
|
2019-07-07 15:47:29 -07:00
|
|
|
record-button.cpp
|
2019-10-24 21:05:43 -07:00
|
|
|
url-push-button.cpp
|
2014-05-03 22:54:38 -07:00
|
|
|
volume-control.cpp
|
2014-12-28 00:38:00 -08:00
|
|
|
adv-audio-control.cpp
|
2015-06-27 18:44:36 -07:00
|
|
|
item-widget-helpers.cpp
|
2018-04-27 19:49:48 -07:00
|
|
|
horizontal-scroll-area.cpp
|
2015-01-03 02:42:57 -08:00
|
|
|
vertical-scroll-area.cpp
|
2015-03-17 19:00:10 -07:00
|
|
|
visibility-item-widget.cpp
|
2015-04-04 06:13:48 -07:00
|
|
|
slider-absoluteset-style.cpp
|
2015-08-01 20:38:12 -07:00
|
|
|
qt-display.cpp
|
2015-01-02 17:11:27 -08:00
|
|
|
crash-report.cpp
|
2014-11-01 13:44:01 -07:00
|
|
|
hotkey-edit.cpp
|
2015-05-01 18:38:01 -07:00
|
|
|
source-label.cpp
|
2015-05-23 23:37:07 -07:00
|
|
|
remote-text.cpp
|
2015-07-02 00:52:59 -07:00
|
|
|
audio-encoders.cpp
|
2014-01-20 07:58:58 -08:00
|
|
|
qt-wrappers.cpp)
|
|
|
|
|
|
|
|
set(obs_HEADERS
|
2017-02-20 04:46:29 -08:00
|
|
|
${obs_PLATFORM_HEADERS}
|
2017-03-26 12:39:59 -07:00
|
|
|
${obs_libffutil_HEADERS}
|
2018-07-27 21:35:08 -07:00
|
|
|
../deps/json11/json11.hpp
|
2014-01-20 07:58:58 -08:00
|
|
|
obs-app.hpp
|
|
|
|
platform.hpp
|
2019-03-05 14:37:01 -08:00
|
|
|
window-dock.hpp
|
2014-01-25 08:18:40 -08:00
|
|
|
window-main.hpp
|
2014-01-20 07:58:58 -08:00
|
|
|
window-basic-main.hpp
|
2017-05-10 19:37:45 -07:00
|
|
|
window-basic-stats.hpp
|
2015-02-25 21:23:57 -08:00
|
|
|
window-basic-filters.hpp
|
2014-01-24 20:31:25 -08:00
|
|
|
window-basic-settings.hpp
|
2014-09-15 16:16:16 -07:00
|
|
|
window-basic-interaction.hpp
|
2014-03-23 01:07:54 -07:00
|
|
|
window-basic-properties.hpp
|
2017-05-06 12:13:56 -07:00
|
|
|
window-basic-auto-config.hpp
|
2015-02-06 03:17:33 -08:00
|
|
|
window-basic-main-outputs.hpp
|
2014-05-10 18:47:48 -07:00
|
|
|
window-basic-source-select.hpp
|
2018-08-17 23:13:20 -07:00
|
|
|
window-basic-about.hpp
|
2014-07-06 16:19:27 -07:00
|
|
|
window-basic-status-bar.hpp
|
2014-12-28 00:38:00 -08:00
|
|
|
window-basic-adv-audio.hpp
|
UI: Add scene editing
So, scene editing was interesting (and by interesting I mean
excruciating). I almost implemented 'manipulator' visuals (ala 3dsmax
for example), and used 3 modes for controlling position/rotation/size,
but in a 2D editing, it felt clunky, so I defaulted back to simply
click-and-drag for movement, and then took a similar though slightly
different looking approach for handling scaling and reszing.
I also added a number of menu item helpers related to positioning,
scaling, rotating, flipping, and resetting the transform back to
default.
There is also a new 'transform' dialog (accessible via menu) which will
allow you to manually edit every single transform variable of a scene
item directly if desired.
If a scene item does not have bounds active, pulling on the sides of a
source will cause it to resize it via base scale rather than by the
bounding box system (if the source resizes that scale will apply). If
bounds are active, it will modify the bounding box only instead.
How a source scales when a bounding box is active depends on the type of
bounds being used. You can set it to scale to the inner bounds, the
outer bounds, scale to bounds width only, scale to bounds height only,
and a setting to stretch to bounds (which forces a source to always draw
at the bounding box size rather than be affected by its internal size).
You can also set it to be used as a 'maximum' size, so that the source
doesn't necessarily get scaled unless it extends beyond the bounds.
Like in OBS1, objects will snap to the edges unless the control key is
pressed. However, this will now happen even if the object is rotated or
oriented in any strange way. Snapping will also occur when stretching
or changing the bounding box size.
2014-06-15 00:54:48 -07:00
|
|
|
window-basic-transform.hpp
|
|
|
|
window-basic-preview.hpp
|
2014-01-20 07:58:58 -08:00
|
|
|
window-namedialog.hpp
|
2014-05-18 17:44:10 -07:00
|
|
|
window-log-reply.hpp
|
2015-04-04 00:37:02 -07:00
|
|
|
window-projector.hpp
|
2014-09-02 19:11:55 -07:00
|
|
|
window-remux.hpp
|
2019-02-06 22:24:25 -08:00
|
|
|
auth-base.hpp
|
2018-06-02 09:45:01 -07:00
|
|
|
source-tree.hpp
|
2014-03-23 01:07:54 -07:00
|
|
|
properties-view.hpp
|
2015-08-18 05:57:36 -07:00
|
|
|
properties-view.moc.hpp
|
2014-03-23 01:07:54 -07:00
|
|
|
display-helpers.hpp
|
2018-09-02 20:17:09 -07:00
|
|
|
balance-slider.hpp
|
2015-03-17 18:33:21 -07:00
|
|
|
double-slider.hpp
|
2019-04-06 17:56:52 -07:00
|
|
|
slider-ignorewheel.hpp
|
2019-04-21 04:10:46 -07:00
|
|
|
combobox-ignorewheel.hpp
|
|
|
|
spinbox-ignorewheel.hpp
|
2015-03-23 19:15:19 -07:00
|
|
|
focus-list.hpp
|
2016-01-18 12:57:37 -08:00
|
|
|
menu-button.hpp
|
2015-03-22 14:54:50 -07:00
|
|
|
mute-checkbox.hpp
|
2019-07-07 15:47:29 -07:00
|
|
|
record-button.hpp
|
2019-10-24 21:05:43 -07:00
|
|
|
url-push-button.hpp
|
2014-05-03 22:54:38 -07:00
|
|
|
volume-control.hpp
|
2014-12-28 00:38:00 -08:00
|
|
|
adv-audio-control.hpp
|
2015-06-27 18:44:36 -07:00
|
|
|
item-widget-helpers.hpp
|
2015-03-17 18:37:51 -07:00
|
|
|
visibility-checkbox.hpp
|
2017-06-17 17:10:42 -07:00
|
|
|
locked-checkbox.hpp
|
2018-04-27 19:49:48 -07:00
|
|
|
horizontal-scroll-area.hpp
|
2018-06-02 09:45:01 -07:00
|
|
|
expand-checkbox.hpp
|
2015-01-03 02:42:57 -08:00
|
|
|
vertical-scroll-area.hpp
|
2015-03-17 19:00:10 -07:00
|
|
|
visibility-item-widget.hpp
|
2015-04-04 06:13:48 -07:00
|
|
|
slider-absoluteset-style.hpp
|
2014-01-20 07:58:58 -08:00
|
|
|
qt-display.hpp
|
2015-01-02 17:11:27 -08:00
|
|
|
crash-report.hpp
|
2014-11-01 13:44:01 -07:00
|
|
|
hotkey-edit.hpp
|
2015-05-01 18:38:01 -07:00
|
|
|
source-label.hpp
|
2015-05-23 23:37:07 -07:00
|
|
|
remote-text.hpp
|
2015-07-02 00:52:59 -07:00
|
|
|
audio-encoders.hpp
|
2018-08-17 23:13:20 -07:00
|
|
|
qt-wrappers.hpp
|
|
|
|
clickable-label.hpp)
|
2014-01-20 07:58:58 -08:00
|
|
|
|
|
|
|
set(obs_UI
|
|
|
|
forms/NameDialog.ui
|
2017-05-06 12:13:56 -07:00
|
|
|
forms/AutoConfigStartPage.ui
|
|
|
|
forms/AutoConfigVideoPage.ui
|
|
|
|
forms/AutoConfigStreamPage.ui
|
|
|
|
forms/AutoConfigTestPage.ui
|
2018-08-01 13:23:12 -07:00
|
|
|
forms/ColorSelect.ui
|
2014-05-18 17:44:10 -07:00
|
|
|
forms/OBSLogReply.ui
|
2014-01-20 07:58:58 -08:00
|
|
|
forms/OBSBasic.ui
|
UI: Add scene editing
So, scene editing was interesting (and by interesting I mean
excruciating). I almost implemented 'manipulator' visuals (ala 3dsmax
for example), and used 3 modes for controlling position/rotation/size,
but in a 2D editing, it felt clunky, so I defaulted back to simply
click-and-drag for movement, and then took a similar though slightly
different looking approach for handling scaling and reszing.
I also added a number of menu item helpers related to positioning,
scaling, rotating, flipping, and resetting the transform back to
default.
There is also a new 'transform' dialog (accessible via menu) which will
allow you to manually edit every single transform variable of a scene
item directly if desired.
If a scene item does not have bounds active, pulling on the sides of a
source will cause it to resize it via base scale rather than by the
bounding box system (if the source resizes that scale will apply). If
bounds are active, it will modify the bounding box only instead.
How a source scales when a bounding box is active depends on the type of
bounds being used. You can set it to scale to the inner bounds, the
outer bounds, scale to bounds width only, scale to bounds height only,
and a setting to stretch to bounds (which forces a source to always draw
at the bounding box size rather than be affected by its internal size).
You can also set it to be used as a 'maximum' size, so that the source
doesn't necessarily get scaled unless it extends beyond the bounds.
Like in OBS1, objects will snap to the edges unless the control key is
pressed. However, this will now happen even if the object is rotated or
oriented in any strange way. Snapping will also occur when stretching
or changing the bounding box size.
2014-06-15 00:54:48 -07:00
|
|
|
forms/OBSBasicTransform.ui
|
2015-02-25 21:23:57 -08:00
|
|
|
forms/OBSBasicFilters.ui
|
2014-03-23 01:07:54 -07:00
|
|
|
forms/OBSBasicSettings.ui
|
2014-05-10 18:47:48 -07:00
|
|
|
forms/OBSBasicSourceSelect.ui
|
2014-09-15 16:16:16 -07:00
|
|
|
forms/OBSBasicInteraction.ui
|
2019-08-08 03:27:45 -07:00
|
|
|
forms/OBSExtraBrowsers.ui
|
2017-02-20 04:46:29 -08:00
|
|
|
forms/OBSUpdate.ui
|
2018-08-17 23:13:20 -07:00
|
|
|
forms/OBSRemux.ui
|
|
|
|
forms/OBSAbout.ui)
|
2014-01-20 07:58:58 -08:00
|
|
|
|
|
|
|
set(obs_QRC
|
|
|
|
forms/obs.qrc)
|
|
|
|
|
|
|
|
qt5_wrap_ui(obs_UI_HEADERS ${obs_UI})
|
|
|
|
qt5_add_resources(obs_QRC_SOURCES ${obs_QRC})
|
|
|
|
|
|
|
|
add_executable(obs WIN32
|
|
|
|
${obs_SOURCES}
|
|
|
|
${obs_HEADERS}
|
|
|
|
${obs_UI_HEADERS}
|
|
|
|
${obs_QRC_SOURCES})
|
2014-02-02 06:16:40 -08:00
|
|
|
|
|
|
|
if(WIN32)
|
|
|
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
|
|
set(_output_suffix "64")
|
|
|
|
else()
|
|
|
|
set(_output_suffix "32")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set_target_properties(obs
|
|
|
|
PROPERTIES
|
|
|
|
OUTPUT_NAME "obs${_output_suffix}")
|
|
|
|
endif()
|
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
target_link_libraries(obs
|
|
|
|
libobs
|
2014-05-18 18:02:57 -07:00
|
|
|
Qt5::Widgets
|
2018-12-14 05:42:05 -08:00
|
|
|
Qt5::Svg
|
2016-08-28 14:24:14 -07:00
|
|
|
obs-frontend-api
|
2017-03-26 12:39:59 -07:00
|
|
|
${FFMPEG_LIBRARIES}
|
2015-05-23 23:37:07 -07:00
|
|
|
${LIBCURL_LIBRARIES}
|
2014-01-20 07:58:58 -08:00
|
|
|
${obs_PLATFORM_LIBRARIES})
|
|
|
|
|
2017-12-29 10:56:45 -08:00
|
|
|
if (APPLE)
|
2018-02-06 17:08:57 -08:00
|
|
|
target_link_libraries(obs
|
|
|
|
Qt5::MacExtras)
|
2018-01-15 18:30:56 -08:00
|
|
|
set_target_properties(obs PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
|
2017-12-29 10:56:45 -08:00
|
|
|
endif()
|
|
|
|
|
2015-01-09 11:19:22 -08:00
|
|
|
define_graphic_modules(obs)
|
|
|
|
|
2014-01-20 07:58:58 -08:00
|
|
|
install_obs_core(obs)
|
2014-07-15 06:02:03 -07:00
|
|
|
install_obs_data(obs data obs-studio)
|
2018-08-17 23:13:20 -07:00
|
|
|
install_obs_data_file(obs ../AUTHORS obs-studio/authors)
|
2014-08-02 07:12:53 -07:00
|
|
|
|
|
|
|
if (UNIX AND UNIX_STRUCTURE AND NOT APPLE)
|
2019-03-12 10:29:07 -07:00
|
|
|
add_subdirectory(xdg-data)
|
2014-08-02 07:12:53 -07:00
|
|
|
endif()
|
2016-09-03 09:15:32 -07:00
|
|
|
|
|
|
|
add_subdirectory(frontend-plugins)
|
2017-02-20 04:50:17 -08:00
|
|
|
if(WIN32)
|
|
|
|
add_subdirectory(win-update/updater)
|
|
|
|
endif()
|