From 5d5200d20bd47d802653ac60c0ef8fe86a26b996 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 16 Feb 2020 23:34:49 +0100
Subject: [PATCH] (Menu widgets) Refactor

---
 menu/widgets/menu_widgets.c | 6 ++----
 menu/widgets/menu_widgets.h | 3 ++-
 retroarch.c                 | 8 ++++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/menu/widgets/menu_widgets.c b/menu/widgets/menu_widgets.c
index 5a64f3a96d..309f9dc39e 100644
--- a/menu/widgets/menu_widgets.c
+++ b/menu/widgets/menu_widgets.c
@@ -2227,10 +2227,9 @@ static void menu_widgets_volume_timer_end(void *userdata)
    gfx_animation_push(&entry);
 }
 
-void menu_widgets_volume_update_and_show(float new_volume)
+void menu_widgets_volume_update_and_show(float new_volume, bool mute)
 {
    gfx_timer_ctx_entry_t entry;
-   bool mute = *(audio_get_bool_ptr(AUDIO_ACTION_MUTE_ENABLE));
 
    gfx_animation_kill_by_tag(&volume_tag);
 
@@ -2273,8 +2272,7 @@ bool menu_widgets_ai_service_overlay_load(
 {
    if (ai_service_overlay_state == 0)
    {
-      bool res;
-      res = gfx_display_reset_textures_list_buffer(
+      bool res = gfx_display_reset_textures_list_buffer(
                &ai_service_overlay_texture, 
                TEXTURE_FILTER_MIPMAP_LINEAR, 
                (void *) buffer, buffer_len, image_type,
diff --git a/menu/widgets/menu_widgets.h b/menu/widgets/menu_widgets.h
index b52fa9f67c..aafba571ed 100644
--- a/menu/widgets/menu_widgets.h
+++ b/menu/widgets/menu_widgets.h
@@ -48,7 +48,8 @@ void menu_widgets_msg_queue_push(
       enum message_queue_category category,
       unsigned prio, bool flush);
 
-void menu_widgets_volume_update_and_show(float new_volume);
+void menu_widgets_volume_update_and_show(float new_volume,
+      bool mute);
 
 void menu_widgets_iterate(
       unsigned width, unsigned height,
diff --git a/retroarch.c b/retroarch.c
index 67074484bb..a242f6119d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -5428,7 +5428,9 @@ static void command_event_set_volume(float gain)
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
    if (menu_widgets_inited)
-      menu_widgets_volume_update_and_show(settings->floats.audio_volume);
+      menu_widgets_volume_update_and_show(settings->floats.audio_volume,
+            audio_driver_mute_enable
+            );
    else
 #endif
       runloop_msg_queue_push(msg, 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@@ -6912,7 +6914,9 @@ TODO: Add a setting for these tweaks */
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
             if (menu_widgets_inited)
-               menu_widgets_volume_update_and_show(configuration_settings->floats.audio_volume);
+               menu_widgets_volume_update_and_show(
+                     configuration_settings->floats.audio_volume,
+                     audio_driver_mute_enable);
             else
 #endif
                runloop_msg_queue_push(msg, 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);