[MPlayer-cvslog] r28858 - in trunk/libao2: ao_alsa.c ao_alsa5.c ao_arts.c ao_dart.c ao_dsound.c ao_dxr2.c ao_esd.c ao_ivtv.c ao_jack.c ao_macosx.c ao_mpegpes.c ao_nas.c ao_null.c ao_openal.c ao_oss.c ao_pcm.c ao_pu...
reimar
subversion at mplayerhq.hu
Fri Mar 6 20:43:12 CET 2009
Author: reimar
Date: Fri Mar 6 20:43:12 2009
New Revision: 28858
Log:
Make ao_info_t structs const.
Modified:
trunk/libao2/ao_alsa.c
trunk/libao2/ao_alsa5.c
trunk/libao2/ao_arts.c
trunk/libao2/ao_dart.c
trunk/libao2/ao_dsound.c
trunk/libao2/ao_dxr2.c
trunk/libao2/ao_esd.c
trunk/libao2/ao_ivtv.c
trunk/libao2/ao_jack.c
trunk/libao2/ao_macosx.c
trunk/libao2/ao_mpegpes.c
trunk/libao2/ao_nas.c
trunk/libao2/ao_null.c
trunk/libao2/ao_openal.c
trunk/libao2/ao_oss.c
trunk/libao2/ao_pcm.c
trunk/libao2/ao_pulse.c
trunk/libao2/ao_sdl.c
trunk/libao2/ao_sgi.c
trunk/libao2/ao_sun.c
trunk/libao2/ao_v4l2.c
trunk/libao2/ao_win32.c
trunk/libao2/audio_out.h
Modified: trunk/libao2/ao_alsa.c
==============================================================================
--- trunk/libao2/ao_alsa.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_alsa.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_alsa5.c
==============================================================================
--- trunk/libao2/ao_alsa5.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_alsa5.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_arts.c
==============================================================================
--- trunk/libao2/ao_arts.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_arts.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -38,7 +38,7 @@
static arts_stream_t stream;
-static ao_info_t info =
+static const ao_info_t info =
{
"aRts audio output",
"arts",
Modified: trunk/libao2/ao_dart.c
==============================================================================
--- trunk/libao2/ao_dart.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_dart.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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 at chollian.net>",
Modified: trunk/libao2/ao_dsound.c
==============================================================================
--- trunk/libao2/ao_dsound.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_dsound.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -42,7 +42,7 @@
#include "subopt-helper.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"Windows DirectSound audio output",
"dsound",
Modified: trunk/libao2/ao_dxr2.c
==============================================================================
--- trunk/libao2/ao_dxr2.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_dxr2.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -36,7 +36,7 @@
#include "libmpdemux/mpeg_packetizer.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"DXR2 audio output",
"dxr2",
Modified: trunk/libao2/ao_esd.c
==============================================================================
--- trunk/libao2/ao_esd.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_esd.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_ivtv.c
==============================================================================
--- trunk/libao2/ao_ivtv.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_ivtv.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_jack.c
==============================================================================
--- trunk/libao2/ao_jack.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_jack.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -40,7 +40,7 @@
#include <jack/jack.h>
-static ao_info_t info =
+static const ao_info_t info =
{
"JACK audio output",
"jack",
Modified: trunk/libao2/ao_macosx.c
==============================================================================
--- trunk/libao2/ao_macosx.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_macosx.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_mpegpes.c
==============================================================================
--- trunk/libao2/ao_mpegpes.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_mpegpes.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_nas.c
==============================================================================
--- trunk/libao2/ao_nas.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_nas.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -119,7 +119,7 @@ static const char* nas_state(unsigned in
return nas_states[state];
}
-static ao_info_t info =
+static const ao_info_t info =
{
"NAS audio output",
"nas",
Modified: trunk/libao2/ao_null.c
==============================================================================
--- trunk/libao2/ao_null.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_null.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_openal.c
==============================================================================
--- trunk/libao2/ao_openal.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_openal.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_oss.c
==============================================================================
--- trunk/libao2/ao_oss.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_oss.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_pcm.c
==============================================================================
--- trunk/libao2/ao_pcm.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_pcm.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_pulse.c
==============================================================================
--- trunk/libao2/ao_pulse.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_pulse.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_sdl.c
==============================================================================
--- trunk/libao2/ao_sdl.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_sdl.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -38,7 +38,7 @@
#include "libvo/fastmemcpy.h"
-static ao_info_t info =
+static const ao_info_t info =
{
"SDLlib audio output",
"sdl",
Modified: trunk/libao2/ao_sgi.c
==============================================================================
--- trunk/libao2/ao_sgi.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_sgi.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_sun.c
==============================================================================
--- trunk/libao2/ao_sun.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_sun.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_v4l2.c
==============================================================================
--- trunk/libao2/ao_v4l2.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_v4l2.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/ao_win32.c
==============================================================================
--- trunk/libao2/ao_win32.c Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/ao_win32.c Fri Mar 6 20:43:12 2009 (r28858)
@@ -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",
Modified: trunk/libao2/audio_out.h
==============================================================================
--- trunk/libao2/audio_out.h Fri Mar 6 20:23:24 2009 (r28857)
+++ trunk/libao2/audio_out.h Fri Mar 6 20:43:12 2009 (r28858)
@@ -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);
More information about the MPlayer-cvslog
mailing list