PCM: Fix conflict of _snd_pcm_hw_params definitions

Fix the call of _snd_pcm_hw_params() to _snd_pcm_hw_params_internal().
The build passed wrongly because of _snd_pcm_hw_params define.
Having the same function name as the struct name is is simply
confusing...

Also, to be sure, _snd_pcm_hw_params is undef'ed in pcm_local.h, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index d61670554b9f34d01171b11790feb9b3fd34863c..5053a7bcbde5895c2fae281bcfea0182c499340a 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -828,7 +828,7 @@ int snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 {
        int err;
        assert(pcm && params);
-       err = _snd_pcm_hw_params(pcm, params);
+       err = _snd_pcm_hw_params_internal(pcm, params);
        if (err < 0)
                return err;
        err = snd_pcm_prepare(pcm);

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
index c8214b4acb4335fac0fdb9fae0cc2fd8adce0d7f..59504019d557487700d0ae46118d17c820d4c388 100644 (file)
--- a/src/pcm/pcm_file.c
+++ b/src/pcm/pcm_file.c
@@ -602,7 +602,7 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
        snd_pcm_file_t *file = pcm->private_data;
        unsigned int channel;
        snd_pcm_t *slave = file->gen.slave;
-       int err = _snd_pcm_hw_params(slave, params);
+       int err = _snd_pcm_hw_params_internal(slave, params);
        if (err < 0)
                return err;
        file->buffer_bytes = snd_pcm_frames_to_bytes(slave, slave->buffer_size);

diff --git a/src/pcm/pcm_generic.c b/src/pcm/pcm_generic.c
index 5fc4888538b8c52b505fde2e8948137bd4367a75..f068ee2585bc10bf18d1e7864d3051373ab77440 100644 (file)
--- a/src/pcm/pcm_generic.c
+++ b/src/pcm/pcm_generic.c
@@ -101,7 +101,7 @@ int snd_pcm_generic_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 int snd_pcm_generic_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 {
        snd_pcm_generic_t *generic = pcm->private_data;
-       return _snd_pcm_hw_params(generic->slave, params);
+       return _snd_pcm_hw_params_internal(generic->slave, params);
 }
 
 int snd_pcm_generic_prepare(snd_pcm_t *pcm)

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index c616e56968399aafc7f451e3e04fc8be34a8a76d..63b9036f551fbc0fa90aaa04e428f2e738ade3e7 100644 (file)
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -579,6 +579,7 @@ static inline int muldiv_near(int a, int b, int c)
 
 int snd_pcm_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
 int _snd_pcm_hw_params_internal(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
+#undef _snd_pcm_hw_params
 int snd_pcm_hw_refine_soft(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
 int snd_pcm_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
                            int (*cprepare)(snd_pcm_t *pcm,

diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c
index e60b92d999add1ae48865f557f528f599f3bf302..573b6fe59d1d604092140587893d03f318e28cf8 100644 (file)
--- a/src/pcm/pcm_meter.c
+++ b/src/pcm/pcm_meter.c
@@ -419,7 +419,7 @@ static int snd_pcm_meter_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa
 static int snd_pcm_meter_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 {
        snd_pcm_meter_t *meter = pcm->private_data;
-       return _snd_pcm_hw_params(meter->gen.slave, params);
+       return _snd_pcm_hw_params_internal(meter->gen.slave, params);
 }
 
 static int snd_pcm_meter_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)

diff --git a/src/pcm/pcm_mmap_emul.c b/src/pcm/pcm_mmap_emul.c
index 67d2e050c1a8aa0ced9ef48c268c489c0dcf8459..63789bc07c1be7de4b184ea8a5fa1cb0d900cb68 100644 (file)
--- a/src/pcm/pcm_mmap_emul.c
+++ b/src/pcm/pcm_mmap_emul.c
@@ -160,7 +160,7 @@ static int snd_pcm_mmap_emul_hw_params(snd_pcm_t *pcm,
        snd_pcm_access_mask_t *pmask;
        int err;
 
-       err = _snd_pcm_hw_params(map->gen.slave, params);
+       err = _snd_pcm_hw_params_internal(map->gen.slave, params);
        if (err >= 0) {
                map->mmap_emul = 0;
                return err;
@@ -186,7 +186,7 @@ static int snd_pcm_mmap_emul_hw_params(snd_pcm_t *pcm,
        default:
                goto _err;
        }
-       err = _snd_pcm_hw_params(map->gen.slave, params);
+       err = _snd_pcm_hw_params_internal(map->gen.slave, params);
        if (err < 0)
                goto _err;
 

diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index 0bd88504975f511a42cf1a8726e52a45bf6de76b..fa84eaacaedc6d344c093d71fc95594e43cdaab4 100644 (file)
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -1040,7 +1040,7 @@ static int snd_pcm_plug_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
                        return err;
        }
        slave = plug->gen.slave;
-       err = _snd_pcm_hw_params(slave, params);
+       err = _snd_pcm_hw_params_internal(slave, params);
        if (err < 0) {
                snd_pcm_plug_clear(pcm);
                return err;

diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
index 936e2f973ce5249e87618e00297aa3186da407e6..118ab26177809574bd8996d34f7062d1b02ba80b 100644 (file)
--- a/src/pcm/pcm_share.c
+++ b/src/pcm/pcm_share.c
@@ -595,7 +595,7 @@ static int snd_pcm_share_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa
 static int snd_pcm_share_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 {
        snd_pcm_share_t *share = pcm->private_data;
-       return _snd_pcm_hw_params(share->slave->pcm, params);
+       return _snd_pcm_hw_params_internal(share->slave->pcm, params);
 }
 
 static int snd_pcm_share_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)