# HG changeset patch
# User reimar
# Date 1236368592 0
# Node ID 9a5b8c2ed6de44fbe1e6ded6a943ef1920c83b8c
# Parent  2c00a46b99c848744343ddd99ef9944aa71e216d
Make ao_info_t structs const.

diff -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_alsa.c
--- a/libao2/ao_alsa.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_alsa.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_alsa5.c
--- a/libao2/ao_alsa5.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_alsa5.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_arts.c
--- a/libao2/ao_arts.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_arts.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_dart.c
--- a/libao2/ao_dart.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_dart.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_dsound.c
--- a/libao2/ao_dsound.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_dsound.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_dxr2.c
--- a/libao2/ao_dxr2.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_dxr2.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_esd.c
--- a/libao2/ao_esd.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_esd.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_ivtv.c
--- a/libao2/ao_ivtv.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_ivtv.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_jack.c
--- a/libao2/ao_jack.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_jack.c	Fri Mar 06 19:43:12 2009 +0000
@@ -40,7 +40,7 @@
 
 #include <jack/jack.h>
 
-static ao_info_t info = 
+static const ao_info_t info = 
 {
   "JACK audio output",
   "jack",
diff -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_macosx.c
--- a/libao2/ao_macosx.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_macosx.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_mpegpes.c
--- a/libao2/ao_mpegpes.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_mpegpes.c	Fri Mar 06 19:43:12 2009 +0000
@@ -63,7 +63,7 @@
 
 #include <errno.h>
 
-static ao_info_t info = 
+static const ao_info_t info = 
 {
 #ifdef CONFIG_DVB
 	"DVB audio output",
diff -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_nas.c
--- a/libao2/ao_nas.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_nas.c	Fri Mar 06 19:43:12 2009 +0000
@@ -119,7 +119,7 @@
 	return nas_states[state];
 }
 
-static ao_info_t info = 
+static const ao_info_t info = 
 {
 	"NAS audio output",
 	"nas",
diff -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_null.c
--- a/libao2/ao_null.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_null.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_openal.c
--- a/libao2/ao_openal.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_openal.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_oss.c
--- a/libao2/ao_oss.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_oss.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_pcm.c
--- a/libao2/ao_pcm.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_pcm.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_pulse.c
--- a/libao2/ao_pulse.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_pulse.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_sdl.c
--- a/libao2/ao_sdl.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_sdl.c	Fri Mar 06 19:43:12 2009 +0000
@@ -38,7 +38,7 @@
 
 #include "libvo/fastmemcpy.h"
 
-static ao_info_t info = 
+static const ao_info_t info = 
 {
 	"SDLlib audio output",
 	"sdl",
diff -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_sgi.c
--- a/libao2/ao_sgi.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_sgi.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_sun.c
--- a/libao2/ao_sun.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_sun.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_v4l2.c
--- a/libao2/ao_v4l2.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_v4l2.c	Fri Mar 06 19:43:12 2009 +0000
@@ -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 -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/ao_win32.c
--- a/libao2/ao_win32.c	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/ao_win32.c	Fri Mar 06 19:43:12 2009 +0000
@@ -90,7 +90,7 @@
 static volatile int buf_read=0;
 
 
-static ao_info_t info =
+static const ao_info_t info =
 {
 	"Windows waveOut audio output",
 	"win32",
diff -r 2c00a46b99c8 -r 9a5b8c2ed6de libao2/audio_out.h
--- a/libao2/audio_out.h	Fri Mar 06 19:23:24 2009 +0000
+++ b/libao2/audio_out.h	Fri Mar 06 19:43:12 2009 +0000
@@ -34,7 +34,7 @@
 /* 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);