musescore · ToranadoMusic · May 7, 2026 · May 7, 2026 · May 7, 2026 · May 8, 2026
diff --git a/.github/workflows/check_codestyle.yml b/.github/workflows/check_codestyle.yml
@@ -12,10 +12,11 @@ jobs:
       uses: actions/checkout@v6
       with:
         submodules: recursive
-    - name: Fetch Muse CI scripts
+
+    - name: Test MSS coding style
       run: |
-        cmake -P ./buildscripts/ci/checkcodestyle/ci_fetch.cmake
+        cmake -P ./muse/buildscripts/ci/checkcodestyle/checkcodestyle.cmake ./src/
 
-    - name: Test coding style
+    - name: Test MF coding style
       run: |
-        cmake -P ./buildscripts/ci/checkcodestyle/_deps/checkcodestyle.cmake ./src/
+        cmake -P ./muse/buildscripts/ci/checkcodestyle/checkcodestyle.cmake ./muse/framework/  
diff --git a/.vscode_template/settings.json b/.vscode_template/settings.json
@@ -16,7 +16,7 @@
     "commands": [
       {
         "match": "\\.(cpp|c|h|hpp)$",
-        "cmd": "cmake -P ${workspaceFolder}/buildscripts/tools/codestyle/format_file.cmake '${file}'"
+        "cmd": "cmake -P ${workspaceFolder}/muse/tools/codestyle/format_file.cmake '${file}'"
       }
     ]
   }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,6 +41,7 @@ set(CMAKE_MODULE_PATH
     ${CMAKE_CURRENT_LIST_DIR}/buildscripts
     ${CMAKE_CURRENT_LIST_DIR}/buildscripts/cmake
     ${MUSE_FRAMEWORK_SRC_PATH}/cmake
+    ${MUSE_FRAMEWORK_PATH}/buildscripts/cmake
     ${CMAKE_MODULE_PATH}
     )
 
