kenmcgaugh · kenmcgaugh · Nov 14, 2025 · Nov 15, 2025 · Nov 15, 2025 · Nov 15, 2025
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,10 @@
 ._*
 .gitignore
 .vscode/
+build_*
 __*__
 ignore/
-python/src/xstudio.egg-info/
+*.egg-info/
 python/test/xstudio.log
 docs/conf.py
 python/src/xstudio/version.py
@@ -14,3 +15,4 @@ python/src/xstudio/version.py
 /build/
 xstudio_install/
 **/qml/*_qml_export.h
+CMakeUserPresets.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,24 +16,28 @@ option(ENABLE_CLANG_TIDY "Enable clang-tidy, ninja clang-tidy." OFF)
 option(ENABLE_CLANG_FORMAT "Enable clang format, ninja clangformat." OFF)
 option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." TRUE)
 option(OPTIMIZE_FOR_NATIVE "Build with -march=native" OFF)
-option(BUILD_RESKIN "Build xstudio reskin binary" ON)
 option(OTIO_SUBMODULE "Automatically build OpenTimelineIO as a submodule" OFF)
 option(USE_VCPKG "Use Vcpkg for package management" OFF)
 option(BUILD_PYSIDE_WIDGETS "Build xstudio player as PySide widget" OFF)
+option(OPENIMAGEIO_PLUGIN "Include the OpenImageIO PLugin" ON)
 
 if(WIN32)
     set(USE_VCPKG ON)
     #include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/vcpkg.cmake)
     set(CMAKE_CXX_FLAGS_DEBUG "/Zi /Ob0 /Od /Oy-")
-    add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
+    # /MP is for MSBuild which parallelizes at project level.
+    # Ninja parallelizes at file level, so /MP would over-subscribe CPUs.
+    if(NOT CMAKE_GENERATOR STREQUAL "Ninja")
+        add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
+    endif()
     # enable UUID System Generator
     add_definitions(-DUUID_SYSTEM_GENERATOR=ON)
 endif()
 
 set(STUDIO_PLUGINS "" CACHE STRING "Enable compilation of SITE plugins")
 
 if (("${CMAKE_GENERATOR}" MATCHES "Makefiles" OR ("${CMAKE_GENERATOR}" MATCHES "Ninja" AND NOT WIN32)) AND NOT __CHECKED_CXX_FLAGS)
-    set(__CHECKED_CXX_FLAGS TRUE CACHE INTERNAL "Whether we checked the CXX flags already")
+  set(__CHECKED_CXX_FLAGS TRUE CACHE INTERNAL "Whether we checked the CXX flags already")
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_GCC}" CACHE STRING "" FORCE)
 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_GCC}" CACHE STRING "" FORCE)
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_GCC}" CACHE STRING "" FORCE)
@@ -103,8 +107,8 @@ if (USE_SANITIZER STREQUAL "Address")
     if(MSVC)
         target_compile_options(<target> PUBLIC /fsanitize=address)
     else()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
         set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fsanitize=address")
     endif()
@@ -203,7 +207,7 @@ if (USE_VCPKG)
     message(FATAL_ERROR "Failed to ensurepip.")
   else()
     execute_process(
-      COMMAND "${Python_EXECUTABLE}" -m pip install setuptools sphinx breathe sphinx-rtd-theme OpenTimelineIO-Plugins importlib_metadata zipp
+      COMMAND "${Python_EXECUTABLE}" -m pip install setuptools sphinx breathe sphinx-rtd-theme OpenTimelineIO-Plugins importlib_metadata zipp numpy
       RESULT_VARIABLE PIP_RESULT
     )
     if(PIP_RESULT)
@@ -295,7 +299,7 @@ if(INSTALL_XSTUDIO)
 
 endif ()
 
-if(USE_VCPKG)
+if (USE_VCPKG)
   # To provide reliable ordering, we need to make this install script happen in a subdirectory.
   # Otherwise, Qt deploy will happen before we have the rest of the application deployed.
   add_subdirectory("scripts/qt_install")
@@ -343,11 +347,11 @@ if (WIN32)
       WriteRegStr HKCR 'XStudioSession\\\\DefaultIcon' \\\\
                         '' '$INSTDIR\\\\bin\\\\xstudio.exe,0'
       WriteRegStr HKCR 'XStudioSession\\\\shell\\\\open\\\\command' \\\\
-                        '' '$INSTDIR\\\\bin\\\\xstudio.exe \\"%1\\"'
+                        '' '$INSTDIR\\\\bin\\\\xstudio.exe \\\"%1\\\"'
       WriteRegStr HKCR 'XStudioSession\\\\shell\\\\edit' \\\\
                         '' 'Edit xSTUDIO Session File'
       WriteRegStr HKCR 'XStudioSession\\\\shell\\\\edit\\\\command' \\\\
-                        '' '$INSTDIR\\\\bin\\\\xstudio.exe \\"%1\\"'
+                        '' '$INSTDIR\\\\bin\\\\xstudio.exe \\\"%1\\\"'
       System::Call \\\\
         'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)'
       ")

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -7,11 +7,12 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
-        "Qt6_DIR": "/Users/tedwaine/Qt6/6.5.3/macos/lib/cmake/Qt6",
+        "Qt6_DIR": "C://Qt6/6.5.3/msvc2019_64/lib/cmake/Qt6",
         "CMAKE_INSTALL_PREFIX": "xstudio_install",
         "X_VCPKG_APPLOCAL_DEPS_INSTALL": "ON",
         "BUILD_DOCS": "OFF",
-        "USE_VCPKG": "ON"
+        "USE_VCPKG": "ON",
+        "STUDIO_PLUGINS": ""
       }
     },
     { 
@@ -49,6 +50,39 @@
         "USE_SANITIZER": "address"
       }
     },
+    {
+      "name": "windows-ninja-base",
+      "inherits": "default",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "hidden": true,
+      "generator": "Ninja"
+    },
+    {
+      "name": "WinNinjaRelease",
+      "inherits": ["windows-ninja-base"],
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "WinNinjaRelWithDebInfo",
+      "inherits": ["windows-ninja-base"],
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "USE_SANITIZER": "address"
+      }
+    },
+    {
+      "name": "WinNinjaDebug",
+      "inherits": ["windows-ninja-base"],
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
     { 
       "name": "macos-base-arm",
       "condition": {

diff --git a/README.md b/README.md
@@ -14,19 +14,19 @@ This release of xSTUDIO can be built on various Linux flavours, Microsoft Window
 
 ### Building xSTUDIO for Linux
 
-* [Linux Generic](docs/build_guides/linux_generic.md) 
-* [CentOS 7](docs/build_guides/centos_7.md)
-* [Rocky Linux 9.1](docs/build_guides/rocky_linux_9_1.md)
-* [Ubuntu 22.04](docs/build_guides/ubuntu_22_04.md)
+* [Linux Generic](docs/reference/build_guides/linux_generic.md)
+* [CentOS 7](docs/reference/build_guides/centos_7.md)
+* [Rocky Linux 9.1](docs/reference/build_guides/rocky_linux_9_1.md)
+* [Ubuntu 22.04](docs/reference/build_guides/ubuntu_22_04.md)
 
 ### Building xSTUDIO for Windows 10 & 11
 
-* [Windows](docs/build_guides/windows.md)
+* [Windows](docs/reference/build_guides/windows.md)
 
 ### Building xSTUDIO for MacOS
 
-* [MacOS](docs/build_guides/macos.md)
+* [MacOS](docs/reference/build_guides/macos.md)
 
 ### Documentation Note
 
-Note that the xSTUDIO user guide is built with Sphinx using the Read-The-Docs theme. The package dependencies for building the docs can be challenging to install so we instead include the fully built docs as part of xSTUDIO's repo, as well as the source for building the docs. Our build set-up by default disables the building of the docs to make life easy!
+Note that the xSTUDIO user guide is built with Sphinx using the Read-The-Docs theme. The package dependencies for building the docs can be challenging to install so we instead include the fully built docs as part of xSTUDIO's repo, as well as the source for building the docs. Our build set-up by default disables the building of the docs to make life easy!
diff --git a/docs/Doxyfile b/docs/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "xStudio"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.1.0"
+PROJECT_NUMBER         = "0.0.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = "/user_data/ted/dev/xstudio/__build/docs/docs/doxygen"
+OUTPUT_DIRECTORY       = "_build/doxygen"
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -731,7 +731,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # messages should be written. If left blank the output is written to standard
 # error (stderr).
 
-WARN_LOGFILE           = "/user_data/ted/dev/xstudio/__build/docs/docs/doxygen/log.txt
+WARN_LOGFILE           = "_build/doxygen/log.txt
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -743,9 +743,9 @@ WARN_LOGFILE           = "/user_data/ted/dev/xstudio/__build/docs/docs/doxygen/l
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = "/user_data/ted/dev/xstudio/include/" \
-                         "/user_data/ted/dev/xstudio/src/" \
-                         "/user_data/ted/dev/xstudio/python/src/"
+INPUT                  = "../include/" \
+                         "../src/" \
+                         "../python/src/"
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

diff --git a/docs/conf.py b/docs/conf.py
@@ -50,6 +50,9 @@
 autosummary_generate = False
 
 breathe_default_project = "xStudio"
+breathe_projects = {
+    "xStudio": "_build/doxygen/xml"
+}
 
 
 # Add any paths that contain templates here, relative to this directory.
@@ -76,9 +79,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.0'
+version = '0.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '0.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/conf.py.in b/docs/conf.py.in
@@ -50,6 +50,9 @@ autodoc_default_flags = ['members']
 autosummary_generate = False
 
 breathe_default_project = "xStudio"
+breathe_projects = {
+    "xStudio": "@DOXYGEN_OUTPUT_DIR@/xml"
+}
 
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/docs/reference/build_guides/linux_generic.md b/docs/reference/build_guides/linux_generic.md
@@ -12,10 +12,11 @@ Follow [these instructions](downloading_qt.md) - ensuring that you download the
 
 ### Download the VCPKG repo
 
-To build xSTUDIO we need a number of other open source software packages. We use the VCPKG package manager to do this. All that we need to do is download the repo and run the bootstrap script before we build xstudio.
+To build xSTUDIO we need a number of other open source software packages. We use the VCPKG package manager to do this. All that we need to do is download the repo, run the bootstrap script and then switch to a specific git commit before we build xstudio. Run these commands in the Powershell:
 
     git clone https://github.com/microsoft/vcpkg.git
     ./vcpkg/bootstrap-vcpkg.sh
+    git checkout c2aeddd80357b17592e59ad965d2adf65a19b22f
 
 ### Download the xSTUDIO repo
 

diff --git a/docs/reference/build_guides/macos.md b/docs/reference/build_guides/macos.md
@@ -24,12 +24,18 @@ We require 5 packages to be installed to proceed. Run these commands in a termin
 
 Follow [these instructions](downloading_qt.md)
 
+> **NOTE:** Since Xcode version 26.X our specified version of Qt (6.5.3) is not strictly compatible with MacOS and you may see an error when you run the first 'cmake' command below. There are two options to resolve this. You can download Qt version 6.8.3 and use this instead of 6.5.3. Alternatively, open the file 'FindWrapOpenGL.cmake' within the Qt installation (at 6.5.3/macos/lib/cmake) and comment out lines 48 and 49 so that they look like this:
+
+    #target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path})
+    #target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_agl_fw_path})
+
 ### Download the VCPKG repo
 
-To build xSTUDIO we need a number of other open source software packages. We use the VCPKG package manager to do this. All that we need to do is download the repo and run the bootstrap script before we build xstudio.
+To build xSTUDIO we need a number of other open source software packages. We use the VCPKG package manager to do this. All that we need to do is download the repo, run the bootstrap script and then switch to a specific git commit before we build xstudio. Run these commands in a terminal:
 
     git clone https://github.com/microsoft/vcpkg.git
     ./vcpkg/bootstrap-vcpkg.sh
+    git checkout c2aeddd80357b17592e59ad965d2adf65a19b22f
 
 ### Download the xSTUDIO repo
 

diff --git a/docs/reference/build_guides/windows.md b/docs/reference/build_guides/windows.md
@@ -29,10 +29,11 @@ Start a Windows Powershell to continue these instructions, where you must run a
     mkdir dev
     cd dev
 
-To build xSTUDIO we need a number of other open source software packages. We use the VCPKG package manager to do this. All that we need to do is download the repo and run the bootstrap script before we build xstudio. Run these commands in the Powershell:
+To build xSTUDIO we need a number of other open source software packages. We use the VCPKG package manager to do this. All that we need to do is download the repo, run the bootstrap script and then switch to a specific git commit before we build xstudio. Run these commands in the Powershell:
 
     git clone https://github.com/microsoft/vcpkg.git
     ./vcpkg/bootstrap-vcpkg.bat
+    git checkout c2aeddd80357b17592e59ad965d2adf65a19b22f
 
 ### Download the xSTUDIO repo
 
@@ -68,3 +69,22 @@ When this has finished, you can build xSTUDIO with this command. Note the value
 
 If the build is successful, you should have an exectuable in the 'build' folder called something like 'xSTUDIO-1.0.0-win64.exe'. This can be executed to start the xSTUDIO installer.
 
+### Alternative: Build with Ninja (faster builds)
+
+Ninja is significantly faster than MSBuild as it parallelises at the file level. Both Ninja and cmake are included with Visual Studio's CMake tools, so no separate install is needed.
+
+First, set up the Visual Studio build environment in your Powershell session. This puts the MSVC compiler, cmake and ninja on your PATH:
+
+    Import-Module "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
+    Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\Community" -Arch amd64
+
+Run the cmake command to configure for building. Note that this cmake command ***may take several hours to complete***. This is because xSTUDIO's dependencies (particularly ffmpeg) take a long time to download and build from the source code, which is what VCPKG is doing.
+
+    cmake -B build --preset WinNinjaRelease
+
+When this has finished, you can build xSTUDIO with this command. Ninja handles parallelism automatically so there is no need for the `--parallel` flag.
+
+    cmake --build build
+
+If the build is successful, you should have an executable in the 'build' folder called something like 'xSTUDIO-1.0.0-win64.exe'. This can be executed to start the xSTUDIO installer.
+