[Vice-emu-commit] SF.net SVN: vice-emu:[45777] trunk/vice/src/arch/gtk3 /widgets

Revision: 45777
          http://sourceforge.net/p/vice-emu/code/45777
Author:   gpz
Date:     2025-09-18 16:49:44 +0000 (Thu, 18 Sep 2025)
Log Message:
-----------
sync resid sliders in vsync main window with sid engine selection

Modified Paths:
--------------
    trunk/vice/src/arch/gtk3/widgets/settings_model.c
    trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c
    trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c

Modified: trunk/vice/src/arch/gtk3/widgets/settings_model.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/settings_model.c	2025-09-18 16:47:42 UTC (rev 45776)
+++ trunk/vice/src/arch/gtk3/widgets/settings_model.c	2025-09-18 16:49:44 UTC (rev 45777)
@@ -1688,6 +1688,7 @@
     gtk_grid_attach(GTK_GRID(grid), video_widget, 1, 0, 1, 1);
 
     sid_widget = sid_model_widget_create(machine_widget);
+    /*sid_model_widget_set_callback(sid_widget, sid_model_callback);*/
     gtk_grid_attach(GTK_GRID(grid), sid_widget, 0, 0, 1, 1);
     return grid;
 }

Modified: trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c	2025-09-18 16:47:42 UTC (rev 45776)
+++ trunk/vice/src/arch/gtk3/widgets/sidsoundwidget.c	2025-09-18 16:49:44 UTC (rev 45777)
@@ -62,6 +62,7 @@
 #include "sid.h"
 #include "sidenginemodelwidget.h"
 #include "sound.h"
+#include "vsidmixerwidget.h"
 #include "vice_gtk3.h"
 
 #include "sidsoundwidget.h"
@@ -286,6 +287,10 @@
     gtk_widget_set_sensitive(resid_6581_grid, is_resid);
     gtk_widget_set_sensitive(resid_8580_grid, is_resid);
     gtk_widget_set_sensitive(resid_sampling,  is_resid);
+
+    if (machine_class == VICE_MACHINE_VSID) {
+        vsid_mixer_widget_update();
+    }
 }
 
 /** \brief  Create widget to control ReSID sampling method

Modified: trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c	2025-09-18 16:47:42 UTC (rev 45776)
+++ trunk/vice/src/arch/gtk3/widgets/vsidmixerwidget.c	2025-09-18 16:49:44 UTC (rev 45777)
@@ -104,6 +104,8 @@
 
 static int old_sid_model = -1;
 static int new_sid_model = -1;
+static int old_sid_engine = -1;
+static int new_sid_engine = -1;
 
 /** \brief  Handler for the 'destroy' event of the mixer widget
  *
@@ -354,12 +356,24 @@
 void vsid_mixer_widget_update(void)
 {
 #ifdef HAVE_RESID
+    resources_get_int("SidEngine", &new_sid_engine);
     resources_get_int("SidModel", &new_sid_model);
+    debug_gtk3("old engine = %d, new engine = %d", old_sid_engine, new_sid_engine);
     debug_gtk3("old model = %d, new model = %d", old_sid_model, new_sid_model);
-    if (new_sid_model != old_sid_model) {
-        debug_gtk3("model has changed: updating scale widgets");
-        old_sid_model = new_sid_model;
+    if ((new_sid_engine != old_sid_engine) ||
+        (new_sid_model != old_sid_model)) {
+        debug_gtk3("engine or model has changed: updating scale widgets");
         add_resid_scales(main_grid, 1, new_sid_model);
+        gtk_widget_set_sensitive(main_grid, (new_sid_engine == SID_ENGINE_RESID));
+#if 0
+        if (new_sid_engine == SID_ENGINE_RESID) {
+            gtk_widget_show_all(main_grid);
+        } else {
+            gtk_widget_hide(main_grid);
+        }
+#endif
     }
+    old_sid_engine = new_sid_engine;
+    old_sid_model = new_sid_model;
 #endif
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.