[MPlayer-cvslog] r25793 - in trunk: access_mpcontext.h gui/interface.c gui/win32/interface.c mplayer.c

[reimar]

Author: reimar
Date: Sat Jan 19 12:33:36 2008
New Revision: 25793

Log:
audio_out / video_out structs should be treated as const


Modified:
   trunk/access_mpcontext.h
   trunk/gui/interface.c
   trunk/gui/win32/interface.c
   trunk/mplayer.c

Modified: trunk/access_mpcontext.h
==============================================================================
--- trunk/access_mpcontext.h	(original)
+++ trunk/access_mpcontext.h	Sat Jan 19 12:33:36 2008
@@ -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);

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	(original)
+++ trunk/gui/interface.c	Sat Jan 19 12:33:36 2008
@@ -506,7 +506,7 @@ static void remove_vf( char * str )
 
 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;
 

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	(original)
+++ trunk/gui/win32/interface.c	Sat Jan 19 12:33:36 2008
@@ -61,8 +61,8 @@ static RECT old_rect;
 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.

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sat Jan 19 12:33:36 2008
@@ -375,7 +375,7 @@ static unsigned int inited_flags=0;
 
 #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;
 }