Skip to content

Commit 87de19a

Browse files
committed
GUI - remove old API code
1 parent bccb6b6 commit 87de19a

File tree

7 files changed

+34
-597
lines changed

7 files changed

+34
-597
lines changed

app/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1111
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1212
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1313

14-
#set (QT_OLD_API 1)
15-
1614
if(APPLE)
1715
set(CMAKE_OSX_DEPLOYMENT_TARGET '10.13')
1816
endif()
@@ -38,4 +36,3 @@ configure_file(${APP_ROOT}/cmake/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
3836
add_subdirectory(api)
3937
add_subdirectory(api-tests)
4038
add_subdirectory(gui)
41-

app/gui/qt/CMakeLists.txt

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -46,39 +46,12 @@ add_subdirectory(QScintilla-2.11.6)
4646
set(APP_NAME sonic-pi)
4747
set(MACOS_APP_NAME "Sonic Pi")
4848

49-
if (QT_OLD_API)
50-
set(OLD_API_SOURCES
51-
${QTAPP_ROOT}/osc/oschandler.cpp
52-
${QTAPP_ROOT}/osc/oscsender.cpp
53-
${QTAPP_ROOT}/osc/sonic_pi_osc_server.cpp
54-
${QTAPP_ROOT}/osc/sonic_pi_udp_osc_server.cpp
55-
${QTAPP_ROOT}/osc/sonic_pi_tcp_osc_server.cpp
56-
${QTAPP_ROOT}/osc/oscpkt.hh
57-
${QTAPP_ROOT}/osc/udp.hh
58-
${QTAPP_ROOT}/osc/oschandler.h
59-
${QTAPP_ROOT}/osc/oscsender.h
60-
${QTAPP_ROOT}/osc/sonic_pi_osc_server.h
61-
${QTAPP_ROOT}/osc/sonic_pi_udp_osc_server.h
62-
${QTAPP_ROOT}/osc/sonic_pi_tcp_osc_server.h
63-
64-
${QTAPP_ROOT}/visualizer/scope.cpp
65-
${QTAPP_ROOT}/visualizer/scope.h
66-
${QTAPP_ROOT}/visualizer/scope_buffer.hpp
67-
${QTAPP_ROOT}/visualizer/server_shm.hpp
68-
69-
${APP_ROOT}/external/kiss_fft/kiss_fft.c
70-
${APP_ROOT}/external/kiss_fft/kiss_fft.h
71-
)
72-
endif()
73-
74-
if (NOT QT_OLD_API)
75-
set(NEW_API_SOURCES
49+
set(NEW_API_SOURCES
7650
${QTAPP_ROOT}/qt_api_client.cpp
7751
${QTAPP_ROOT}/qt_api_client.h
7852
${QTAPP_ROOT}/visualizer/scope_window.cpp
7953
${QTAPP_ROOT}/visualizer/scope_window.h
8054
)
81-
endif()
8255

8356
set(EDITOR_SOURCES
8457
${QTAPP_ROOT}/widgets/sonicpiscintilla.cpp

0 commit comments

Comments
 (0)