diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-04-27 13:48:29 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-04-27 13:48:29 +0300 |
| commit | b5f7cec1c76143ac6fe27d3f83d9fd5a15ca0490 (patch) | |
| tree | cabe9de357584000da26b0ec2b015a9817f0d150 | |
| parent | d54db9736e41937be623353887349f0ceaf3a192 (diff) | |
| download | xine-lib-b5f7cec1c76143ac6fe27d3f83d9fd5a15ca0490.tar.gz xine-lib-b5f7cec1c76143ac6fe27d3f83d9fd5a15ca0490.tar.bz2 | |
Added missing const
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 2 | ||||
| -rw-r--r-- | src/audio_out/audio_jack_out.c | 2 | ||||
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 6 | ||||
| -rw-r--r-- | src/audio_out/audio_pulse_out.c | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index abf37f1b3..32a90044d 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -1360,7 +1360,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da char *pcm_device; snd_pcm_hw_params_t *params; /* for usability reasons, keep this in sync with audio_oss_out.c */ - static const char *speaker_arrangement[] = {"Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1", + static const char * const speaker_arrangement[] = {"Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1", "Surround 3.0", "Surround 4.0", "Surround 4.1", "Surround 5.0", "Surround 5.1", "Surround 6.0", "Surround 6.1", "Surround 7.1", "Pass Through", NULL}; #define MONO 0 diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c index 975a5f38a..16f68faee 100644 --- a/src/audio_out/audio_jack_out.c +++ b/src/audio_out/audio_jack_out.c @@ -688,7 +688,7 @@ static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen, const char **matching_ports = NULL; /* for usability reasons, keep this in sync with audio_oss_out.c */ - static char *speaker_arrangement[] = { + static const char * const speaker_arrangement[] = { "Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1", "Surround 3.0", "Surround 4.0", "Surround 4.1", "Surround 5.0", "Surround 5.1", "Surround 6.0", diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 06d9115ef..a51a0b169 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -704,11 +704,11 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da int caps; int audio_fd; int num_channels, status, arg; - static char *sync_methods[] = {"auto", "getodelay", "getoptr", "softsync", "probebuffer", NULL}; - static char *devname_opts[] = {"auto", "/dev/dsp", "/dev/sound/dsp", NULL}; + static const char * const sync_methods[] = {"auto", "getodelay", "getoptr", "softsync", "probebuffer", NULL}; + static const char * const devname_opts[] = {"auto", "/dev/dsp", "/dev/sound/dsp", NULL}; int devname_val, devname_num; /* for usability reasons, keep this in sync with audio_alsa_out.c */ - static char *speaker_arrangement[] = {"Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1", + static const char * const speaker_arrangement[] = {"Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1", "Surround 3.0", "Surround 4.0", "Surround 4.1", "Surround 5.0", "Surround 5.1", "Surround 6.0", "Surround 6.1", "Surround 7.1", "Pass Through", NULL}; #define MONO 0 diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index 5370389c7..d25c2e812 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -298,7 +298,8 @@ static int connect_context(pulse_driver_t *this) { } if (!this->context) { - char fn[XINE_PATH_MAX], *p; + char fn[XINE_PATH_MAX]; + const char *p; if (pa_get_binary_name(fn, sizeof(fn))) p = pa_path_get_filename(fn); |