From 98448960f53bc0b96d0ccae308c353b1bd645934 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 21 May 2021 22:25:36 +0200
Subject: [PATCH] Move audio_driver_mixer_volume_gain to runloop_state struct

---
 retroarch.c      | 10 ++++------
 retroarch_data.h |  7 +++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 80ace89007..17b12a4e78 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -28453,10 +28453,10 @@ static void audio_driver_flush(
 
       if (!audio_mixer_mute_enable)
       {
-         if (p_rarch->audio_driver_mixer_volume_gain == 1.0f)
+         if (runloop_state.audio_mixer_volume_gain == 1.0f)
             override                      = false;
          mixer_gain                       =
-            p_rarch->audio_driver_mixer_volume_gain;
+            runloop_state.audio_mixer_volume_gain;
       }
       audio_mixer_mix(
             runloop_state.audio_output_samples_buf,
@@ -29508,8 +29508,6 @@ void audio_driver_frame_is_reverse(void)
 
 void audio_set_float(enum audio_action action, float val)
 {
-   struct rarch_state *p_rarch                    = &rarch_st;
-
    switch (action)
    {
       case AUDIO_ACTION_VOLUME_GAIN:
@@ -29517,11 +29515,11 @@ void audio_set_float(enum audio_action action, float val)
          break;
       case AUDIO_ACTION_MIXER_VOLUME_GAIN:
 #ifdef HAVE_AUDIOMIXER
-         p_rarch->audio_driver_mixer_volume_gain  = DB_TO_GAIN(val);
+         runloop_state.audio_mixer_volume_gain    = DB_TO_GAIN(val);
 #endif
          break;
       case AUDIO_ACTION_RATE_CONTROL_DELTA:
-         runloop_state.audio_rate_control_delta = val;
+         runloop_state.audio_rate_control_delta   = val;
          break;
       case AUDIO_ACTION_NONE:
       default:
diff --git a/retroarch_data.h b/retroarch_data.h
index e37fd01089..5bf3ac60a3 100644
--- a/retroarch_data.h
+++ b/retroarch_data.h
@@ -1721,6 +1721,9 @@ struct runloop
    float audio_rate_control_delta;
    float audio_input_sample_rate;
    float audio_volume_gain;
+#ifdef HAVE_AUDIOMIXER
+   float audio_mixer_volume_gain;
+#endif
 
    bool audio_active;
    bool audio_use_float;
@@ -2075,10 +2078,6 @@ struct rarch_state
    float video_driver_core_hz;
    float video_driver_aspect_ratio;
 
-#ifdef HAVE_AUDIOMIXER
-   float audio_driver_mixer_volume_gain;
-#endif
-
    float input_driver_axis_threshold;
 
    enum osk_type osk_idx;