Skip to content

Commit 098d4a7

Browse files
authored
Merge pull request #36 from diffscope/refactor-dspxmodel
Refactor dspxmodel
2 parents 23413de + 057bb1d commit 098d4a7

282 files changed

Lines changed: 1645 additions & 18249 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@
2929
[submodule "opendspx"]
3030
path = src/libs/3rdparty/opendspx
3131
url = ../../diffscope/opendspx.git
32+
[submodule "src/libs/3rdparty/dspxmodel"]
33+
path = src/libs/3rdparty/dspxmodel
34+
url = git@github.com:diffscope/dspxmodel.git

scripts/vcpkg-manifest/vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
},
3030
"wolf-midi",
3131
"nlohmann-json",
32-
"zstd"
32+
"zstd",
33+
"opendspx"
3334
],
3435
"vcpkg-configuration": {
3536
"overlay-ports": [

src/libs/3rdparty/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ set(QAK_AEC_EXECUTABLE "$<TARGET_FILE:qak_aec>" PARENT_SCOPE)
2929
set(QAK_AEC_EXECUTABLE "$<TARGET_FILE:qak_aec>")
3030
include("${CMAKE_CURRENT_LIST_DIR}/qactionkit/src/QActionKitMacros.cmake")
3131

32+
set(TALCS_DSPX ON)
33+
set(TALCS_WIDGETS ON)
3234
add_subdirectory(talcs)
3335

34-
add_subdirectory(opendspx)
36+
add_subdirectory(dspxmodel)

src/libs/3rdparty/dspxmodel

Submodule dspxmodel added at 5becf08

src/libs/3rdparty/opendspx

Submodule opendspx deleted from b250ad9

src/libs/application/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ add_subdirectory(loadapi)
22

33
add_subdirectory(uishell)
44

5-
add_subdirectory(dspxmodel)
6-
75
add_subdirectory(transactional)

src/libs/application/dspxmodel/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/libs/application/dspxmodel/src/AnchorNode.cpp

Lines changed: 0 additions & 138 deletions
This file was deleted.

src/libs/application/dspxmodel/src/AnchorNode.h

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)