[pulseaudio-commits] r1180 - /trunk/src/pulsecore/sink-input.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Aug  4 00:29:55 2006
New Revision: 1180

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1180&root=pulseaudio&view=rev
Log:
- don't call pa_sink_notify in pa_sink_input_new() because the virtual methods are not yet initialized at this time
- some minor cleanups

Modified:
    trunk/src/pulsecore/sink-input.c

Modified: trunk/src/pulsecore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink-input.c?rev=1180&root=pulseaudio&r1=1179&r2=1180&view=diff
==============================================================================
--- trunk/src/pulsecore/sink-input.c (original)
+++ trunk/src/pulsecore/sink-input.c Fri Aug  4 00:29:55 2006
@@ -135,8 +135,10 @@
     pa_log_info(__FILE__": created %u \"%s\" on %u with sample spec \"%s\"", i->index, i->name, s->index, st);
 
     pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, i->index);
-    pa_sink_notify(i->sink);
-
+
+    /* We do not call pa_sink_notify() here, because the virtual
+     * functions have not yet been initialized */
+    
     return i;    
 }
 
@@ -446,7 +448,7 @@
     assert(i->ref >= 1);
 
     if (!i->resampler)
-        return PA_RESAMPLER_INVALID;
+        return i->resample_method;
 
     return pa_resampler_get_method(i->resampler);
 }
@@ -574,9 +576,9 @@
     }
 
     /* Okey, let's move it */
-    pa_idxset_remove_by_data(i->sink->inputs, i, NULL);
+    pa_idxset_remove_by_data(origin->inputs, i, NULL);
+    pa_idxset_put(dest->inputs, i, NULL);
     i->sink = dest;
-    pa_idxset_put(i->sink->inputs, i, NULL);
 
     /* Replace resampler */
     if (new_resampler != i->resampler) {