20240907 osc 2

CMakeLists.txt

@@ -1065,6 +1065,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/preferences/dialog/dlgpreflibrarydlg.ui
   src/preferences/dialog/dlgprefmixer.cpp
   src/preferences/dialog/dlgprefmixerdlg.ui
+  src/preferences/dialog/dlgprefosc.cpp
+  src/preferences/dialog/dlgprefoscdlg.ui
   src/preferences/dialog/dlgprefrecord.cpp
   src/preferences/dialog/dlgprefrecorddlg.ui
   src/preferences/dialog/dlgprefreplaygain.cpp
@@ -1739,6 +1741,15 @@ if(WIN32)
   # shoutidjc/shout.h checks for WIN32 to see if we are on Windows.
   target_compile_definitions(mixxx-lib PUBLIC WIN32)
 
+  # Add the static library 'Lib.lib', marking it as an IMPORT.
+#add_library(MyLib STATIC IMPORTED)
+# Define the location of the library dependency.
+#set(MYLIB_FILE_PATH "D:/mixxx-git/mixxx/src/oscpack.lib")
+#set(MYLIB_FILE_PATH "src/oscpack.lib")
+# Tell CMake where to find the library.
+#set_target_properties(MyLib PROPERTIES IMPORTED_LOCATION ${MYLIB_FILE_PATH})
+#target_link_libraries(mixxx-lib PRIVATE comctl32 shell32 oscpack)
+
   target_link_libraries(mixxx-lib PRIVATE comctl32 shell32)
 
   if(MSVC)
@@ -2163,6 +2174,7 @@ add_executable(mixxx-test
   src/util/moc_included_test.cpp
   src/test/helpers/log_test.cpp
 )
+
 if (QML)
   target_sources(mixxx-test PRIVATE
     src/test/controller_mapping_file_handler_test.cpp
@@ -2282,6 +2294,21 @@ if(WIN32)
   )
   target_include_directories(mixxx PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
 endif()
+# liblo
+#find_package(liblo REQUIRED)
+#target_link_libraries(mixxx-lib PRIVATE liblo::liblo)
+
+# Add the static library 'Lib.lib', marking it as an IMPORT.
+#add_library(MyLib STATIC IMPORTED)
+# Define the location of the library dependency.
+#set(MYLIB_FILE_PATH "D:/mixxx-git/mixxx/src/oscpack.lib")
+# Tell CMake where to find the library.
+#set_target_properties(MyLib PROPERTIES IMPORTED_LOCATION ${MYLIB_FILE_PATH})
+
+# oscpack
+#find_package(oscpack REQUIRED)
+#target_link_libraries(mixxx-lib oscpack)
+
 
 # Chromaprint
 find_package(Chromaprint REQUIRED)
@@ -2555,6 +2582,44 @@ add_library(rekordbox_metadata STATIC EXCLUDE_FROM_ALL
 target_include_directories(rekordbox_metadata SYSTEM PUBLIC lib/rekordbox-metadata)
 target_link_libraries(mixxx-lib PRIVATE rekordbox_metadata)
 
+IF(WIN32)
+	 set(IpSystemTypePath src/ip/win32)
+#	 set(LIBS ${LIBS} Ws2_32 winmm)
+	ELSE(WIN32)
+	 set(IpSystemTypePath src/ip/posix)
+	ENDIF(WIN32)
+
+#eve osc
+ADD_LIBRARY(oscpack
+	src/ip/IpEndpointName.h
+	src/ip/IpEndpointName.cpp
+	src/ip/NetworkingUtils.h
+	${IpSystemTypePath}/NetworkingUtils.cpp
+#	src/ip/win32/NetworkingUtils.cpp
+	src/ip/UdpSocket.h
+	${IpSystemTypePath}/UdpSocket.cpp
+#	src/ip/win32/UdpSocket.cpp
+	src/ip/PacketListener.h
+	src/ip/TimerListener.h
+	src/osc/OscTypes.h
+	src/osc/OscTypes.cpp
+	src/osc/OscHostEndianness.h
+	src/osc/OscException.h
+	src/osc/OscPacketListener.h
+	src/osc/MessageMappingOscPacketListener.h
+	src/osc/OscReceivedElements.h
+	src/osc/OscReceivedElements.cpp
+	src/osc/OscPrintReceivedElements.h
+	src/osc/OscPrintReceivedElements.cpp
+	src/osc/OscOutboundPacketStream.h
+	src/osc/OscOutboundPacketStream.cpp
+	)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+#target_link_libraries(mixxx oscpack ${LIBS})
+target_include_directories(mixxx-lib SYSTEM PRIVATE ip)
+target_include_directories(mixxx-lib SYSTEM PRIVATE osc)
+target_link_libraries(mixxx-lib PRIVATE oscpack)
+
 #silence "enumeration values not handled in switch" in generated code
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     target_compile_options(rekordbox_metadata PRIVATE -Wno-switch)
@@ -2784,6 +2849,7 @@ if(QML)
     src/qml/qmlplayermanagerproxy.cpp
     src/qml/qmlplayerproxy.cpp
     src/qml/qmlvisibleeffectsmodel.cpp
+    src/qml/qmlchainpresetmodel.cpp
     src/qml/qmlwaveformoverview.cpp
     # The following sources need to be in this target to get QML_ELEMENT properly interpreted
     src/control/controlmodel.cpp
@@ -3465,6 +3531,7 @@ if (STEM)
     src/sources/soundsourcestem.cpp
     src/track/steminfoimporter.cpp
     src/track/steminfo.cpp
+    src/widget/wstemcontrol.cpp
   )
   if(QOPENGL)
     target_sources(mixxx-lib PRIVATE