@@ -97,7 +98,7 @@ option(MUE_BUILD_IMPEXP_AUDIOEXPORT_MODULE "Build importexport audioexport modul
 option(MUE_BUILD_IMPEXP_IMAGESEXPORT_MODULE "Build importexport imagesexport module" ON)
 option(MUE_BUILD_IMPEXP_GUITARPRO_MODULE "Build importexport guitarpro module" ON)
 option(MUE_BUILD_IMPEXP_MEI_MODULE "Build importexport mei module" ON)
-option(MUE_BUILD_IMPEXP_VIDEOEXPORT_MODULE "Build importexport videoexport module" OFF)
+option(MUE_BUILD_IMPEXP_VIDEOEXPORT_MODULE "Build importexport videoexport module" ON)
 option(MUE_BUILD_IMPEXP_TABLEDIT_MODULE "Build importexport tabledit module" ON)
 option(MUE_BUILD_IMPEXP_LYRICS_MODULE "Build importexport lyrics module" ON)
 
@@ -210,6 +211,8 @@ endif(MUSE_COMPILE_USE_COMPILER_CACHE)
 ###########################################
 # Setup external dependencies
 ###########################################
+set(FETCHCONTENT_QUIET OFF)
+set(FETCHCONTENT_BASE_DIR ${PROJECT_BINARY_DIR}/_deps)
 
 if (MUE_COMPILE_MACOS_PRECOMPILED_DEPS_PATH)
     list(PREPEND CMAKE_PREFIX_PATH ${MUE_COMPILE_MACOS_PRECOMPILED_DEPS_PATH})
@@ -225,6 +228,8 @@ if (MUE_DOWNLOAD_SOUNDFONT)
     include(DownloadSoundFont)
 endif(MUE_DOWNLOAD_SOUNDFONT)
 
+set(FETCHCONTENT_BASE_DIR ${PROJECT_BINARY_DIR}/_deps)
+
 include(SetupDependencies)
 
 ###########################################

diff --git a/buildscripts/ci/checkcodestyle/.gitignore b/buildscripts/ci/checkcodestyle/.gitignore
diff --git a/buildscripts/ci/checkcodestyle/ci_fetch.cmake b/buildscripts/ci/checkcodestyle/ci_fetch.cmake
diff --git a/buildscripts/ci/learn/make_playlists_info_file.sh b/buildscripts/ci/learn/make_playlists_info_file.sh
@@ -44,5 +44,7 @@ cat $ARTIFACTS_DIR/playlist.json
 
 echo "=== Make playlist for YouTube ==="
 
+pip install requests
+
 HERE="$(cd "$(dirname "$0")" && pwd)"
 python3 $HERE/make_youtube_playlist_info.py ${YOUTUBE_API_KEY} ${YOUTUBE_PLAYLIST_ID} ${ARTIFACTS_DIR}/playlist.json
diff --git a/buildscripts/cmake/SetupDependencies.cmake b/buildscripts/cmake/SetupDependencies.cmake
@@ -18,64 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-message(STATUS "Setup dependencies")
+include(MuseDeps)
 
-# Config
-include(GetPlatformInfo)
-include(GetBuildType)
+# setup framework dependences
+include(${MUSE_FRAMEWORK_PATH}/buildscripts/cmake/SetupDependencies.cmake)
 
-set(LIB_OS )
-if (OS_IS_WIN)
-    set(LIB_OS "windows")
-elseif(OS_IS_LIN)
-    set(LIB_OS "linux")
-elseif(OS_IS_FBSD)
-    set(LIB_OS "linux")
-elseif(OS_IS_MAC)
-    set(LIB_OS "macos")
-    list(LENGTH CMAKE_OSX_ARCHITECTURES arch_count)
-    if(arch_count GREATER 1)
-        set(ARCH "universal")
-    endif()
-endif()
-
-set(LIB_ARCH ${ARCH})
-
-if (BUILD_IS_RELEASE)
-    set(LIB_BUILD_TYPE "release")
-else()
-    set(LIB_BUILD_TYPE "debug")
-endif()
-
-set(REMOTE_ROOT_URL https://raw.githubusercontent.com/musescore/muse_deps/main)
-set(LOCAL_ROOT_PATH ${FETCHCONTENT_BASE_DIR})
-
-function(populate name remote_suffix)
-    set(remote_url ${REMOTE_ROOT_URL}/${remote_suffix})
-    set(local_path ${LOCAL_ROOT_PATH}/${name})
-
-    if (NOT EXISTS ${local_path}/${name}.cmake)
-        file(MAKE_DIRECTORY ${local_path})
-        file(DOWNLOAD ${remote_url}/${name}.cmake ${local_path}/${name}.cmake
-            HTTPHEADER "Cache-Control: no-cache"
-        )
-    endif()
-
-    include(${local_path}/${name}.cmake)
-
-    # func from ${name}.cmake
-    cmake_language(CALL ${name}_Populate ${remote_url} ${local_path} ${LIB_OS} ${LIB_ARCH} ${LIB_BUILD_TYPE})
-
-    get_property(include_dirs GLOBAL PROPERTY ${name}_INCLUDE_DIRS)
-    get_property(libraries GLOBAL PROPERTY ${name}_LIBRARIES)
-    get_property(install_libraries GLOBAL PROPERTY ${name}_INSTALL_LIBRARIES)
-
-    set(${name}_INCLUDE_DIRS ${include_dirs} PARENT_SCOPE)
-    set(${name}_LIBRARIES ${libraries} PARENT_SCOPE)
-    set(${name}_INSTALL_LIBRARIES ${install_libraries} PARENT_SCOPE)
-
-endfunction()
-
-if (MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2)
-    populate(kddockwidgets "kddockwidgets/2.4")
-endif()
+# add a list of local dependencies here
diff --git a/docs/video-sync-native-proposal.md b/docs/video-sync-native-proposal.md
@@ -0,0 +1,69 @@
+# Native Video Sync Proposal
+
+## Goal
+
+Add a native reference-video workflow to MuseScore Studio so users can compose against picture, keep video playback aligned with the score playhead, and control video audio through MuseScore playback controls.
+
+## Initial Scope
+
+The first implementation should stay intentionally narrow:
+
+- attach one local video file to a score,
+- store video path and offset metadata with the score,
+- show a dockable video panel,
+- sync play, pause, stop, and seek to MuseScore playback,
+- provide video volume and mute controls.
+
+Mixer-level solo and full audio-graph routing should follow after the playback and score-persistence model is accepted.
+
+## User Workflow
+
+1. The user chooses an Attach Video action.
+2. MuseScore stores a reference to the selected video and opens a Video panel.
+3. When score playback starts, the video starts at the matching score time plus offset.
+4. When playback pauses or seeks, the video follows.
+5. The user can nudge offset in milliseconds while working.
+6. If the video is missing, MuseScore asks the user to relink it.
+
+## Architecture Direction
+
+### Score Metadata
+
+Store score-level attachment data for:
+
+- video file path,
+- offset in milliseconds,
+- volume,
+- mute state,
+- future relink identity such as file hash or original file name.
+
+Prefer relative paths when the video is near the score file. Do not embed video data by default.
+
+### Playback Sync
+
+Add a video sync controller that listens to transport state and maps score playback position to video time. The controller should own drift correction rather than putting timing behavior in QML.
+
+### UI
+
+Add a dockable Video panel that uses the existing UI/dock registration patterns. The panel should be able to attach, detach, relink, play/pause through the global transport, and nudge offset.
+
+### Audio
+
+The MVP can begin with video-local mute and volume if needed. The release-quality target is a real Video source in MuseScore's audio/mixer layer so mute and solo behave like other playback channels.
+
+## Open Questions
+
+- Which existing score-project metadata layer is preferred for external media attachments?
+- Which playback service should be the source of truth for elapsed score time?
+- Is Qt Multimedia acceptable for the video decode/display layer on all supported platforms?
+- Should video support be hidden behind an experimental flag while audio routing is incomplete?
+- Should video audio participate in audio export, or should export be a later milestone?
+
+## Suggested Patch Sequence
+
+1. Add score/project metadata for an optional video attachment.
+2. Add an inert internal video sync model and tests for persistence.
+3. Add the Video panel UI.
+4. Wire the panel to playback transport.
+5. Add audio controls.
+6. Add proper mixer/audio routing.
diff --git a/mftool.sh b/mftool.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash 
+
+
+MF_ORIGIN_URL=https://github.com/musescore/muse_framework.git
+MF_FORK_URL=""
+TASK=""
+
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        -f|--fork) MF_FORK_URL="$2"; shift ;;
+        -t|--task) TASK="$2"; shift ;;
+        *) echo "Unknown parameter passed: $1"; exit 1 ;;
+    esac
+    shift
+done
+
+if [ -z "$MF_FORK_URL" ]; then MF_FORK_URL=$(cat mf_fork_url.local); fi
+if [ -z "$MF_FORK_URL" ]; then echo "error: not set MF_FORK_URL"; exit 1; fi
+
+if [ -z "$TASK" ]; then echo "error: not set TASK"; exit 1; fi
+
+echo "MF_FORK_URL: $MF_FORK_URL"
+echo "TASK: $TASK"
+
+
+function use_fork() {
+    git submodule set-url muse $MF_FORK_URL
+    cd muse
+    git remote set-url origin $MF_FORK_URL
+    git remote remove upstream
+    git remote add upstream $MF_ORIGIN_URL
+    git remote -v
+    cd ..
+}
+
+function use_origin() {
+    git submodule set-url muse $MF_ORIGIN_URL
+    git submodule update --init
+    cd muse
+    git remote set-url origin $MF_ORIGIN_URL
+    git remote remove upstream
+    git remote -v
+    cd ..
+}
+
+case "$TASK" in
+    "use-fork")
+        use_fork
+        ;;
+    "use-origin")
+        use_origin
+        ;;
+    "sync-origin")
+        use_origin
+        git submodule update --init --remote ./muse
+        ;;    
+    *) echo "Unknown task: $TASK"; exit 1 ;;
+esac
diff --git a/muse b/muse
diff --git a/ninja_build.sh b/ninja_build.sh
@@ -46,7 +46,6 @@ MUSESCORE_ENABLE_CODE_COVERAGE=${MUSESCORE_UNIT_TESTS_ENABLE_CODE_COVERAGE:-"OFF
 MUSESCORE_NO_RPATH=${MUSESCORE_NO_RPATH:-"OFF"}
 MUSESCORE_MODULE_UPDATE=${MUSESCORE_MODULE_UPDATE:-"ON"}
 MUSESCORE_BUILD_VST_MODULE=${MUSESCORE_BUILD_VST_MODULE:-"OFF"}
-MUSESCORE_BUILD_IMPEXP_VIDEOEXPORT_MODULE=${MUSESCORE_BUILD_IMPEXP_VIDEOEXPORT_MODULE:-"OFF"}
 MUSESCORE_BUILD_WEBSOCKET=${MUSESCORE_BUILD_WEBSOCKET:-"OFF"}
 MUSESCORE_BUILD_PIPEWIRE_AUDIO_DRIVER=${MUSESCORE_BUILD_PIPEWIRE_AUDIO_DRIVER:-"OFF"}
 MUSESCORE_COMPILE_USE_UNITY=${MUSESCORE_COMPILE_USE_UNITY:-"ON"}
@@ -92,7 +91,6 @@ function do_build() {
         -DCMAKE_BUILD_NUMBER="${MUSESCORE_BUILD_NUMBER}" \
         -DMUSESCORE_REVISION="${MUSESCORE_REVISION}" \
         -DMUE_RUN_LRELEASE="${MUSESCORE_RUN_LRELEASE}" \
-        -DMUE_BUILD_IMPEXP_VIDEOEXPORT_MODULE="${MUSESCORE_BUILD_IMPEXP_VIDEOEXPORT_MODULE}" \
         -DMUSE_MODULE_UPDATE="${MUSESCORE_MODULE_UPDATE}" \
         -DMUE_DOWNLOAD_SOUNDFONT="${MUSESCORE_DOWNLOAD_SOUNDFONT}" \
         -DMUSE_ENABLE_UNIT_TESTS="${MUSESCORE_BUILD_UNIT_TESTS}" \
@@ -170,7 +168,6 @@ case $TARGET in
             -DCMAKE_BUILD_NUMBER="${MUSESCORE_BUILD_NUMBER}" \
             -DMUSESCORE_REVISION="${MUSESCORE_REVISION}" \
             -DMUE_RUN_LRELEASE="${MUSESCORE_RUN_LRELEASE}" \
-            -DMUE_BUILD_IMPEXP_VIDEOEXPORT_MODULE="${MUSESCORE_BUILD_IMPEXP_VIDEOEXPORT_MODULE}" \
             -DMUSE_MODULE_UPDATE="${MUSESCORE_MODULE_UPDATE}" \
             -DMUE_DOWNLOAD_SOUNDFONT="${MUSESCORE_DOWNLOAD_SOUNDFONT}" \
             -DMUSE_ENABLE_UNIT_TESTS="${MUSESCORE_BUILD_UNIT_TESTS}" \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+
 # Modules must be listed in dependency order
 if (MUE_BUILD_BRAILLE_MODULE)
     add_subdirectory(braille)

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -131,6 +131,7 @@ add_to_link_if_exists(muse::extensions)
 add_to_link_if_exists(muse::interactive)
 add_to_link_if_exists(muse::languages)
 add_to_link_if_exists(muse::learn)
+add_to_link_if_exists(muse::media)
 add_to_link_if_exists(muse::midi)
 add_to_link_if_exists(muse::midiremote)
 add_to_link_if_exists(muse::mpe)

diff --git a/src/app/appfactory.cpp b/src/app/appfactory.cpp
@@ -50,6 +50,12 @@
 #include "framework/stubs/learn/learnmodule.h"
 #endif
 
+#ifdef MUSE_MODULE_MEDIA
+#include "framework/media/mediamodule.h"
+#else
+#include "framework/stubs/media/mediastubmodule.h"
+#endif
+
 #ifdef MUSE_MODULE_MIDI
 #include "framework/midi/midimodule.h"
 #else
@@ -344,6 +350,7 @@ std::shared_ptr<muse::IApplication> AppFactory::newGuiApp(const std::shared_ptr<
 #endif
     app->addModule(new muse::tours::ToursModule());
     app->addModule(new muse::vst::VSTModule());
+    app->addModule(new muse::media::MediaModule());
 
 // modules
 #ifdef MUE_BUILD_APPSHELL_MODULE

diff --git a/src/app/cmdoptions.h b/src/app/cmdoptions.h
@@ -45,6 +45,7 @@ struct MuseScoreCmdOptions : public muse::CmdOptions {
         ExtensionUri,
         PageNumber,
         ScoreRegion,
+        NoAudio,
     };
 
     struct {

diff --git a/src/app/configs/data/shortcuts.xml b/src/app/configs/data/shortcuts.xml
@@ -767,6 +767,11 @@
     <seq>F12</seq>
     <autorepeat>0</autorepeat>
     </SC>
+  <SC>
+    <key>toggle-video-panel</key>
+    <seq>Ctrl+Alt+V</seq>
+    <autorepeat>0</autorepeat>
+    </SC>
   <SC>
     <key>quit</key>
     <seq>Ctrl+Q</seq>

diff --git a/src/app/configs/data/shortcuts_azerty.xml b/src/app/configs/data/shortcuts_azerty.xml
@@ -808,6 +808,11 @@
     <seq>F12</seq>
     <autorepeat>0</autorepeat>
     </SC>
+  <SC>
+    <key>toggle-video-panel</key>
+    <seq>Ctrl+Alt+V</seq>
+    <autorepeat>0</autorepeat>
+    </SC>
   <SC>
     <key>quit</key>
     <seq>Ctrl+Q</seq>

diff --git a/src/app/configs/data/shortcuts_mac.xml b/src/app/configs/data/shortcuts_mac.xml
@@ -767,6 +767,11 @@
     <seq>F12</seq>
     <autorepeat>0</autorepeat>
     </SC>
+  <SC>
+    <key>toggle-video-panel</key>
+    <seq>Ctrl+Alt+V</seq>
+    <autorepeat>0</autorepeat>
+    </SC>
   <SC>
     <key>quit</key>
     <seq>Ctrl+Q</seq>