ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #644 from AlexApps99/master 

Improvements to mute when using turbo
This commit is contained in:
bearoso 2020-06-21 15:17:24 -05:00 committed by GitHub
parent cb562b2e4c 9e91d9d8ae
commit 4c89a52e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/po/es.po
View File

@ -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

8
gtk/po/fr_FR.po
View File

@ -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

8
gtk/po/ja.po
View File

@ -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

8
gtk/po/pt_BR.po
View File

@ -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

8
gtk/po/ru.po
View File

@ -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

8
gtk/po/sr@latin.po
View File

@ -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

6
gtk/src/gtk_s9x.cpp
View File

@ -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 ();
@ -360,14 +358,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;

4
gtk/src/snes9x.ui
View File

@ -4203,11 +4203,11 @@
</child>
<child>
<object class="GtkCheckButton" id="mute_sound_turbo_check">
<property name="label" translatable="yes">Mute sound when using turbo</property>
<property name="label" translatable="yes">Mute sound when using turbo or rewind</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Disables output of sound when using turbo</property>
<property name="tooltip_text" translatable="yes">Disables output of sound when using turbo or rewind</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>