From 4f3e6681ef552371bf9e45aece26a5a804406ce9 Mon Sep 17 00:00:00 2001 From: AlexApps99 Date: Sun, 21 Jun 2020 21:46:27 +1200 Subject: [PATCH 1/2] Added rewind to turbo mute --- gtk/po/es.po | 10 ++++++---- gtk/po/fr_FR.po | 8 ++++---- gtk/po/ja.po | 8 ++++---- gtk/po/pt_BR.po | 8 ++++---- gtk/po/ru.po | 8 ++++---- gtk/po/sr@latin.po | 8 ++++---- gtk/src/gtk_s9x.cpp | 4 ++-- gtk/src/snes9x.ui | 4 ++-- 8 files changed, 30 insertions(+), 28 deletions(-) diff --git a/gtk/po/es.po b/gtk/po/es.po index c9c962c9..9a822516 100644 --- a/gtk/po/es.po +++ b/gtk/po/es.po @@ -1296,12 +1296,14 @@ msgstr "Silenciar la salida de sonido" msgid "Disables output of sound" msgstr "Desactivar la salida de sonido" -#: src/snes9x.ui:4200 -msgid "Mute sound when using turbo" +#: src/snes9x.ui:4206 +#, fuzzy +msgid "Mute sound when using turbo or rewind" msgstr "Silenciar el sonido cuando se esté en turbo" -#: src/snes9x.ui:4204 -msgid "Disables output of sound when using turbo" +#: src/snes9x.ui:4210 +#, fuzzy +msgid "Disables output of sound when using turbo or rewind" msgstr "Deshabilitar la salida de sonido cuando se esté en turbo" #: src/snes9x.ui:4227 diff --git a/gtk/po/fr_FR.po b/gtk/po/fr_FR.po index ccf85e23..db5fd415 100644 --- a/gtk/po/fr_FR.po +++ b/gtk/po/fr_FR.po @@ -1277,14 +1277,14 @@ msgstr "Sourdine" msgid "Disables output of sound" msgstr "Désactiver la sortie audio" -#: src/snes9x.ui:4200 +#: src/snes9x.ui:4206 #, fuzzy -msgid "Mute sound when using turbo" +msgid "Mute sound when using turbo or rewind" msgstr "Sourdine" -#: src/snes9x.ui:4204 +#: src/snes9x.ui:4210 #, fuzzy -msgid "Disables output of sound when using turbo" +msgid "Disables output of sound when using turbo or rewind" msgstr "Désactiver la sortie audio" #: src/snes9x.ui:4227 diff --git a/gtk/po/ja.po b/gtk/po/ja.po index 224e16d8..d369135e 100644 --- a/gtk/po/ja.po +++ b/gtk/po/ja.po @@ -1253,14 +1253,14 @@ msgstr "サウンドをミュートする" msgid "Disables output of sound" msgstr "音声出力を無効にします" -#: src/snes9x.ui:4200 +#: src/snes9x.ui:4206 #, fuzzy -msgid "Mute sound when using turbo" +msgid "Mute sound when using turbo or rewind" msgstr "サウンドをミュートする" -#: src/snes9x.ui:4204 +#: src/snes9x.ui:4210 #, fuzzy -msgid "Disables output of sound when using turbo" +msgid "Disables output of sound when using turbo or rewind" msgstr "音声出力を無効にします" #: src/snes9x.ui:4227 diff --git a/gtk/po/pt_BR.po b/gtk/po/pt_BR.po index b3d45607..e2470816 100644 --- a/gtk/po/pt_BR.po +++ b/gtk/po/pt_BR.po @@ -1305,14 +1305,14 @@ msgstr "Saída de áudio muda" msgid "Disables output of sound" msgstr "Desativar saída de áudio." -#: src/snes9x.ui:4200 +#: src/snes9x.ui:4206 #, fuzzy -msgid "Mute sound when using turbo" +msgid "Mute sound when using turbo or rewind" msgstr "Saída de áudio muda" -#: src/snes9x.ui:4204 +#: src/snes9x.ui:4210 #, fuzzy -msgid "Disables output of sound when using turbo" +msgid "Disables output of sound when using turbo or rewind" msgstr "Desativar saída de áudio." #: src/snes9x.ui:4227 diff --git a/gtk/po/ru.po b/gtk/po/ru.po index 20c1e379..f2a81ad9 100644 --- a/gtk/po/ru.po +++ b/gtk/po/ru.po @@ -1287,14 +1287,14 @@ msgstr "Отключить звук" msgid "Disables output of sound" msgstr "Запрещает вывод звука" -#: src/snes9x.ui:4200 +#: src/snes9x.ui:4206 #, fuzzy -msgid "Mute sound when using turbo" +msgid "Mute sound when using turbo or rewind" msgstr "Отключить звук" -#: src/snes9x.ui:4204 +#: src/snes9x.ui:4210 #, fuzzy -msgid "Disables output of sound when using turbo" +msgid "Disables output of sound when using turbo or rewind" msgstr "Запрещает вывод звука" #: src/snes9x.ui:4227 diff --git a/gtk/po/sr@latin.po b/gtk/po/sr@latin.po index f94f4835..6db3d5d4 100644 --- a/gtk/po/sr@latin.po +++ b/gtk/po/sr@latin.po @@ -1269,14 +1269,14 @@ msgstr "Priguši izvor zvuka" msgid "Disables output of sound" msgstr "Isključuje izvor zvuka" -#: src/snes9x.ui:4200 +#: src/snes9x.ui:4206 #, fuzzy -msgid "Mute sound when using turbo" +msgid "Mute sound when using turbo or rewind" msgstr "Priguši izvor zvuka" -#: src/snes9x.ui:4204 +#: src/snes9x.ui:4210 #, fuzzy -msgid "Disables output of sound when using turbo" +msgid "Disables output of sound when using turbo or rewind" msgstr "Isključuje izvor zvuka" #: src/snes9x.ui:4227 diff --git a/gtk/src/gtk_s9x.cpp b/gtk/src/gtk_s9x.cpp index c80302bf..d3246a56 100644 --- a/gtk/src/gtk_s9x.cpp +++ b/gtk/src/gtk_s9x.cpp @@ -360,14 +360,14 @@ gboolean S9xIdleFunc (gpointer data) static int muted_from_turbo = false; static int mute_saved_state = false; - if (Settings.TurboMode && !muted_from_turbo && gui_config->mute_sound_turbo) + if ((Settings.TurboMode || Settings.Rewinding) && !muted_from_turbo && gui_config->mute_sound_turbo) { muted_from_turbo = true; mute_saved_state = Settings.Mute; S9xSetSoundMute (true); } - if (!Settings.TurboMode && muted_from_turbo) + if (!(Settings.TurboMode || Settings.Rewinding) && muted_from_turbo) { muted_from_turbo = false; Settings.Mute = mute_saved_state; diff --git a/gtk/src/snes9x.ui b/gtk/src/snes9x.ui index 80b19982..fc0292f7 100644 --- a/gtk/src/snes9x.ui +++ b/gtk/src/snes9x.ui @@ -4203,11 +4203,11 @@ - Mute sound when using turbo + Mute sound when using turbo or rewind True True False - Disables output of sound when using turbo + Disables output of sound when using turbo or rewind True True From 9e91d9d8ae257dfc70610cff407faa751bbd975c Mon Sep 17 00:00:00 2001 From: AlexApps99 Date: Sun, 21 Jun 2020 22:02:08 +1200 Subject: [PATCH 2/2] Fixed sound playing while in turbo after pause (this may break other aspects of audio around pausing) --- gtk/src/gtk_s9x.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/gtk/src/gtk_s9x.cpp b/gtk/src/gtk_s9x.cpp index d3246a56..39af3ece 100644 --- a/gtk/src/gtk_s9x.cpp +++ b/gtk/src/gtk_s9x.cpp @@ -273,7 +273,6 @@ static gboolean S9xPauseFunc (gpointer data) /* Clear joystick queues */ gui_config->flush_joysticks (); - S9xSetSoundMute (false); S9xSoundStart (); if (Settings.NetPlay && NetPlay.Connected) @@ -314,7 +313,6 @@ gboolean S9xIdleFunc (gpointer data) { if (Settings.Paused && gui_config->rom_loaded) { - S9xSetSoundMute (gui_config->mute_sound); S9xSoundStop (); gui_config->flush_joysticks ();