Remove an OSFM specific feature

CMakeLists.txt

@@ -35,7 +35,6 @@ pkg_check_modules(SDL2_TTF      REQUIRED SDL2_ttf)
 pkg_check_modules(SDL2_IMAGE    REQUIRED SDL2_image)
 pkg_check_modules(SDL_SOUND     REQUIRED SDL_sound)
 pkg_check_modules(MRI REQUIRED ruby-3.1)
-pkg_check_modules(ZMQPP REQUIRED libzmqpp)
 pkg_check_modules(OGG REQUIRED ogg)
 pkg_check_modules(SPEEX REQUIRED speex)
 pkg_check_modules(MODPLUG REQUIRED libmodplug)
@@ -127,8 +126,6 @@ set(MAIN_HEADERS
 	src/oneshot.h
 	src/pipe.h
 	src/i18n.h
-	src/otherview-message.h
-	src/crash-handler.h
 )
 
 set(MAIN_SOURCE
@@ -183,8 +180,6 @@ set(MAIN_SOURCE
 	src/sharedstate.cpp
 	src/oneshot.cpp
 	src/i18n.cpp
-	src/otherview-message.cpp
-	src/crash-handler.cpp
 )
 
 if(WIN32)
@@ -339,7 +334,6 @@ set(BINDING_SOURCE
 	binding-mri/niko-binding.cpp
 	binding-mri/modshot-window-binding.cpp
 	binding-mri/aleffect-binding.cpp
-	binding-mri/otherview-binding.cpp
 	binding-mri/screen-binding.cpp
 	binding-mri/display-binding.cpp
 )
@@ -385,7 +379,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE
 	${VORBISFILE_INCLUDE_DIRS}
 	${FLUID_INCLUDE_DIRS}
 	${OPENAL_INCLUDE_DIR}
-    ${ZMQPP_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}
@@ -402,7 +395,6 @@ target_link_libraries(${PROJECT_NAME}
 	${FLUID_LIBRARIES}
 	${OPENAL_LIBRARY}
 	${ZLIB_LIBRARY}
-    ${ZMQPP_LIBRARIES}
 
     ${OGG_LIBRARIES}
     ${SPEEX_LIBRARIES}

binding-mri/binding-mri.cpp

@@ -32,8 +32,6 @@
 #include "boost-hash.h"
 #include "version.h"
 
-#include "otherview-message.h"
-
 #include <ruby.h>
 #include <ruby/encoding.h>
 #undef inline
@@ -87,7 +85,6 @@ void oneshotBindingInit();
 void steamBindingInit();
 void modshotwindowBindingInit();
 void aleffectBindingInit();
-void otherviewBindingInit();
 void screenBindingInit();
 RB_METHOD(mriPrint);
 RB_METHOD(mriP);
@@ -126,7 +123,6 @@ static void mriBindingInit()
 	steamBindingInit();
 	modshotwindowBindingInit();
 	aleffectBindingInit();
-	otherviewBindingInit();
 	screenBindingInit();
 	rb_define_global_const("MODSHOT_VERSION", rb_str_new_cstr(MODSHOT_VERSION));
 	if (rgssVer >= 3)
@@ -445,7 +441,6 @@ static void runRMXPScripts(BacktraceData &btData)
 
 	/* Set the debug flag */
 	rb_gv_set("$debug", conf.debugMode ? Qtrue : Qfalse);
-	rb_gv_set("$otherview", conf.isOtherView ? Qtrue : Qfalse);
 
 	rb_gv_set("$RGSS_SCRIPTS", scriptArray);
 

binding-mri/meson.build

@@ -36,7 +36,6 @@ binding_source = [files(
     'viewport-binding.cpp',
     'wallpaper-binding.cpp',
     'window-binding.cpp',
-    'otherview-binding.cpp',
 )]
 
 global_sources += binding_source

linux/Makefile

@@ -87,35 +87,6 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/*.c
 $(DOWNLOADS)/ruby/*.c:
 	$(CLONE) $(GITHUB)/ruby/ruby $(DOWNLOADS)/ruby -b ruby_$(RUBY_BRANCH);
 
-libzmq: init_dirs $(LIBDIR)/libzmq.so
-
-$(LIBDIR)/libzmq.so: $(DOWNLOADS)/libzmq/Makefile
-	cd $(DOWNLOADS)/libzmq; \
-	make -j$(NPROC); make install
-
-$(DOWNLOADS)/libzmq/Makefile: $(DOWNLOADS)/libzmq/configure
-	cd $(DOWNLOADS)/libzmq; \
-	$(CONFIGURE)
-
-$(DOWNLOADS)/libzmq/configure: $(DOWNLOADS)/libzmq/autogen.sh
-	cd $(DOWNLOADS)/libzmq; ./autogen.sh
-
-$(DOWNLOADS)/libzmq/autogen.sh:
-	$(CLONE) $(GITHUB)/zeromq/libzmq $(DOWNLOADS)/libzmq
-
-zmqpp: init_dirs libzmq $(LIBDIR)/libzmqpp.so
-
-$(LIBDIR)/libzmqpp.so: ${DOWNLOADS}/zmqpp/cmakebuild/Makefile
-	cd ${DOWNLOADS}/zmqpp/cmakebuild; \
-	make -j${NPROC}; make install
-
-$(DOWNLOADS)/zmqpp/cmakebuild/Makefile: $(DOWNLOADS)/zmqpp/CMakeLists.txt
-	cd $(DOWNLOADS)/zmqpp; mkdir -p cmakebuild; cd cmakebuild; \
-	$(CMAKE)
-
-$(DOWNLOADS)/zmqpp/CMakeLists.txt:
-	$(CLONE) $(GITHUB)/somedevfox/zmqpp $(DOWNLOADS)/zmqpp
-
 libnsgif: init_dirs ${LIBDIR}/libnsgif.so
 
 $(LIBDIR)/libnsgif.so: $(DOWNLOADS)/libnsgif/Makefile
@@ -141,5 +112,5 @@ powerwash: clean-downloads
 clean-downloads:
 	-rm -rf downloads
 
-deps-core: sdlsound iconv libzmq zmqpp libnsgif
+deps-core: sdlsound iconv libnsgif
 everything: deps-core ruby

src/config.cpp

@@ -97,7 +97,6 @@ void Config::read(int argc, char *argv[])
 	PO_DESC(SE.sourceCount, int, 6) \
 	PO_DESC(audioChannels, int, 30) \
 	PO_DESC(pathCache, bool, true) \
-	PO_DESC(isOtherView, bool, false) \
 
 // Not gonna take your shit boost
 #define GUARD_ALL( exp ) try { exp } catch(...) {}

src/config.h

@@ -52,7 +52,6 @@ struct Config
 	bool subImageFix;
 	bool enableBlitting;
 	int maxTextureSize;
-	bool isOtherView;
 
 	std::string gameFolder;
 	bool allowSymlinks;

src/eventthread.cpp

@@ -46,7 +46,6 @@
 
 #include <iostream>
 
-#include "otherview-message.h"
 
 #define KEYCODE_TO_SCUFFEDCODE(keycode) (((keycode & 0xff) | ((keycode & 0x180) == 0x100 ? 0x180 : 0)) + SDL_NUM_SCANCODES)
 
@@ -673,7 +672,6 @@ void EventThread::cleanup()
 		if ((event.type - usrIdStart) == REQUEST_MESSAGEBOX)
 			free(event.user.data1);
 
-	shState->otherView().close(); // Bad place to do this but I don't care
 }
 
 void EventThread::resetInputStates()

src/meson.build

@@ -13,7 +13,6 @@ pixman = dependency('pixman-1')
 png = dependency('libpng')
 jpeg = dependency('libjpeg')
 zlib = dependency('zlib')
-zmqpp = dependency('libzmqpp')
 nsgif = dependency('libnsgif')
 
 if host_system == 'windows'
@@ -49,7 +48,7 @@ global_include_dirs += include_directories('.',
     'opengl/headers'
 )
 
-global_dependencies += [boost, bz2, openal, zlib,  sdl2, sdl_sound, pixman, physfs, vorbisfile, vorbis, iconv, ogg, sdl2_ttf, sigcxx, sdl2_image, png, jpeg, zmqpp, nsgif]
+global_dependencies += [boost, bz2, openal, zlib,  sdl2, sdl_sound, pixman, physfs, vorbisfile, vorbis, iconv, ogg, sdl2_ttf, sigcxx, sdl2_image, png, jpeg, nsgif]
 if host_system == 'windows'
     global_dependencies += compilers['cpp'].find_library('wsock32')
     global_dependencies += compilers['cpp'].find_library('winmm')
@@ -98,7 +97,6 @@ main_source = files(
 	'sharedstate.cpp',
 	'oneshot.cpp',
 	'i18n.cpp',
-	'otherview-message.cpp',
 	'crash-handler.cpp'
 )
 

src/sharedstate.cpp

@@ -40,7 +40,6 @@
 #include "quad.h"
 #include "binding.h"
 #include "exception.h"
-#include "otherview-message.h"
 
 #ifndef _MSC_VER
 #include <unistd.h>
@@ -94,8 +93,6 @@ struct SharedStatePrivate
 
 	unsigned int stampCounter;
 
-	OtherViewMessager otherView;
-
 	SharedStatePrivate(RGSSThreadData *threadData)
 	    : bindingData(0),
 	      sdlWindow(threadData->window),
@@ -109,8 +106,7 @@ struct SharedStatePrivate
 	      oneshot(*threadData),
 	      _glState(threadData->config),
 	      fontState(threadData->config),
-	      stampCounter(0),
-		  otherView(threadData->config)
+	      stampCounter(0)
 	{
 		/* Shaders have been compiled in ShaderSet's constructor */
 		if (gl.ReleaseShaderCompiler)
@@ -218,7 +214,6 @@ GSATT(ShaderSet&, shaders)
 GSATT(TexPool&, texPool)
 GSATT(Quad&, gpQuad)
 GSATT(SharedFontState&, fontState)
-GSATT(OtherViewMessager&, otherView)
 
 void SharedState::setBindingData(void *data)
 {

src/sharedstate.h

@@ -54,7 +54,6 @@ struct GlobalIBO;
 struct Config;
 struct Vec2i;
 struct SharedMidiState;
-class OtherViewMessager;
 
 struct SharedState
 {
@@ -78,7 +77,6 @@ struct SharedState
 
 	Oneshot &oneshot() const;
 
-	OtherViewMessager &otherView() const;
 
 #ifdef STEAM
 	Steam &steam() const;