Make all the PCM plugins ops structure constant.

This ensures they are emitted in .data.rel.ro rather than .data.rel,
which should make a nice difference when using prelink.

Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>

diff --git a/src/pcm/pcm_adpcm.c b/src/pcm/pcm_adpcm.c
index 29599f3e4c667eeceda7e60a4102f3273a7db80a..b68007f9bb4ffa4cc9b063b262a947c7e673bde1 100644 (file)
--- a/src/pcm/pcm_adpcm.c
+++ b/src/pcm/pcm_adpcm.c
@@ -518,7 +518,7 @@ static void snd_pcm_adpcm_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(adpcm->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_adpcm_ops = {
+static const snd_pcm_ops_t snd_pcm_adpcm_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_adpcm_hw_refine,

diff --git a/src/pcm/pcm_alaw.c b/src/pcm/pcm_alaw.c
index 3814241aaab8a69f72475cd29fcfe4c3e279969b..09ad4819dc5eb0be943457f1fadae5c5853d7a25 100644 (file)
--- a/src/pcm/pcm_alaw.c
+++ b/src/pcm/pcm_alaw.c
@@ -391,7 +391,7 @@ static void snd_pcm_alaw_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(alaw->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_alaw_ops = {
+static const snd_pcm_ops_t snd_pcm_alaw_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_alaw_hw_refine,

diff --git a/src/pcm/pcm_copy.c b/src/pcm/pcm_copy.c
index 9d3eb38501efa8aef344d37265982cad57cb3c98..072bb12598a1b56de132569d85ec53489eed249f 100644 (file)
--- a/src/pcm/pcm_copy.c
+++ b/src/pcm/pcm_copy.c
@@ -152,7 +152,7 @@ static void snd_pcm_copy_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(copy->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_copy_ops = {
+static const snd_pcm_ops_t snd_pcm_copy_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_copy_hw_refine,

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index bb79ec6184cbf2affa6373a91afcedcec32d31c0..5b967e864b675c8ef712e6ff4f87be494fb16473 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -869,7 +869,7 @@ static void snd_pcm_dmix_dump(snd_pcm_t *pcm, snd_output_t *out)
                snd_pcm_dump(dmix->spcm, out);
 }
 
-static snd_pcm_ops_t snd_pcm_dmix_ops = {
+static const snd_pcm_ops_t snd_pcm_dmix_ops = {
        .close = snd_pcm_dmix_close,
        .info = snd_pcm_direct_info,
        .hw_refine = snd_pcm_direct_hw_refine,
@@ -884,7 +884,7 @@ static snd_pcm_ops_t snd_pcm_dmix_ops = {
        .munmap = snd_pcm_direct_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_dmix_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_dmix_fast_ops = {
        .status = snd_pcm_dmix_status,
        .state = snd_pcm_dmix_state,
        .hwsync = snd_pcm_dmix_hwsync,

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index bfe66a8b06b3907e8bef8855721377d8d3e207fb..c91fa3b18ef971e0a829a69e73223eccf28075ab 100644 (file)
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -560,7 +560,7 @@ static void snd_pcm_dshare_dump(snd_pcm_t *pcm, snd_output_t *out)
                snd_pcm_dump(dshare->spcm, out);
 }
 
-static snd_pcm_ops_t snd_pcm_dshare_ops = {
+static const snd_pcm_ops_t snd_pcm_dshare_ops = {
        .close = snd_pcm_dshare_close,
        .info = snd_pcm_direct_info,
        .hw_refine = snd_pcm_direct_hw_refine,
@@ -575,7 +575,7 @@ static snd_pcm_ops_t snd_pcm_dshare_ops = {
        .munmap = snd_pcm_direct_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_dshare_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_dshare_fast_ops = {
        .status = snd_pcm_dshare_status,
        .state = snd_pcm_dshare_state,
        .hwsync = snd_pcm_dshare_hwsync,

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index 1f602c3f701c29b558dc4117078103ad6db1d028..9d42c1230339129b95d6e06aecfe8b95ca276726 100644 (file)
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -455,7 +455,7 @@ static void snd_pcm_dsnoop_dump(snd_pcm_t *pcm, snd_output_t *out)
                snd_pcm_dump(dsnoop->spcm, out);
 }
 
-static snd_pcm_ops_t snd_pcm_dsnoop_ops = {
+static const snd_pcm_ops_t snd_pcm_dsnoop_ops = {
        .close = snd_pcm_dsnoop_close,
        .info = snd_pcm_direct_info,
        .hw_refine = snd_pcm_direct_hw_refine,
@@ -470,7 +470,7 @@ static snd_pcm_ops_t snd_pcm_dsnoop_ops = {
        .munmap = snd_pcm_direct_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_dsnoop_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_dsnoop_fast_ops = {
        .status = snd_pcm_dsnoop_status,
        .state = snd_pcm_dsnoop_state,
        .hwsync = snd_pcm_dsnoop_hwsync,

diff --git a/src/pcm/pcm_extplug.c b/src/pcm/pcm_extplug.c
index 31d8d9464f0fd52bb553965ef629e1761cdd6c4b..a34706ff361cdac6f916a08a8b0fde125e1eba54 100644 (file)
--- a/src/pcm/pcm_extplug.c
+++ b/src/pcm/pcm_extplug.c
@@ -425,7 +425,7 @@ static int snd_pcm_extplug_close(snd_pcm_t *pcm)
        return 0;
 }
 
-static snd_pcm_ops_t snd_pcm_extplug_ops = {
+static const snd_pcm_ops_t snd_pcm_extplug_ops = {
        .close = snd_pcm_extplug_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_extplug_hw_refine,

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
index 376dac0d102cb283cf3827ff1688a918a6471b53..82823a0496c06edc0c23f1fb1c8de8d1dfb1bc5a 100644 (file)
--- a/src/pcm/pcm_file.c
+++ b/src/pcm/pcm_file.c
@@ -460,7 +460,7 @@ static void snd_pcm_file_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(file->gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_file_ops = {
+static const snd_pcm_ops_t snd_pcm_file_ops = {
        .close = snd_pcm_file_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_generic_hw_refine,
@@ -475,7 +475,7 @@ static snd_pcm_ops_t snd_pcm_file_ops = {
        .munmap = snd_pcm_generic_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_file_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_file_fast_ops = {
        .status = snd_pcm_generic_status,
        .state = snd_pcm_generic_state,
        .hwsync = snd_pcm_generic_hwsync,

diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c
index 0abe8191c036c0af22cd0062312d1c78b595cebd..826685f82146402315fcb2b6ecdccb381ebfad9e 100644 (file)
--- a/src/pcm/pcm_hooks.c
+++ b/src/pcm/pcm_hooks.c
@@ -121,7 +121,7 @@ static void snd_pcm_hooks_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(h->gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_hooks_ops = {
+static const snd_pcm_ops_t snd_pcm_hooks_ops = {
        .close = snd_pcm_hooks_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_generic_hw_refine,
@@ -136,7 +136,7 @@ static snd_pcm_ops_t snd_pcm_hooks_ops = {
        .munmap = snd_pcm_generic_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_hooks_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_hooks_fast_ops = {
        .status = snd_pcm_generic_status,
        .state = snd_pcm_generic_state,
        .hwsync = snd_pcm_generic_hwsync,

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index c8d9a627d866d62415b6c9a33df3726d62d1f991..e9ce0927af60f5ed9af831ef58d4e56cf2684aa3 100644 (file)
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -80,8 +80,8 @@ struct sndrv_pcm_hw_params_old {
 
 static int use_old_hw_params_ioctl(int fd, unsigned int cmd, snd_pcm_hw_params_t *params);
 static snd_pcm_sframes_t snd_pcm_hw_avail_update(snd_pcm_t *pcm);
-static snd_pcm_fast_ops_t snd_pcm_hw_fast_ops;
-static snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer;
+static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops;
+static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer;
 
 /*
  *
@@ -1040,7 +1040,7 @@ static void snd_pcm_hw_dump(snd_pcm_t *pcm, snd_output_t *out)
        }
 }
 
-static snd_pcm_ops_t snd_pcm_hw_ops = {
+static const snd_pcm_ops_t snd_pcm_hw_ops = {
        .close = snd_pcm_hw_close,
        .info = snd_pcm_hw_info,
        .hw_refine = snd_pcm_hw_hw_refine,
@@ -1055,7 +1055,7 @@ static snd_pcm_ops_t snd_pcm_hw_ops = {
        .munmap = snd_pcm_hw_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_hw_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops = {
        .status = snd_pcm_hw_status,
        .state = snd_pcm_hw_state,
        .hwsync = snd_pcm_hw_hwsync,
@@ -1086,7 +1086,7 @@ static snd_pcm_fast_ops_t snd_pcm_hw_fast_ops = {
        .poll_revents = NULL,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer = {
+static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer = {
        .status = snd_pcm_hw_status,
        .state = snd_pcm_hw_state,
        .hwsync = snd_pcm_hw_hwsync,

diff --git a/src/pcm/pcm_iec958.c b/src/pcm/pcm_iec958.c
index 5e4858db982e267efc92bc662a5354632114974f..3d70ed0f921acea5f6ecbde986c50733a878349b 100644 (file)
--- a/src/pcm/pcm_iec958.c
+++ b/src/pcm/pcm_iec958.c
@@ -416,7 +416,7 @@ static void snd_pcm_iec958_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(iec->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_iec958_ops = {
+static const snd_pcm_ops_t snd_pcm_iec958_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_iec958_hw_refine,

diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
index 393dfa409a288167295f1dc3b2897d0e21293e2b..e43d3548ba4106816b62d88f10ebb3e394a82e72 100644 (file)
--- a/src/pcm/pcm_ioplug.c
+++ b/src/pcm/pcm_ioplug.c
@@ -747,7 +747,7 @@ static int snd_pcm_ioplug_close(snd_pcm_t *pcm)
        return 0;
 }
 
-static snd_pcm_ops_t snd_pcm_ioplug_ops = {
+static const snd_pcm_ops_t snd_pcm_ioplug_ops = {
        .close = snd_pcm_ioplug_close,
        .nonblock = snd_pcm_ioplug_nonblock,
        .async = snd_pcm_ioplug_async,
@@ -762,7 +762,7 @@ static snd_pcm_ops_t snd_pcm_ioplug_ops = {
        .munmap = snd_pcm_ioplug_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_ioplug_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_ioplug_fast_ops = {
        .status = snd_pcm_ioplug_status,
        .prepare = snd_pcm_ioplug_prepare,
        .reset = snd_pcm_ioplug_reset,

diff --git a/src/pcm/pcm_ladspa.c b/src/pcm/pcm_ladspa.c
index 97bb90140d855c8500b645ee2a03d5b7b24877ad..51618201121d18c68b140f2d3af4384e0c86a06d 100644 (file)
--- a/src/pcm/pcm_ladspa.c
+++ b/src/pcm/pcm_ladspa.c
@@ -1061,7 +1061,7 @@ static void snd_pcm_ladspa_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(ladspa->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_ladspa_ops = {
+static const snd_pcm_ops_t snd_pcm_ladspa_ops = {
        .close = snd_pcm_ladspa_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_ladspa_hw_refine,

diff --git a/src/pcm/pcm_lfloat.c b/src/pcm/pcm_lfloat.c
index 883fce96ca890faff1518ed1a82958fbcd3ee405..62eb398e223ab7c535e9f2832bc0f797501837e9 100644 (file)
--- a/src/pcm/pcm_lfloat.c
+++ b/src/pcm/pcm_lfloat.c
@@ -350,7 +350,7 @@ static void snd_pcm_lfloat_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(lfloat->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_lfloat_ops = {
+static const snd_pcm_ops_t snd_pcm_lfloat_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_lfloat_hw_refine,

diff --git a/src/pcm/pcm_linear.c b/src/pcm/pcm_linear.c
index e3aeac15e9c0b673ebbc32ae661e0acbfcbb18d2..12e2e7f0bf88e0c03ead4cf01a1016f339c62318 100644 (file)
--- a/src/pcm/pcm_linear.c
+++ b/src/pcm/pcm_linear.c
@@ -407,7 +407,7 @@ static void snd_pcm_linear_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(linear->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_linear_ops = {
+static const snd_pcm_ops_t snd_pcm_linear_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_linear_hw_refine,

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index b118f4b24e08e738dfea05e4bd3515d4536c8369..9aa81e1422bcc61e3fe5cf4fecfe6d6bfa1eea1a 100644 (file)
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -223,8 +223,8 @@ struct _snd_pcm {
        snd_pcm_channel_info_t *mmap_channels;
        snd_pcm_channel_area_t *running_areas;
        snd_pcm_channel_area_t *stopped_areas;
-       snd_pcm_ops_t *ops;
-       snd_pcm_fast_ops_t *fast_ops;
+       const snd_pcm_ops_t *ops;
+       const snd_pcm_fast_ops_t *fast_ops;
        snd_pcm_t *op_arg;
        snd_pcm_t *fast_op_arg;
        void *private_data;

diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c
index 83d643a4884727085994b676e5ad3d704397be8b..0357921b364d8608bbacf01dbd51276d2f95c03f 100644 (file)
--- a/src/pcm/pcm_meter.c
+++ b/src/pcm/pcm_meter.c
@@ -501,7 +501,7 @@ static void snd_pcm_meter_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(meter->gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_meter_ops = {
+static const snd_pcm_ops_t snd_pcm_meter_ops = {
        .close = snd_pcm_meter_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_meter_hw_refine,
@@ -516,7 +516,7 @@ static snd_pcm_ops_t snd_pcm_meter_ops = {
        .munmap = snd_pcm_generic_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_meter_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_meter_fast_ops = {
        .status = snd_pcm_generic_status,
        .state = snd_pcm_generic_state,
        .hwsync = snd_pcm_generic_hwsync,
@@ -1143,7 +1143,7 @@ static void s16_reset(snd_pcm_scope_t *scope)
        s16->old = meter->now;
 }
 
-snd_pcm_scope_ops_t s16_ops = {
+static const snd_pcm_scope_ops_t s16_ops = {
        .enable = s16_enable,
        .disable = s16_disable,
        .close = s16_close,

diff --git a/src/pcm/pcm_mmap_emul.c b/src/pcm/pcm_mmap_emul.c
index 489aa773efb9103351ba580bd465c4b28fbc26d6..0dc19736bb9cc4806a523474778537dd878464fc 100644 (file)
--- a/src/pcm/pcm_mmap_emul.c
+++ b/src/pcm/pcm_mmap_emul.c
@@ -329,7 +329,7 @@ static void snd_pcm_mmap_emul_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(map->gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_mmap_emul_ops = {
+static const snd_pcm_ops_t snd_pcm_mmap_emul_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_mmap_emul_hw_refine,
@@ -344,7 +344,7 @@ static snd_pcm_ops_t snd_pcm_mmap_emul_ops = {
        .munmap = snd_pcm_generic_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_mmap_emul_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_mmap_emul_fast_ops = {
        .status = snd_pcm_generic_status,
        .state = snd_pcm_generic_state,
        .hwsync = snd_pcm_generic_hwsync,

diff --git a/src/pcm/pcm_mulaw.c b/src/pcm/pcm_mulaw.c
index d696c968427640bcb4bdd6c4f193184f7dc1812c..22e7d96944f66d8d452d3a19c6792db9e58329d0 100644 (file)
--- a/src/pcm/pcm_mulaw.c
+++ b/src/pcm/pcm_mulaw.c
@@ -406,7 +406,7 @@ static void snd_pcm_mulaw_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(mulaw->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_mulaw_ops = {
+static const snd_pcm_ops_t snd_pcm_mulaw_ops = {
        .close = snd_pcm_generic_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_mulaw_hw_refine,

diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c
index 9b8583cedc447c425a6d79c33888908febeed301..68f2d6880d44b14c99530c8722308d97d8536b3b 100644 (file)
--- a/src/pcm/pcm_multi.c
+++ b/src/pcm/pcm_multi.c
@@ -762,7 +762,7 @@ static void snd_pcm_multi_dump(snd_pcm_t *pcm, snd_output_t *out)
        }
 }
 
-static snd_pcm_ops_t snd_pcm_multi_ops = {
+static const snd_pcm_ops_t snd_pcm_multi_ops = {
        .close = snd_pcm_multi_close,
        .info = snd_pcm_multi_info,
        .hw_refine = snd_pcm_multi_hw_refine,
@@ -777,7 +777,7 @@ static snd_pcm_ops_t snd_pcm_multi_ops = {
        .munmap = snd_pcm_multi_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_multi_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_multi_fast_ops = {
        .status = snd_pcm_multi_status,
        .state = snd_pcm_multi_state,
        .hwsync = snd_pcm_multi_hwsync,

diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c
index 0e84f8d4cd232bc8914372845f1d7ac61be5d88f..692254ae6f0411ed940b7c8127acaa13ce91cb0f 100644 (file)
--- a/src/pcm/pcm_null.c
+++ b/src/pcm/pcm_null.c
@@ -277,7 +277,7 @@ static void snd_pcm_null_dump(snd_pcm_t *pcm, snd_output_t *out)
        }
 }
 
-static snd_pcm_ops_t snd_pcm_null_ops = {
+static const snd_pcm_ops_t snd_pcm_null_ops = {
        .close = snd_pcm_null_close,
        .info = snd_pcm_null_info,
        .hw_refine = snd_pcm_null_hw_refine,
@@ -292,7 +292,7 @@ static snd_pcm_ops_t snd_pcm_null_ops = {
        .munmap = snd_pcm_generic_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_null_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_null_fast_ops = {
        .status = snd_pcm_null_status,
        .state = snd_pcm_null_state,
        .hwsync = snd_pcm_null_hwsync,

diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index b90f6ecf6bfc72fa9e14a07c7245f3569eaa66fd..abd3d437bfc20a47d40f7636cc6c73a4ba37cf24 100644 (file)
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -1051,7 +1051,7 @@ static void snd_pcm_plug_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(plug->gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_plug_ops = {
+static const snd_pcm_ops_t snd_pcm_plug_ops = {
        .close = snd_pcm_plug_close,
        .info = snd_pcm_plug_info,
        .hw_refine = snd_pcm_plug_hw_refine,

diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
index c4f5b4aa2fa09aaa0bf350994aa0632e179583b7..0ef394a42d63301de65dd38653dddea8fa4fbe81 100644 (file)
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -560,7 +560,7 @@ static int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
        return 0;
 }
 
-snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = {
+const snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = {
        .status = snd_pcm_plugin_status,
        .state = snd_pcm_generic_state,
        .hwsync = snd_pcm_generic_hwsync,

diff --git a/src/pcm/pcm_plugin.h b/src/pcm/pcm_plugin.h
index b427e1341641d8e8474d71c68fcd9a1be3e4fb73..dfcf6de2d0918597f928a6661b351bf1f33c34ff 100644 (file)
--- a/src/pcm/pcm_plugin.h
+++ b/src/pcm/pcm_plugin.h
@@ -63,7 +63,7 @@ typedef struct {
 
 void snd_pcm_plugin_init(snd_pcm_plugin_t *plugin);
 
-extern snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops;
+extern const snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops;
 
 snd_pcm_sframes_t snd_pcm_plugin_undo_read_generic
      (snd_pcm_t *pcm,

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index 9cf090a5b9a49f38d93c5021b6e258d2c9b65347..f7b7da085ccc94175272b35c322d0fde1c17069e 100644 (file)
--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -1195,7 +1195,7 @@ static int snd_pcm_rate_close(snd_pcm_t *pcm)
        return snd_pcm_generic_close(pcm);
 }
 
-static snd_pcm_fast_ops_t snd_pcm_rate_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_rate_fast_ops = {
        .status = snd_pcm_rate_status,
        .state = snd_pcm_rate_state,
        .hwsync = snd_pcm_rate_hwsync,
@@ -1221,7 +1221,7 @@ static snd_pcm_fast_ops_t snd_pcm_rate_fast_ops = {
        .poll_revents = snd_pcm_rate_poll_revents,
 };
 
-static snd_pcm_ops_t snd_pcm_rate_ops = {
+static const snd_pcm_ops_t snd_pcm_rate_ops = {
        .close = snd_pcm_rate_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_rate_hw_refine,

diff --git a/src/pcm/pcm_rate_linear.c b/src/pcm/pcm_rate_linear.c
index a19fecbef107e8a35995a1c9d67a9c0720e91a35..20e119becc45a402bc8287d9305857e6600d93fc 100644 (file)
--- a/src/pcm/pcm_rate_linear.c
+++ b/src/pcm/pcm_rate_linear.c
@@ -405,7 +405,7 @@ static void linear_close(void *obj)
        free(obj);
 }
 
-static snd_pcm_rate_ops_t linear_ops = {
+static const snd_pcm_rate_ops_t linear_ops = {
        .close = linear_close,
        .init = linear_init,
        .free = linear_free,

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index 6991fb1bb0c83b85d6d1674f6a7270d5986ddd5c..3455390966691f1a9cbf768bcf35cc1566ce390f 100644 (file)
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -747,7 +747,7 @@ static void snd_pcm_route_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(route->plug.gen.slave, out);
 }
 
-static snd_pcm_ops_t snd_pcm_route_ops = {
+static const snd_pcm_ops_t snd_pcm_route_ops = {
        .close = snd_pcm_route_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_route_hw_refine,

diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
index 3294c716a5285a9089cfb11d1eeb4cc4c46d5287..c8a2d20438b6d5fc26217a183de2aa393fbc884f 100644 (file)
--- a/src/pcm/pcm_share.c
+++ b/src/pcm/pcm_share.c
@@ -1308,7 +1308,7 @@ static void snd_pcm_share_dump(snd_pcm_t *pcm, snd_output_t *out)
        snd_pcm_dump(slave->pcm, out);
 }
 
-static snd_pcm_ops_t snd_pcm_share_ops = {
+static const snd_pcm_ops_t snd_pcm_share_ops = {
        .close = snd_pcm_share_close,
        .info = snd_pcm_share_info,
        .hw_refine = snd_pcm_share_hw_refine,
@@ -1323,7 +1323,7 @@ static snd_pcm_ops_t snd_pcm_share_ops = {
        .munmap = snd_pcm_share_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_share_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_share_fast_ops = {
        .status = snd_pcm_share_status,
        .state = snd_pcm_share_state,
        .hwsync = snd_pcm_share_hwsync,

diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
index b0c0bb99d995d36d2997da69944c3911a9bd3a80..69d052409b45723321a4456d2179ea6298605cfe 100644 (file)
--- a/src/pcm/pcm_shm.c
+++ b/src/pcm/pcm_shm.c
@@ -591,7 +591,7 @@ static void snd_pcm_shm_dump(snd_pcm_t *pcm, snd_output_t *out)
        }
 }
 
-static snd_pcm_ops_t snd_pcm_shm_ops = {
+static const snd_pcm_ops_t snd_pcm_shm_ops = {
        .close = snd_pcm_shm_close,
        .info = snd_pcm_shm_info,
        .hw_refine = snd_pcm_shm_hw_refine,
@@ -606,7 +606,7 @@ static snd_pcm_ops_t snd_pcm_shm_ops = {
        .munmap = snd_pcm_shm_munmap,
 };
 
-static snd_pcm_fast_ops_t snd_pcm_shm_fast_ops = {
+static const snd_pcm_fast_ops_t snd_pcm_shm_fast_ops = {
        .status = snd_pcm_shm_status,
        .state = snd_pcm_shm_state,
        .hwsync = snd_pcm_shm_hwsync,

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index d06e01b0bcf67ca119f5e77af8580b1c40078643..4c5f0f7a1c0b66d2a99671635a1f0b12f79ac1bd 100644 (file)
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -739,7 +739,7 @@ static int softvol_load_control(snd_pcm_t *pcm, snd_pcm_softvol_t *svol,
        return 0;
 }
 
-static snd_pcm_ops_t snd_pcm_softvol_ops = {
+static const snd_pcm_ops_t snd_pcm_softvol_ops = {
        .close = snd_pcm_softvol_close,
        .info = snd_pcm_generic_info,
        .hw_refine = snd_pcm_softvol_hw_refine,