From 10ac426fd5be1b602a39743eb86835421f983ec6 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Fri, 24 Aug 2018 16:09:37 -0700 Subject: [PATCH] Spu2-x(Linux): Debug button greys out when appropriate. Minor cleanup on last commit. --- plugins/spu2-x/src/Linux/Config.cpp | 15 ++++++++++++++- plugins/spu2-x/src/Linux/ConfigDebug.cpp | 4 ++-- plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp index 49b1c81557..0b78f7be11 100644 --- a/plugins/spu2-x/src/Linux/Config.cpp +++ b/plugins/spu2-x/src/Linux/Config.cpp @@ -81,6 +81,8 @@ static u32 SdlOutputAPI = 0; int numSpeakers = 0; int dplLevel = 0; +bool temp_debug_state; + /*****************************************************************************/ void ReadSettings() @@ -221,6 +223,14 @@ void debug_dialog() #if defined(__unix__) +static void toggle_sensitivity(GtkWidget *widget, gpointer data) +{ + GtkButton *btn = static_cast(data); + + temp_debug_state = !temp_debug_state; + gtk_widget_set_sensitive(GTK_WIDGET(btn), temp_debug_state); +} + static void cb_adjust_latency(GtkComboBox *widget, gpointer data) { GtkRange *range = static_cast(data); @@ -322,7 +332,7 @@ void DisplayDialog() #else volume_slide = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, 0, 100, 5); #endif - gtk_range_set_value(GTK_RANGE(volume_slide), FinalVolume*100); + gtk_range_set_value(GTK_RANGE(volume_slide), FinalVolume * 100); sync_label = gtk_label_new("Synchronization Mode:"); sync_box = gtk_combo_box_text_new(); @@ -396,12 +406,15 @@ void DisplayDialog() gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(effects_check), EffectsDisabled); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dealias_filter), postprocess_filter_dealias); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(debug_check), DebugEnabled); + gtk_widget_set_sensitive(GTK_WIDGET(debug_button), DebugEnabled); + temp_debug_state = DebugEnabled; gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), main_box); gtk_widget_show_all(dialog); g_signal_connect(sync_box, "changed", G_CALLBACK(cb_adjust_latency), latency_slide); g_signal_connect_swapped(advanced_button, "clicked", G_CALLBACK(advanced_dialog), advanced_button); + g_signal_connect(debug_check, "clicked", G_CALLBACK(toggle_sensitivity), debug_button); g_signal_connect_swapped(debug_button, "clicked", G_CALLBACK(debug_dialog), debug_button); return_value = gtk_dialog_run(GTK_DIALOG(dialog)); diff --git a/plugins/spu2-x/src/Linux/ConfigDebug.cpp b/plugins/spu2-x/src/Linux/ConfigDebug.cpp index 6d0f9bf617..b076eb0659 100644 --- a/plugins/spu2-x/src/Linux/ConfigDebug.cpp +++ b/plugins/spu2-x/src/Linux/ConfigDebug.cpp @@ -244,7 +244,7 @@ void DisplayDialog() gtk_container_add(GTK_CONTAINER(log_frame), log_box); // Dump Section - #if GTK_MAJOR_VERSION < 3 +#if GTK_MAJOR_VERSION < 3 dump_box = gtk_vbox_new(false, 5); #else dump_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); @@ -304,4 +304,4 @@ void DisplayDialog() { } #endif -} +} // namespace DebugConfig diff --git a/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp b/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp index 0eb5b72f6f..3e652f7314 100644 --- a/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp +++ b/plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp @@ -173,4 +173,4 @@ void restore_defaults() { } #endif -} +} // namespace SoundtouchCfg