]> code.delx.au - pulseaudio/blobdiff - src/modules/module-device-restore.c
device-restore: log restored mute state
[pulseaudio] / src / modules / module-device-restore.c
index 780b3e140d3bce95042058a58ca88550a84709f5..031a62bb50cb51b357066900449424c3c29309d8 100644 (file)
@@ -791,9 +791,10 @@ static pa_hook_result_t sink_fixate_hook_callback(pa_core *c, pa_sink_new_data *
         if (u->restore_muted && e->muted_valid) {
 
             if (!new_data->muted_is_set) {
-                pa_log_info("Restoring mute state for sink %s.", new_data->name);
                 pa_sink_new_data_set_muted(new_data, e->muted);
                 new_data->save_muted = true;
+                pa_log_info("Restoring mute state for sink %s: %smuted", new_data->name,
+                            new_data->muted ? "" : "un");
             } else
                 pa_log_debug("Not restoring mute state for sink %s, because already set.", new_data->name);
         }
@@ -932,9 +933,10 @@ static pa_hook_result_t source_fixate_hook_callback(pa_core *c, pa_source_new_da
         if (u->restore_muted && e->muted_valid) {
 
             if (!new_data->muted_is_set) {
-                pa_log_info("Restoring mute state for source %s.", new_data->name);
                 pa_source_new_data_set_muted(new_data, e->muted);
                 new_data->save_muted = true;
+                pa_log_info("Restoring mute state for source %s: %smuted", new_data->name,
+                            new_data->muted ? "" : "un");
             } else
                 pa_log_debug("Not restoring mute state for source %s, because already set.", new_data->name);
         }
@@ -1152,6 +1154,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
                 pa_format_info *f = pa_format_info_new();
                 if (pa_tagstruct_get_format_info(t, f) < 0) {
                     pa_format_info_free(f);
+                    perportentry_free(e);
                     pa_xfree(name);
                     goto fail;
                 }