changeset 25765:304fc0bbefe1

audio_out / video_out structs should be treated as const
author reimar
date Sat, 19 Jan 2008 11:33:36 +0000
parents 7d2685c7d688
children 6201cc9cca7f
files access_mpcontext.h gui/interface.c gui/win32/interface.c mplayer.c
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/access_mpcontext.h	Sat Jan 19 11:25:41 2008 +0000
+++ b/access_mpcontext.h	Sat Jan 19 11:33:36 2008 +0000
@@ -2,8 +2,8 @@
 #define ACCESS_MPCONTEXT_H
 
 struct MPContext;
-void *mpctx_get_video_out(struct MPContext *mpctx);
-void *mpctx_get_audio_out(struct MPContext *mpctx);
+const void *mpctx_get_video_out(struct MPContext *mpctx);
+const void *mpctx_get_audio_out(struct MPContext *mpctx);
 void *mpctx_get_demuxer(struct MPContext *mpctx);
 void *mpctx_get_playtree_iter(struct MPContext *mpctx);
 void *mpctx_get_mixer(struct MPContext *mpctx);
--- a/gui/interface.c	Sat Jan 19 11:25:41 2008 +0000
+++ b/gui/interface.c	Sat Jan 19 11:33:36 2008 +0000
@@ -506,7 +506,7 @@
 
 int guiGetEvent( int type,char * arg )
 {
-  ao_functions_t *audio_out = NULL;
+  const ao_functions_t *audio_out = NULL;
   const vo_functions_t *video_out = NULL;
   mixer_t *mixer = NULL;
 
--- a/gui/win32/interface.c	Sat Jan 19 11:25:41 2008 +0000
+++ b/gui/win32/interface.c	Sat Jan 19 11:33:36 2008 +0000
@@ -61,8 +61,8 @@
 static DWORD style;
 static HANDLE hThread;
 static unsigned threadId;
-ao_functions_t *audio_out = NULL;
-vo_functions_t *video_out = NULL;
+const ao_functions_t *audio_out = NULL;
+const vo_functions_t *video_out = NULL;
 mixer_t *mixer = NULL;
 
 /* test for playlist files, no need to specify -playlist on the commandline.
--- a/mplayer.c	Sat Jan 19 11:25:41 2008 +0000
+++ b/mplayer.c	Sat Jan 19 11:33:36 2008 +0000
@@ -375,7 +375,7 @@
 
 #define mp_basename2(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
 
-void *mpctx_get_video_out(MPContext *mpctx)
+const void *mpctx_get_video_out(MPContext *mpctx)
 {
     return mpctx->video_out;
 }