Removed dig_info & dig_params..

diff --git a/aserver/aserver.c b/aserver/aserver.c
index cf8119ce976870e141d0168922c19b5eb0d0e56f..ebedb059ccfe318978c09a06bcc07e5fc1b15f3c 100644 (file)
--- a/aserver/aserver.c
+++ b/aserver/aserver.c
@@ -388,12 +388,6 @@ int pcm_shm_cmd(client_t *client)
        case SND_PCM_IOCTL_SW_PARAMS:
                ctrl->result = snd_pcm_sw_params(pcm, (snd_pcm_sw_params_t *) &ctrl->u.sw_params);
                break;
-       case SND_PCM_IOCTL_DIG_PARAMS:
-               ctrl->result = snd_pcm_dig_params(pcm, (snd_pcm_dig_params_t *) &ctrl->u.dig_params);
-               break;
-       case SND_PCM_IOCTL_DIG_INFO:
-               ctrl->result = snd_pcm_dig_info(pcm, (snd_pcm_dig_info_t *) &ctrl->u.dig_info);
-               break;
        case SND_PCM_IOCTL_STATUS:
                ctrl->result = snd_pcm_status(pcm, (snd_pcm_status_t *) &ctrl->u.status);
                break;

diff --git a/include/aserver.h b/include/aserver.h
index f66944c7b9e99b4948517fa7180c3cb1b8739e18..209f4425d43dc23fceee8c34aeff394d5454dfb1 100644 (file)
--- a/include/aserver.h
+++ b/include/aserver.h
@@ -45,8 +45,6 @@ typedef struct {
                snd_pcm_hw_params_t hw_refine;
                snd_pcm_hw_params_t hw_params;
                snd_pcm_sw_params_t sw_params;
-               snd_pcm_dig_params_t dig_params;
-               snd_pcm_dig_info_t dig_info;
                snd_pcm_status_t status;
                struct {
                        ssize_t frames;

diff --git a/include/pcm.h b/include/pcm.h
index 01ba31497bc059bff29f3ca688e7ae2dc39d8813..c5d49af56fb4a2396092a89a1d210e79cb2d2177 100644 (file)
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -59,8 +59,6 @@ int snd_pcm_async(snd_pcm_t *pcm, int sig, pid_t pid);
 int snd_pcm_info(snd_pcm_t *pcm, snd_pcm_info_t *info);
 int snd_pcm_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
 int snd_pcm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
-int snd_pcm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info);
-int snd_pcm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params);
 int snd_pcm_status(snd_pcm_t *pcm, snd_pcm_status_t *status);
 int snd_pcm_prepare(snd_pcm_t *pcm);
 int snd_pcm_reset(snd_pcm_t *pcm);

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 7de083cb1b816efc57ac9e9cd585b8e38b463b27..bb96a9001f35c33cfcf5bd0412a9fe3f9eacb5f3 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -112,18 +112,6 @@ int snd_pcm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
        return 0;
 }
 
