Split RemotePlugin.h into separate files (#6322)

plugins/vst_base/RemoteVstPlugin.cpp

@@ -33,9 +33,7 @@
 
 #include "lmmsconfig.h"
 
-#define BUILD_REMOTE_PLUGIN_CLIENT
-
-#include "RemotePlugin.h"
+#include "RemotePluginClient.h"
 
 #ifdef LMMS_HAVE_FCNTL_H
 #include <fcntl.h>

plugins/vst_base/RemoteVstPlugin/CMakeLists.txt

@@ -22,6 +22,8 @@ FOREACH( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
 	SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 ENDFOREACH()
 
+ADD_SUBDIRECTORY("${LMMS_SOURCE_DIR}/src/common" common)
+
 if(NOT IS_WIN)
 set(EXE_NAME NativeLinuxRemoteVstPlugin${BITNESS})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/")
@@ -30,6 +32,7 @@ set(EXE_NAME RemoteVstPlugin${BITNESS})
 endif()
 add_executable(${EXE_NAME} WIN32
 	../RemoteVstPlugin.cpp
+	${LMMS_COMMON_SRCS}
 )
 if(IS_WIN)
     target_link_libraries(${EXE_NAME} ole32)
@@ -44,6 +47,8 @@ target_include_directories(${EXE_NAME}
 		"${LMMS_BINARY_DIR}"
 )
 
+target_compile_definitions(${EXE_NAME} PRIVATE BUILD_REMOTE_PLUGIN_CLIENT)
+
 # Workaround for missing WinMain
 if(MSVC)
 	set_property(TARGET ${EXE_NAME}

plugins/zynaddsubfx/CMakeLists.txt

@@ -160,11 +160,15 @@ ENDIF(WIN32)
 # Use libraries in non-standard directories (e.g., another version of Qt)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}")
+ADD_SUBDIRECTORY("${LMMS_SOURCE_DIR}/src/common" common)
+
+ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${LMMS_COMMON_SRCS} "${WINRC}")
 INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}")
 # Needed to deploy dependencies of RemoteZynAddSubFx
 SET_PROPERTY(GLOBAL APPEND PROPERTY PLUGINS_BUILT "RemoteZynAddSubFx")
 
+TARGET_COMPILE_DEFINITIONS(RemoteZynAddSubFx PRIVATE BUILD_REMOTE_PLUGIN_CLIENT)
+
 IF(LMMS_BUILD_WIN32)
 	SET_TARGET_PROPERTIES(RemoteZynAddSubFx PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows")
 ENDIF(LMMS_BUILD_WIN32)

plugins/zynaddsubfx/RemoteZynAddSubFx.cpp

@@ -31,9 +31,7 @@
 
 #undef CursorShape // is, by mistake, not undefed in FL
 
-#define BUILD_REMOTE_PLUGIN_CLIENT
-
-#include "RemotePlugin.h"
+#include "RemotePluginClient.h"
 #include "RemoteZynAddSubFx.h"
 #include "LocalZynAddSubFx.h"
 

plugins/zynaddsubfx/RemoteZynAddSubFx.h

@@ -25,7 +25,7 @@
 #ifndef REMOTE_ZYNADDSUBFX_H
 #define REMOTE_ZYNADDSUBFX_H
 
-#include "RemotePlugin.h"
+#include "RemotePluginBase.h"
 
 enum ZasfRemoteMessageIDs
 {