Add default-monitor-time-sec

[platform/upstream/pulseaudio.git] / src / pulsecore / sink.c

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index afabb4b..ae3be39 100644 (file)
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -347,19 +347,14 @@ pa_sink* pa_sink_new(
     else
         s->alternate_sample_rate = s->core->alternate_sample_rate;
 
-<<<<<<< HEAD
-    s->avoid_resampling = data->avoid_resampling;
-#ifdef __TIZEN__
-    s->origin_avoid_resampling = data->avoid_resampling;
-    s->selected_sample_format = s->sample_spec.format;
-    s->selected_sample_rate = s->sample_spec.rate;
-#endif
-=======
     if (data->avoid_resampling_is_set)
         s->avoid_resampling = data->avoid_resampling;
     else
         s->avoid_resampling = s->core->avoid_resampling;
->>>>>>> upstream/15.0
+#ifdef __TIZEN__
+    s->selected_sample_format = s->sample_spec.format;
+    s->selected_sample_rate = s->sample_spec.rate;
+#endif
 
     s->inputs = pa_idxset_new(NULL, NULL);
     s->n_corked = 0;