Ticket #788: pa_nonflat_vol_restore.patch

src/pulsecore/sink-input.c

@@ -1222 +1222 @@
     if (pa_sink_input_get_state(i) == PA_SINK_INPUT_CORKED)
         pa_assert_se(i->sink->n_corked-- >= 1);
 
-    if (i->sink->flags & PA_SINK_FLAT_VOLUME)
+    if (i->sink->flags & PA_SINK_FLAT_VOLUME) {
         /* We might need to update the sink's volume if we are in flat
          * volume mode. */
         pa_sink_set_volume(i->sink, NULL, FALSE, FALSE);
+    } else {
+    /* Copy the current volume to the reference ratio, which
+       might be used if the move target is FLAT_VOLUME */
+    i->reference_ratio = i->volume; 
+    }
 
     pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i->sink), PA_SINK_MESSAGE_START_MOVE, i, 0, NULL) == 0);
 
@@ -1321 +1326 @@
 
         /* We might need to update the sink's volume if we are in flat volume mode. */
         pa_sink_set_volume(i->sink, NULL, FALSE, i->save_volume);
+    } else {
+        set_real_ratio(i, &i->volume);
+
+        /* Copy the new soft_volume to the thread_info struct */
+        pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_SOFT_VOLUME, NULL, 0, NULL) == 0);
     }
 
     pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i->sink), PA_SINK_MESSAGE_FINISH_MOVE, i, 0, NULL) == 0);