-int snd_pcm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params)
-{
-       assert(pcm && params);
-       return pcm->ops->dig_params(pcm->op_arg, params);
-}
-
-int snd_pcm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info)
-{
-       assert(pcm && info);
-       return pcm->ops->dig_info(pcm->op_arg, info);
-}
-
 int snd_pcm_status(snd_pcm_t *pcm, snd_pcm_status_t *status)
 {
        assert(pcm && status);

diff --git a/src/pcm/pcm_adpcm.c b/src/pcm/pcm_adpcm.c
index 2946b48ec786c92cf99a67f3562eb1ff9901c578..1830713230bbd9ab0e84275660d6178967495e9a 100644 (file)
--- a/src/pcm/pcm_adpcm.c
+++ b/src/pcm/pcm_adpcm.c
@@ -536,8 +536,6 @@ snd_pcm_ops_t snd_pcm_adpcm_ops = {
        hw_refine: snd_pcm_adpcm_hw_refine,
        hw_params: snd_pcm_adpcm_hw_params,
        sw_params: snd_pcm_plugin_sw_params,
-       dig_info: snd_pcm_plugin_dig_info,
-       dig_params: snd_pcm_plugin_dig_params,
        channel_info: snd_pcm_plugin_channel_info,
        dump: snd_pcm_adpcm_dump,
        nonblock: snd_pcm_plugin_nonblock,

diff --git a/src/pcm/pcm_alaw.c b/src/pcm/pcm_alaw.c
index d29dab8f742fe503852def417714fb01d8bb1d47..6459b0b54504f20b473a66d27cb164bcfae032c8 100644 (file)
--- a/src/pcm/pcm_alaw.c
+++ b/src/pcm/pcm_alaw.c
@@ -404,8 +404,6 @@ snd_pcm_ops_t snd_pcm_alaw_ops = {
        hw_refine: snd_pcm_alaw_hw_refine,
        hw_params: snd_pcm_alaw_hw_params,
        sw_params: snd_pcm_plugin_sw_params,
-       dig_info: snd_pcm_plugin_dig_info,
-       dig_params: snd_pcm_plugin_dig_params,
        channel_info: snd_pcm_plugin_channel_info,
        dump: snd_pcm_alaw_dump,
        nonblock: snd_pcm_plugin_nonblock,

diff --git a/src/pcm/pcm_copy.c b/src/pcm/pcm_copy.c
index 4a9ea503efb5ae283bc01813dddb0327e7be3326..25773dfa2ee1892aa7570c9ceecb32613c7d70dd 100644 (file)
--- a/src/pcm/pcm_copy.c
+++ b/src/pcm/pcm_copy.c
@@ -162,8 +162,6 @@ snd_pcm_ops_t snd_pcm_copy_ops = {
        hw_refine: snd_pcm_copy_hw_refine,
        hw_params: snd_pcm_copy_hw_params,
        sw_params: snd_pcm_plugin_sw_params,
-       dig_info: snd_pcm_plugin_dig_info,
-       dig_params: snd_pcm_plugin_dig_params,
        channel_info: snd_pcm_plugin_channel_info,
        dump: snd_pcm_copy_dump,
        nonblock: snd_pcm_plugin_nonblock,

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
index bd464cb71a060596f09332e5a9b23a4ad48711c6..55ca56939fa9165b1b9b35bda947745a8c1e1ebf 100644 (file)
--- a/src/pcm/pcm_file.c
+++ b/src/pcm/pcm_file.c
@@ -272,18 +272,6 @@ static int snd_pcm_file_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
        return snd_pcm_sw_params(file->slave, params);
 }
 
-static int snd_pcm_file_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
-{
-       snd_pcm_file_t *file = pcm->private;
-       return snd_pcm_dig_info(file->slave, info);
-}
-
-static int snd_pcm_file_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
-{
-       snd_pcm_file_t *file = pcm->private;
-       return snd_pcm_dig_params(file->slave, params);
-}
-
 static int snd_pcm_file_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
 {
        snd_pcm_file_t *file = pcm->private;
@@ -317,8 +305,6 @@ snd_pcm_ops_t snd_pcm_file_ops = {
        hw_refine: snd_pcm_file_hw_refine,
        hw_params: snd_pcm_file_hw_params,
        sw_params: snd_pcm_file_sw_params,
-       dig_info: snd_pcm_file_dig_info,
-       dig_params: snd_pcm_file_dig_params,
        channel_info: snd_pcm_file_channel_info,
        dump: snd_pcm_file_dump,
        nonblock: snd_pcm_file_nonblock,

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 78e1ecf372fdd56526cc44ce56bb2b418fedfdea..63dea446e8db6b1dbcf4d186d60d0f4a9b0be05a 100644 (file)
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -153,28 +153,6 @@ static int snd_pcm_hw_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
        return 0;
 }
 
-static int snd_pcm_hw_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
-{
-       snd_pcm_hw_t *hw = pcm->private;
-       int fd = hw->fd;
-       if (ioctl(fd, SND_PCM_IOCTL_DIG_INFO, info) < 0) {
-               SYSERR("SND_PCM_IOCTL_DIG_INFO failed");
-               return -errno;
-       }
-       return 0;
-}
-
-static int snd_pcm_hw_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
-{
-       snd_pcm_hw_t *hw = pcm->private;
-       int fd = hw->fd;
-       if (ioctl(fd, SND_PCM_IOCTL_DIG_PARAMS, params) < 0) {
-               SYSERR("SND_PCM_IOCTL_DIG_PARAMS failed");
-               return -errno;
-       }
-       return 0;
-}
-
 static int snd_pcm_hw_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t * info)
 {
        snd_pcm_hw_t *hw = pcm->private;
@@ -525,8 +503,6 @@ snd_pcm_ops_t snd_pcm_hw_ops = {
        hw_refine: snd_pcm_hw_hw_refine,
        hw_params: snd_pcm_hw_hw_params,
        sw_params: snd_pcm_hw_sw_params,
-       dig_info: snd_pcm_hw_dig_info,
-       dig_params: snd_pcm_hw_dig_params,
        channel_info: snd_pcm_hw_channel_info,
        dump: snd_pcm_hw_dump,
        nonblock: snd_pcm_hw_nonblock,

diff --git a/src/pcm/pcm_linear.c b/src/pcm/pcm_linear.c
index 0647ee0755a2d783289463ac79c3b516ad865c7f..9ecb5252ab8c037ddf79dbbcdd841396e954b1ef 100644 (file)
--- a/src/pcm/pcm_linear.c
+++ b/src/pcm/pcm_linear.c
@@ -243,8 +243,6 @@ snd_pcm_ops_t snd_pcm_linear_ops = {
        hw_refine: snd_pcm_linear_hw_refine,
        hw_params: snd_pcm_linear_hw_params,
        sw_params: snd_pcm_plugin_sw_params,
-       dig_info: snd_pcm_plugin_dig_info,
-       dig_params: snd_pcm_plugin_dig_params,
        channel_info: snd_pcm_plugin_channel_info,
        dump: snd_pcm_linear_dump,
        nonblock: snd_pcm_plugin_nonblock,

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index 0bf9796bb075a5ff5dc0ed18eee7d74a188421ae..6bfdb70777b22058d6103b2fe1da28bdffbb71dc 100644 (file)
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -62,8 +62,6 @@ typedef struct {
        int (*hw_refine)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
        int (*hw_params)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
        int (*sw_params)(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
-       int (*dig_info)(snd_pcm_t *pcm, snd_pcm_dig_info_t *info);
-       int (*dig_params)(snd_pcm_t *pcm, snd_pcm_dig_params_t *params);
        int (*channel_info)(snd_pcm_t *pcm, snd_pcm_channel_info_t *info);
        void (*dump)(snd_pcm_t *pcm, FILE *fp);
        int (*mmap)(snd_pcm_t *pcm);

diff --git a/src/pcm/pcm_mulaw.c b/src/pcm/pcm_mulaw.c
index 4b937911310c53d3600038677d91a2c9c739906e..ec0642f124909ee3f7ace14c527c7a27d60e732c 100644 (file)
--- a/src/pcm/pcm_mulaw.c
+++ b/src/pcm/pcm_mulaw.c
@@ -421,8 +421,6 @@ snd_pcm_ops_t snd_pcm_mulaw_ops = {
        hw_refine: snd_pcm_mulaw_hw_refine,
        hw_params: snd_pcm_mulaw_hw_params,
        sw_params: snd_pcm_plugin_sw_params,
-       dig_info: snd_pcm_plugin_dig_info,
-       dig_params: snd_pcm_plugin_dig_params,
        channel_info: snd_pcm_plugin_channel_info,
        dump: snd_pcm_mulaw_dump,
        nonblock: snd_pcm_plugin_nonblock,

diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c
index 57578a3ef9816e5da794a4f369504b5554f5184a..f36dd222b85eee463fe513d14c02ad5225ffa167 100644 (file)
--- a/src/pcm/pcm_multi.c
+++ b/src/pcm/pcm_multi.c
@@ -220,18 +220,6 @@ static int snd_pcm_multi_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
        return 0;
 }
 
-static int snd_pcm_multi_dig_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_info_t *info ATTRIBUTE_UNUSED)
-{
-       /* FIXME */
-       return -ENOSYS;
-}
-
-static int snd_pcm_multi_dig_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_params_t *params ATTRIBUTE_UNUSED)
-{
-       /* FIXME */
-       return -ENOSYS;
-}
-
 static int snd_pcm_multi_status(snd_pcm_t *pcm, snd_pcm_status_t *status)
 {
        snd_pcm_multi_t *multi = pcm->private;
@@ -406,8 +394,6 @@ snd_pcm_ops_t snd_pcm_multi_ops = {
        hw_refine: snd_pcm_multi_hw_refine,
        hw_params: snd_pcm_multi_hw_params,
        sw_params: snd_pcm_multi_sw_params,
-       dig_info: snd_pcm_multi_dig_info,
-       dig_params: snd_pcm_multi_dig_params,
        channel_info: snd_pcm_multi_channel_info,
        dump: snd_pcm_multi_dump,
        nonblock: snd_pcm_multi_nonblock,

diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c
index bdedd22f1bd7c292f976d5e8be339f179ef1fc74..171a79e4fa62db8fb18548222c10ff4b0218d684 100644 (file)
--- a/src/pcm/pcm_null.c
+++ b/src/pcm/pcm_null.c
@@ -234,7 +234,6 @@ static int snd_pcm_null_hw_refine(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_pa
 {
        _snd_pcm_hw_refine(params);
        params->fifo_size = 0;
-       params->dig_groups = 0;
        return 0;
 }
 
@@ -260,16 +259,6 @@ static int snd_pcm_null_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_pa
        return 0;
 }
 
-static int snd_pcm_null_dig_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_params_t *params ATTRIBUTE_UNUSED)
-{
-       return 0;
-}
-
-static int snd_pcm_null_dig_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_info_t *info ATTRIBUTE_UNUSED)
-{
-       return 0;
-}
-
 static int snd_pcm_null_mmap(snd_pcm_t *pcm)
 {
        snd_pcm_null_t *null = pcm->private;
@@ -310,8 +299,6 @@ snd_pcm_ops_t snd_pcm_null_ops = {
        hw_refine: snd_pcm_null_hw_refine,
        hw_params: snd_pcm_null_hw_params,
        sw_params: snd_pcm_null_sw_params,
-       dig_params: snd_pcm_null_dig_params,
-       dig_info: snd_pcm_null_dig_info,
        channel_info: snd_pcm_null_channel_info,
        dump: snd_pcm_null_dump,
        nonblock: snd_pcm_null_nonblock,

diff --git a/src/pcm/pcm_params.c b/src/pcm/pcm_params.c
index b944ed9c1826a49aade42bf67755facbd6a6307f..3adab781bde23d0344852fa7b8d37c171d8a2bf3 100644 (file)
--- a/src/pcm/pcm_params.c
+++ b/src/pcm/pcm_params.c
@@ -93,7 +93,6 @@ void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params)
        interval_setreal(params_interval(params, SND_PCM_HW_PARAM_FRAGMENT_LENGTH));
        interval_setreal(params_interval(params, SND_PCM_HW_PARAM_BUFFER_LENGTH));
        params->info = ~0U;
-       params->dig_groups = UINT_MAX;
 }
 
 /* Fill PARAMS with full configuration space boundaries */
@@ -606,14 +605,6 @@ int snd_pcm_hw_params_info_fifo_size(const snd_pcm_hw_params_t *params)
        return params->fifo_size;
 }
 
-/* Return count of digital groups for configuration space defined by PARAMS */
-int snd_pcm_hw_params_info_dig_groups(const snd_pcm_hw_params_t *params)
-{
-       if (params->dig_groups == UINT_MAX)
-               return -EINVAL;
-       return params->dig_groups;
-}
-
 /* Choose one configuration from configuration space defined by PARAMS
    The configuration choosen is that obtained fixing in this order:
    first access

diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index 1a833f5b8cd45274afc9a0c998ab225d9e8a6686..0019c6e2546750666ec20f68e39f99ffb812d6cd 100644 (file)
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -620,19 +620,6 @@ static int snd_pcm_plug_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
        return err;
 }
 
-static int snd_pcm_plug_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
-{
-       snd_pcm_plug_t *plug = pcm->private;
-       return snd_pcm_dig_info(plug->slave, info);
-}
-
-static int snd_pcm_plug_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
-{
-       snd_pcm_plug_t *plug = pcm->private;
-       return snd_pcm_dig_params(plug->slave, params);
-}
-
-
 static int snd_pcm_plug_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
 {
        snd_pcm_plug_t *plug = pcm->private;
@@ -662,8 +649,6 @@ snd_pcm_ops_t snd_pcm_plug_ops = {
        hw_refine: snd_pcm_plug_hw_refine,
        hw_params: snd_pcm_plug_hw_params,
        sw_params: snd_pcm_plug_sw_params,
-       dig_info: snd_pcm_plug_dig_info,
-       dig_params: snd_pcm_plug_dig_params,
        channel_info: snd_pcm_plug_channel_info,
        dump: snd_pcm_plug_dump,
        nonblock: snd_pcm_plug_nonblock,

diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
index d8d36232e0b466f042e63f9a4a521ed1a412d52e..342cbe27a16543c69f3760e4258e7ed4e1aee1da 100644 (file)
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -58,18 +58,6 @@ int snd_pcm_plugin_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
        return snd_pcm_sw_params(plugin->slave, params);
 }
 
-int snd_pcm_plugin_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info)
-{
-       snd_pcm_plugin_t *plugin = pcm->private;
-       return snd_pcm_dig_info(plugin->slave, info);
-}
-
-int snd_pcm_plugin_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params)
-{
-       snd_pcm_plugin_t *plugin = pcm->private;
-       return snd_pcm_dig_params(plugin->slave, params);
-}
-
 int snd_pcm_plugin_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
 {
        snd_pcm_plugin_t *plugin = pcm->private;

diff --git a/src/pcm/pcm_plugin.h b/src/pcm/pcm_plugin.h
index 1cab1044b03a6ab9b7d6d5d02de99961f38539d1..cf58714ecaa71ffac526d47d1aaca20f4844b982 100644 (file)
--- a/src/pcm/pcm_plugin.h
+++ b/src/pcm/pcm_plugin.h
@@ -35,8 +35,6 @@ int snd_pcm_plugin_nonblock(snd_pcm_t *pcm, int nonblock);
 int snd_pcm_plugin_async(snd_pcm_t *pcm, int sig, pid_t pid);
 int snd_pcm_plugin_info(snd_pcm_t *pcm, snd_pcm_info_t * info);
 int snd_pcm_plugin_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
-int snd_pcm_plugin_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info);
-int snd_pcm_plugin_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params);
 int snd_pcm_plugin_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t * info);
 int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status);
 int snd_pcm_plugin_state(snd_pcm_t *pcm);

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index 74dfbdb3dc8381ea9e460cd3febe7609806613ef..ffb9349cc98b3306541d0ccff95f8fccee000ea3 100644 (file)
--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -515,8 +515,6 @@ snd_pcm_ops_t snd_pcm_rate_ops = {
        hw_refine: snd_pcm_rate_hw_refine,
        hw_params: snd_pcm_rate_hw_params,
        sw_params: snd_pcm_rate_sw_params,
-       dig_info: snd_pcm_plugin_dig_info,
-       dig_params: snd_pcm_plugin_dig_params,
        channel_info: snd_pcm_plugin_channel_info,
        dump: snd_pcm_rate_dump,
        nonblock: snd_pcm_plugin_nonblock,

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index cbebad8bb07c737798bbc5bbccf120e90235c663..3aec22a2e5505e3f56130d426693aacd8e61f8bb 100644 (file)
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -664,8 +664,6 @@ snd_pcm_ops_t snd_pcm_route_ops = {
        hw_refine: snd_pcm_route_hw_refine,
        hw_params: snd_pcm_route_hw_params,
        sw_params: snd_pcm_plugin_sw_params,
-       dig_info: snd_pcm_plugin_dig_info,
-       dig_params: snd_pcm_plugin_dig_params,
        channel_info: snd_pcm_plugin_channel_info,
        dump: snd_pcm_route_dump,
        nonblock: snd_pcm_plugin_nonblock,

diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
index 0bf9d664fe0f33716c1a9371548f0215595fdc3f..071f59f09c532b49b90af4c9992542b12831df01 100644 (file)
--- a/src/pcm/pcm_share.c
+++ b/src/pcm/pcm_share.c
@@ -591,30 +591,6 @@ static int snd_pcm_share_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_p
        return 0;
 }
 
-static int snd_pcm_share_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info)
-{
-       snd_pcm_share_t *share = pcm->private;
-       snd_pcm_share_slave_t *slave = share->slave;
-       int err;
-       /* FIXME */
-       Pthread_mutex_lock(&slave->mutex);
-       err = snd_pcm_dig_info(slave->pcm, info);
-       Pthread_mutex_unlock(&slave->mutex);
-       return err;
-}
-
-static int snd_pcm_share_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params)
-{
-       snd_pcm_share_t *share = pcm->private;
-       snd_pcm_share_slave_t *slave = share->slave;
-       int err;
-       /* FIXME */
-       Pthread_mutex_lock(&slave->mutex);
-       err = snd_pcm_dig_params(slave->pcm, params);
-       Pthread_mutex_unlock(&slave->mutex);
-       return err;
-}
-
 static int snd_pcm_share_status(snd_pcm_t *pcm, snd_pcm_status_t *status)
 {
        snd_pcm_share_t *share = pcm->private;
@@ -1110,8 +1086,6 @@ snd_pcm_ops_t snd_pcm_share_ops = {
        hw_refine: snd_pcm_share_hw_refine,
        hw_params: snd_pcm_share_hw_params,
        sw_params: snd_pcm_share_sw_params,
-       dig_info: snd_pcm_share_dig_info,
-       dig_params: snd_pcm_share_dig_params,
        channel_info: snd_pcm_share_channel_info,
        dump: snd_pcm_share_dump,
        nonblock: snd_pcm_share_nonblock,

diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
index cac1108d96d97a004de26f33a126a9130872ccb9..c9e730579d8de9669bb2eb34ac4b6bc7ce7e890a 100644 (file)
--- a/src/pcm/pcm_shm.c
+++ b/src/pcm/pcm_shm.c
@@ -217,34 +217,6 @@ static int snd_pcm_shm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)
        return err;
 }
 
-static int snd_pcm_shm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info)
-{
-       snd_pcm_shm_t *shm = pcm->private;
-       volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
-       int err;
-       ctrl->cmd = SND_PCM_IOCTL_DIG_INFO;
-       ctrl->u.dig_info = *info;
-       err = snd_pcm_shm_action(pcm);
-       if (err < 0)
-               return err;
-       *info = ctrl->u.dig_info;
-       return err;
-}
-
-static int snd_pcm_shm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params)
-{
-       snd_pcm_shm_t *shm = pcm->private;
-       volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
-       int err;
-       ctrl->cmd = SND_PCM_IOCTL_DIG_PARAMS;
-       ctrl->u.dig_params = *params;
-       err = snd_pcm_shm_action(pcm);
-       *params = ctrl->u.dig_params;
-       if (err < 0)
-               return err;
-       return err;
-}
-
 static int snd_pcm_shm_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
 {
        return 0;
@@ -474,8 +446,6 @@ snd_pcm_ops_t snd_pcm_shm_ops = {
        hw_refine: snd_pcm_shm_hw_refine,
        hw_params: snd_pcm_shm_hw_params,
        sw_params: snd_pcm_shm_sw_params,
-       dig_info: snd_pcm_shm_dig_info,
-       dig_params: snd_pcm_shm_dig_params,
        channel_info: snd_pcm_shm_channel_info,
        dump: snd_pcm_shm_dump,
        nonblock: snd_pcm_shm_nonblock,