summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 19:43:12 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 19:43:12 +0000
commitd6bf2e318e785f1ddaf4f3ecd61ec780eca5bb24 (patch)
tree70bab39247338ac335e8b366c5373269314492ea /libao2
parent77e48c66357c1b51fa035935c46a626ffd98a054 (diff)
downloadmpv-d6bf2e318e785f1ddaf4f3ecd61ec780eca5bb24.tar.bz2
mpv-d6bf2e318e785f1ddaf4f3ecd61ec780eca5bb24.tar.xz
Make ao_info_t structs const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28858 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_alsa.c2
-rw-r--r--libao2/ao_alsa5.c2
-rw-r--r--libao2/ao_arts.c2
-rw-r--r--libao2/ao_dart.c2
-rw-r--r--libao2/ao_dsound.c2
-rw-r--r--libao2/ao_dxr2.c2
-rw-r--r--libao2/ao_esd.c2
-rw-r--r--libao2/ao_ivtv.c2
-rw-r--r--libao2/ao_jack.c2
-rw-r--r--libao2/ao_macosx.c2
-rw-r--r--libao2/ao_mpegpes.c2
-rw-r--r--libao2/ao_nas.c2
-rw-r--r--libao2/ao_null.c2
-rw-r--r--libao2/ao_openal.c2
-rw-r--r--libao2/ao_oss.c2
-rw-r--r--libao2/ao_pcm.c2
-rw-r--r--libao2/ao_pulse.c2
-rw-r--r--libao2/ao_sdl.c2
-rw-r--r--libao2/ao_sgi.c2
-rw-r--r--libao2/ao_sun.c2
-rw-r--r--libao2/ao_v4l2.c2
-rw-r--r--libao2/ao_win32.c2
-rw-r--r--libao2/audio_out.h2
23 files changed, 23 insertions, 23 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 6d2e1f959f..032d1d132a 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -57,7 +57,7 @@
#include "audio_out_internal.h"
#include "libaf/af_format.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"ALSA-0.9.x-1.x audio output",
"alsa",
diff --git a/libao2/ao_alsa5.c b/libao2/ao_alsa5.c
index abf2eff827..007a5f1b4f 100644
--- a/libao2/ao_alsa5.c
+++ b/libao2/ao_alsa5.c
@@ -32,7 +32,7 @@
#include "mp_msg.h"
#include "help_mp.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"ALSA-0.5.x audio output",
"alsa5",
diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c
index 30db48fb22..df44db4f02 100644
--- a/libao2/ao_arts.c
+++ b/libao2/ao_arts.c
@@ -38,7 +38,7 @@
static arts_stream_t stream;
-static ao_info_t info =
+static const ao_info_t info =
{
"aRts audio output",
"arts",
diff --git a/libao2/ao_dart.c b/libao2/ao_dart.c
index 95efa04946..e9bff8df1b 100644
--- a/libao2/ao_dart.c
+++ b/libao2/ao_dart.c
@@ -39,7 +39,7 @@
#include "libvo/fastmemcpy.h"
#include "subopt-helper.h"
-static ao_info_t info = {
+static const ao_info_t info = {
"DART audio output",
"dart",
"KO Myung-Hun <komh@chollian.net>",
diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c
index a654865b76..729084b145 100644
--- a/libao2/ao_dsound.c
+++ b/libao2/ao_dsound.c
@@ -42,7 +42,7 @@
#include "subopt-helper.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"Windows DirectSound audio output",
"dsound",
diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c
index cd92ea325c..7f9594fb4d 100644
--- a/libao2/ao_dxr2.c
+++ b/libao2/ao_dxr2.c
@@ -36,7 +36,7 @@
#include "libmpdemux/mpeg_packetizer.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"DXR2 audio output",
"dxr2",
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c
index a5602ff894..d54f843c65 100644
--- a/libao2/ao_esd.c
+++ b/libao2/ao_esd.c
@@ -67,7 +67,7 @@
#define ESD_CLIENT_NAME "MPlayer"
#define ESD_MAX_DELAY (1.0f) /* max amount of data buffered in esd (#sec) */
-static ao_info_t info =
+static const ao_info_t info =
{
"EsounD audio output",
"esd",
diff --git a/libao2/ao_ivtv.c b/libao2/ao_ivtv.c
index 96ea563c96..c2b367a414 100644
--- a/libao2/ao_ivtv.c
+++ b/libao2/ao_ivtv.c
@@ -41,7 +41,7 @@
static int freq = 0;
-static ao_info_t info =
+static const ao_info_t info =
{
"IVTV MPEG Audio Decoder output",
"ivtv",
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index d7f2092a43..e861d08aed 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -40,7 +40,7 @@
#include <jack/jack.h>
-static ao_info_t info =
+static const ao_info_t info =
{
"JACK audio output",
"jack",
diff --git a/libao2/ao_macosx.c b/libao2/ao_macosx.c
index fcbda6f1a1..fb5883b3fb 100644
--- a/libao2/ao_macosx.c
+++ b/libao2/ao_macosx.c
@@ -53,7 +53,7 @@
#include "libaf/af_format.h"
#include "osdep/timer.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"Darwin/Mac OS X native audio output",
"macosx",
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c
index 38f30b1c16..3746d24b4e 100644
--- a/libao2/ao_mpegpes.c
+++ b/libao2/ao_mpegpes.c
@@ -63,7 +63,7 @@ int vo_mpegpes_fd2 = -1;
#include <errno.h>
-static ao_info_t info =
+static const ao_info_t info =
{
#ifdef CONFIG_DVB
"DVB audio output",
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index 9394649cc0..e5e675be3f 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -119,7 +119,7 @@ static const char* nas_state(unsigned int state) {
return nas_states[state];
}
-static ao_info_t info =
+static const ao_info_t info =
{
"NAS audio output",
"nas",
diff --git a/libao2/ao_null.c b/libao2/ao_null.c
index 2e28b8f1e8..20b715fb96 100644
--- a/libao2/ao_null.c
+++ b/libao2/ao_null.c
@@ -27,7 +27,7 @@
#include "audio_out.h"
#include "audio_out_internal.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"Null audio output",
"null",
diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c
index c91694dc05..c80c49b27a 100644
--- a/libao2/ao_openal.c
+++ b/libao2/ao_openal.c
@@ -42,7 +42,7 @@
#include "osdep/timer.h"
#include "subopt-helper.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"OpenAL audio output",
"openal",
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index a98d5d1922..e4688d1723 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -48,7 +48,7 @@
#include "audio_out.h"
#include "audio_out_internal.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"OSS/ioctl audio output",
"oss",
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index bd66ed0dab..bf3f224e81 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -35,7 +35,7 @@
#include "help_mp.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"RAW PCM/WAVE file writer audio output",
"pcm",
diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c
index d6974f85e0..2d27c85540 100644
--- a/libao2/ao_pulse.c
+++ b/libao2/ao_pulse.c
@@ -33,7 +33,7 @@
#define PULSE_CLIENT_NAME "MPlayer"
/** General driver info */
-static ao_info_t info = {
+static const ao_info_t info = {
"PulseAudio audio output",
"pulse",
"Lennart Poettering",
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 97a70d4adf..6cbd607e67 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -38,7 +38,7 @@
#include "libvo/fastmemcpy.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"SDLlib audio output",
"sdl",
diff --git a/libao2/ao_sgi.c b/libao2/ao_sgi.c
index db7c486c83..46b79c1e2e 100644
--- a/libao2/ao_sgi.c
+++ b/libao2/ao_sgi.c
@@ -32,7 +32,7 @@
#include "help_mp.h"
#include "libaf/af_format.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"sgi audio output",
"sgi",
diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c
index cae2287f6c..725a49e324 100644
--- a/libao2/ao_sun.c
+++ b/libao2/ao_sun.c
@@ -49,7 +49,7 @@
#include "mp_msg.h"
#include "help_mp.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"Sun audio output",
"sun",
diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c
index b1b510ea46..412899c405 100644
--- a/libao2/ao_v4l2.c
+++ b/libao2/ao_v4l2.c
@@ -38,7 +38,7 @@
static int freq = 0;
-static ao_info_t info =
+static const ao_info_t info =
{
"V4L2 MPEG Audio Decoder output",
"v4l2",
diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c
index eab18c2ddb..c29e05935f 100644
--- a/libao2/ao_win32.c
+++ b/libao2/ao_win32.c
@@ -90,7 +90,7 @@ static unsigned int buf_write=0;
static volatile int buf_read=0;
-static ao_info_t info =
+static const ao_info_t info =
{
"Windows waveOut audio output",
"win32",
diff --git a/libao2/audio_out.h b/libao2/audio_out.h
index 3312ab0aa7..e1d36e78c7 100644
--- a/libao2/audio_out.h
+++ b/libao2/audio_out.h
@@ -34,7 +34,7 @@ typedef struct ao_info_s
/* interface towards mplayer and */
typedef struct ao_functions_s
{
- ao_info_t *info;
+ const ao_info_t *info;
int (*control)(int cmd,void *arg);
int (*init)(int rate,int channels,int format,int flags);
void (*uninit)(int immed);