Remove unused pa_core param in alsa module

[Version] 5.0.114
[Profile] Common
[Issue Type] Cleanup

Change-Id: I394f6604fce79e9d51d0e85a90439b4961f54f55

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index dac33b3..6e2bc56 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -12,7 +12,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          5.0
-Release:          113
+Release:          114
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 2224bcd..99de0ec 100644 (file)
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -4264,9 +4264,6 @@ static void profile_finalize_probing(pa_alsa_profile *to_be_finalized, pa_alsa_p
 static snd_pcm_t* mapping_open_pcm(pa_alsa_mapping *m,
                                    const pa_sample_spec *ss,
                                    const char *dev_id,
-#ifdef __TIZEN__
-                                   pa_core *core,
-#endif
                                    int mode,
                                    unsigned default_n_fragments,
                                    unsigned default_fragment_size_msec) {
@@ -4283,9 +4280,6 @@ static snd_pcm_t* mapping_open_pcm(pa_alsa_mapping *m,
     try_buffer_size = default_n_fragments * try_period_size;
 
     return pa_alsa_open_by_template(
-#ifdef __TIZEN__
-                              core,
-#endif
                               m->device_strings, dev_id, NULL, &try_ss,
                               &try_map, mode, &try_period_size,
                               &try_buffer_size, 0, NULL, NULL, true);
@@ -4313,9 +4307,6 @@ static void paths_drop_unused(pa_hashmap* h, pa_hashmap *keep) {
 void pa_alsa_profile_set_probe(
         pa_alsa_profile_set *ps,
         const char *dev_id,
-#ifdef __TIZEN__
-        pa_core *core,
-#endif
         const pa_sample_spec *ss,
         unsigned default_n_fragments,
         unsigned default_fragment_size_msec) {
@@ -4377,9 +4368,6 @@ void pa_alsa_profile_set_probe(
 
                     pa_log_debug("Checking for playback on %s (%s)", m->description, m->name);
                     if (!(m->output_pcm = mapping_open_pcm(m, ss, dev_id,
-#ifdef __TIZEN__
-                                                           core,
-#endif
                                                            SND_PCM_STREAM_PLAYBACK,
                                                            default_n_fragments,
                                                            default_fragment_size_msec))) {
@@ -4401,9 +4389,6 @@ void pa_alsa_profile_set_probe(
 
                     pa_log_debug("Checking for recording on %s (%s)", m->description, m->name);
                     if (!(m->input_pcm = mapping_open_pcm(m, ss, dev_id,
-#ifdef __TIZEN__
-                                                          core,
-#endif
                                                           SND_PCM_STREAM_CAPTURE,
                                                           default_n_fragments,
                                                           default_fragment_size_msec))) {

diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
index 8e40702..995a34b 100644 (file)
--- a/src/modules/alsa/alsa-mixer.h
+++ b/src/modules/alsa/alsa-mixer.h
@@ -326,11 +326,7 @@ void pa_alsa_decibel_fix_dump(pa_alsa_decibel_fix *db_fix);
 pa_alsa_mapping *pa_alsa_mapping_get(pa_alsa_profile_set *ps, const char *name);
 
 pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel_map *bonus);
-#ifdef __TIZEN__
-void pa_alsa_profile_set_probe(pa_alsa_profile_set *ps, const char *dev_id, pa_core *core, const pa_sample_spec *ss, unsigned default_n_fragments, unsigned default_fragment_size_msec);
-#else
 void pa_alsa_profile_set_probe(pa_alsa_profile_set *ps, const char *dev_id, const pa_sample_spec *ss, unsigned default_n_fragments, unsigned default_fragment_size_msec);
-#endif
 void pa_alsa_profile_set_free(pa_alsa_profile_set *s);
 void pa_alsa_profile_set_dump(pa_alsa_profile_set *s);
 void pa_alsa_profile_set_drop_unsupported(pa_alsa_profile_set *s);

diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index dacf4db..1c6ffb7 100644 (file)
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -2222,9 +2222,6 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
         }
 
         if (!(u->pcm_handle = pa_alsa_open_by_device_id_mapping(
-#ifdef __TIZEN__
-                      u->core,
-#endif
                       dev_id,
                       &u->device_name,
                       &ss, &map,
@@ -2239,9 +2236,6 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
             goto fail;
 
         if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
-#ifdef __TIZEN__
-                      u->core,
-#endif
                       dev_id,
                       &u->device_name,
                       &ss, &map,
@@ -2253,9 +2247,6 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
     } else {
 
         if (!(u->pcm_handle = pa_alsa_open_by_device_string(
-#ifdef __TIZEN__
-                      u->core,
-#endif
                       pa_modargs_get_value(ma, "device", DEFAULT_DEVICE),
                       &u->device_name,
                       &ss, &map,

diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 50e2a1b..399d4f3 100644 (file)
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1907,9 +1907,6 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
         }
 
         if (!(u->pcm_handle = pa_alsa_open_by_device_id_mapping(
-#ifdef __TIZEN__
-                      u->core,
-#endif
                       dev_id,
                       &u->device_name,
                       &ss, &map,
@@ -1924,9 +1921,6 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
             goto fail;
 
         if (!(u->pcm_handle = pa_alsa_open_by_device_id_auto(
-#ifdef __TIZEN__
-                      u->core,
-#endif
                       dev_id,
                       &u->device_name,
                       &ss, &map,
@@ -1938,9 +1932,6 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
     } else {
 
         if (!(u->pcm_handle = pa_alsa_open_by_device_string(
-#ifdef __TIZEN__
-                      u->core,
- #endif
                       pa_modargs_get_value(ma, "device", DEFAULT_DEVICE),
                       &u->device_name,
                       &ss, &map,

diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 30ffa2f..489eca1 100644 (file)
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -1388,9 +1388,6 @@ static snd_pcm_t* mapping_open_pcm(pa_alsa_ucm_config *ucm, pa_alsa_mapping *m,
     try_buffer_size = ucm->core->default_n_fragments * try_period_size;
 
     pcm = pa_alsa_open_by_device_string(
-#ifdef __TIZEN__
-            ucm->core,
-#endif
             m->device_strings[0], NULL, &try_ss,
             &try_map, mode, &try_period_size, &try_buffer_size, 0, NULL, NULL, exact_channels);
 

diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index c0b3f28..94576b1 100644 (file)
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -518,9 +518,6 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min, bool peri
 }
 
 snd_pcm_t *pa_alsa_open_by_device_id_auto(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         const char *dev_id,
         char **dev,
         pa_sample_spec *ss,
@@ -559,9 +556,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
         pa_log_debug("Checking for superset %s (%s)", m->name, m->device_strings[0]);
 
         pcm_handle = pa_alsa_open_by_device_id_mapping(
-#ifdef __TIZEN__
-                c,
-#endif
                 dev_id,
                 dev,
                 ss,
@@ -589,9 +583,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
         pa_log_debug("Checking for subset %s (%s)", m->name, m->device_strings[0]);
 
         pcm_handle = pa_alsa_open_by_device_id_mapping(
-#ifdef __TIZEN__
-                c,
-#endif
                 dev_id,
                 dev,
                 ss,
@@ -616,9 +607,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
     d = pa_sprintf_malloc("hw:%s", dev_id);
     pa_log_debug("Trying %s as last resort...", d);
     pcm_handle = pa_alsa_open_by_device_string(
-#ifdef __TIZEN__
-            c,
-#endif
             d,
             dev,
             ss,
@@ -639,9 +627,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
 }
 
 snd_pcm_t *pa_alsa_open_by_device_id_mapping(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         const char *dev_id,
         char **dev,
         pa_sample_spec *ss,
@@ -670,9 +655,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_mapping(
     try_map = m->channel_map;
 
     pcm_handle = pa_alsa_open_by_template(
-#ifdef __TIZEN__
-            c,
-#endif
             m->device_strings,
             dev_id,
             dev,
@@ -697,9 +679,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_mapping(
 }
 
 snd_pcm_t *pa_alsa_open_by_device_string(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         const char *device,
         char **dev,
         pa_sample_spec *ss,
@@ -790,9 +769,6 @@ fail:
 }
 
 snd_pcm_t *pa_alsa_open_by_template(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         char **template,
         const char *dev_id,
         char **dev,
@@ -815,9 +791,6 @@ snd_pcm_t *pa_alsa_open_by_template(
         d = pa_replace(*i, "%f", dev_id);
 
         pcm_handle = pa_alsa_open_by_device_string(
-#ifdef __TIZEN__
-                c,
-#endif
                 d,
                 dev,
                 ss,

diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
index 7a556c6..2a9269f 100644 (file)
--- a/src/modules/alsa/alsa-util.h
+++ b/src/modules/alsa/alsa-util.h
@@ -61,9 +61,6 @@ int pa_alsa_set_sw_params(
 
 /* Picks a working mapping from the profile set based on the specified ss/map */
 snd_pcm_t *pa_alsa_open_by_device_id_auto(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         const char *dev_id,
         char **dev,                       /* modified at return */
         pa_sample_spec *ss,               /* modified at return */
@@ -79,9 +76,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
 
 /* Uses the specified mapping */
 snd_pcm_t *pa_alsa_open_by_device_id_mapping(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         const char *dev_id,
         char **dev,                       /* modified at return */
         pa_sample_spec *ss,               /* modified at return */
@@ -96,9 +90,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_mapping(
 
 /* Opens the explicit ALSA device */
 snd_pcm_t *pa_alsa_open_by_device_string(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         const char *dir,
         char **dev,                       /* modified at return */
         pa_sample_spec *ss,               /* modified at return */
@@ -113,9 +104,6 @@ snd_pcm_t *pa_alsa_open_by_device_string(
 
 /* Opens the explicit ALSA device with a fallback list */
 snd_pcm_t *pa_alsa_open_by_template(
-#ifdef __TIZEN__
-        pa_core *c,
-#endif
         char **template,
         const char *dev_id,
         char **dev,                       /* modified at return */

diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index 9485d0d..4348ecb 100644 (file)
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -709,11 +709,7 @@ int pa__init(pa_module *m) {
 
     u->profile_set->ignore_dB = ignore_dB;
 
-#ifdef __TIZEN__
-    pa_alsa_profile_set_probe(u->profile_set, u->device_id, m->core, &m->core->default_sample_spec, m->core->default_n_fragments, m->core->default_fragment_size_msec);
-#else
     pa_alsa_profile_set_probe(u->profile_set, u->device_id, &m->core->default_sample_spec, m->core->default_n_fragments, m->core->default_fragment_size_msec);
-#endif
     pa_alsa_profile_set_dump(u->profile_set);
 
     pa_card_new_data_init(&data);