From a5401a50a67ebf1d86e979ee5556961b24a25400 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Jan 2009 01:46:27 +0100
Subject: store the default sink/source in proper pa_sink*/pa_source* pointers
 instead of a string

---
 src/pulsecore/core.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/pulsecore/core.c')

diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index 381a6779..689fc8f8 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -99,7 +99,8 @@ pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t shared, size_t shm_size) {
     c->sink_inputs = pa_idxset_new(NULL, NULL);
     c->cards = pa_idxset_new(NULL, NULL);
 
-    c->default_source_name = c->default_sink_name = NULL;
+    c->default_source = NULL;
+    c->default_sink = NULL;
 
     c->modules = NULL;
     c->namereg = NULL;
@@ -191,8 +192,8 @@ static void core_free(pa_object *o) {
     if (c->exit_event)
         c->mainloop->time_free(c->exit_event);
 
-    pa_xfree(c->default_source_name);
-    pa_xfree(c->default_sink_name);
+    pa_assert(!c->default_source);
+    pa_assert(!c->default_sink);
 
     pa_silence_cache_done(&c->silence_cache);
     pa_mempool_free(c->mempool);
-- 
cgit