do not crash on failure to load plugin

djshaji · Oct 23, 2024 · b3ccbf8 · b3ccbf8
1 parent 4a5f568
commit b3ccbf8
Show file tree

Hide file tree

Showing 31 changed files with 25 additions and 11 deletions.
diff --git a/FileWriter.o b/FileWriter.o
diff --git a/LockFreeQueue.o b/LockFreeQueue.o
diff --git a/Makefile b/Makefile
@@ -2,7 +2,9 @@
 #~ GTKMM=`pkg-config --cflags --libs gtkmm-4.0` 
 
 TARGET=linux
-#~ TARGET=win32
+TARGET=win32
+
+VERSION=`git rev-list --count HEAD`
 
 ifeq ($(TARGET),linux)
 GTK=`pkg-config --cflags --libs gtk4`
@@ -98,3 +100,6 @@ FileWriter.o: FileWriter.cpp FileWriter.h LockFreeQueue.cpp LockFreeQueue.h vrin
 
 vringbuffer.o: upwaker.c vringbuffer.cc
 	$(CPP) -fpermissive -c upwaker.c vringbuffer.cc $(GTK) 	
+
+win32-release:
+	export VER=$(VERSION) ; cd .. ; zip -r releases/amprack-$$VER.zip win/
diff --git a/Plugin.o b/Plugin.o
diff --git a/PluginControl.o b/PluginControl.o
diff --git a/SharedLibrary.o b/SharedLibrary.o
diff --git a/amprack b/amprack
diff --git a/amprack.exe b/amprack.exe
diff --git a/cairo.o b/cairo.o
diff --git a/dictionary.o b/dictionary.o
diff --git a/engine.o b/engine.o
diff --git a/jack.o b/jack.o
diff --git a/knob.o b/knob.o
diff --git a/log.o b/log.o
diff --git a/lv2_ext.o b/lv2_ext.o
diff --git a/main.cc b/main.cc
@@ -15,13 +15,13 @@ void activate (GApplication * app, void * v) {
     GtkCssProvider *cssProvider2 = gtk_css_provider_new();
     gtk_css_provider_load_from_path(cssProvider, "style.css");
 
-    MyWindow window = MyWindow ((GtkApplication *) app);
-    gtk_widget_add_css_class ((GtkWidget *) window.window, "xwindow");
+    MyWindow * window = new MyWindow ((GtkApplication *) app);
+    gtk_widget_add_css_class ((GtkWidget *) window -> window, "xwindow");
 
 	if ( std::filesystem::exists ("assets/themes/TubeAmp/style.css"))
-		gtk_css_provider_load_from_path(cssProvider, std::string ("assets/themes/").append (window.rack -> theme).append ("/style.css").c_str ());
+		gtk_css_provider_load_from_path(cssProvider, std::string ("assets/themes/").append (window ->rack -> theme).append ("/style.css").c_str ());
 	else
-		gtk_css_provider_load_from_path(cssProvider, std::string ("/usr/share/amprack/assets/themes/").append (window.rack -> theme).append ("/style.css").c_str ());
+		gtk_css_provider_load_from_path(cssProvider, std::string ("/usr/share/amprack/assets/themes/").append (window ->rack -> theme).append ("/style.css").c_str ());
     gtk_style_context_add_provider_for_display (gdk_display_get_default (), (GtkStyleProvider *)cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
     # ifdef __linux__
@@ -35,9 +35,9 @@ void activate (GApplication * app, void * v) {
 
     gtk_style_context_add_provider_for_display (gdk_display_get_default (), (GtkStyleProvider *)cssProvider2, GTK_STYLE_PROVIDER_PRIORITY_USER);
 
-    window.rack -> engine -> processor -> bypass =  false ;
+    window ->rack -> engine -> processor -> bypass =  false ;
 
-    gtk_window_present ((GtkWindow *)window.window);
+    gtk_window_present ((GtkWindow *)window ->window);
     LOGD ("we are live and rocking\n");
     OUT
 }
@@ -65,16 +65,21 @@ int main(int argc, char* argv[])
             g_setenv ("GSK_RENDERER", renderers [renderer], 1);
             LOGD ("[config] set renderer to %s\n", renderers [renderer]);
         }
+    } else {
+        //  seems to be most stable *ahem* on win32
+        # ifndef __linux__
+        g_setenv ("GSK_RENDERER", "gl", 1);        
+        # endif
     }
 
     auto app = gtk_application_new ("org.acoustixaudio.amprack", G_APPLICATION_DEFAULT_FLAGS);
 
-    //~ window.set_title("Gtk4 Demo");
-    //~ window.set_default_size(300 , 400);
+    //~ window ->set_title("Gtk4 Demo");
+    //~ window ->set_default_size(300 , 400);
     //~ g_signal_connect (app, "activate")
     //~ app->signal_activate().connect([&](){
         //~ app->add_window(window);
-        //~ window.show ();
+        //~ window ->show ();
     //~ });
 
     g_signal_connect (app, "activate", (GCallback) activate, NULL);

diff --git a/main.o b/main.o
diff --git a/mem.o b/mem.o
diff --git a/objects.o b/objects.o
diff --git a/pango.o b/pango.o
diff --git a/pluginui.o b/pluginui.o
diff --git a/presets.o b/presets.o
diff --git a/process.o b/process.o
diff --git a/rack.cc b/rack.cc
@@ -555,6 +555,10 @@ bool Rack::load_preset (json j) {
         auto plugin = p ["name"].dump () ;
         plugin = plugin.substr (1, plugin.size () - 2) ;
         PluginUI * ui = addPluginByName ((char *) plugin.c_str ());
+        if (ui == NULL) {
+            HERE LOGD ("-----| error loading plugin %s |-------\n", plugin.c_str ());
+            continue ;
+        }
         auto controls = p ["controls"].dump () ;
         controls = controls.substr (1, controls.size () - 2);
         ui -> load_preset (controls) ;

diff --git a/rack.o b/rack.o
diff --git a/settings.o b/settings.o
diff --git a/snd.o b/snd.o
diff --git a/upwaker.o b/upwaker.o
diff --git a/util.o b/util.o
diff --git a/version.h b/version.h
@@ -1 +1 @@
-#define VERSION 146
+#define VERSION 147
diff --git a/vringbuffer.o b/vringbuffer.o