[vlc-devel] commit: libvlc_video*: constify. ( Rémi Duraffort )

git version control git at videolan.org
Mon Aug 17 15:55:15 CEST 2009


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Aug 17 15:53:20 2009 +0200| [f635738832de520d7d2207a64f18184c06e56d79] | committer: Rémi Duraffort 

libvlc_video*: constify.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f635738832de520d7d2207a64f18184c06e56d79
---

 include/vlc/libvlc_media_player.h |    6 +++---
 src/control/video.c               |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index a880496..4bf4b67 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -594,7 +594,7 @@ VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *, lib
  * \param psz_aspect new video aspect-ratio
  * \param p_e an initialized exception pointer
  */
-VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *, char *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *, const char *, libvlc_exception_t * );
 
 /**
  * Get current video subtitle.
@@ -641,7 +641,7 @@ VLC_PUBLIC_API void libvlc_video_set_spu( libvlc_media_player_t *, int , libvlc_
  * \param p_e an initialized exception pointer
  * \return the success status (boolean)
  */
-VLC_PUBLIC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *, char *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *, const char *, libvlc_exception_t * );
 
 /**
  * Get the description of available titles.
@@ -680,7 +680,7 @@ VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t *, li
  * \param psz_geometry new crop filter geometry
  * \param p_e an initialized exception pointer
  */
-VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, char *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, const char *, libvlc_exception_t * );
 
 /**
  * Toggle teletext transparent status on video output.
diff --git a/src/control/video.c b/src/control/video.c
index 3345dd3..04e5106 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -222,10 +222,10 @@ void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale,
 char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi,
                                      libvlc_exception_t *p_e )
 {
-    char *psz_aspect = 0;
+    char *psz_aspect = NULL;
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
 
-    if( !p_vout ) return 0;
+    if( !p_vout ) return NULL;
 
     psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
     vlc_object_release( p_vout );
@@ -233,7 +233,7 @@ char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi,
 }
 
 void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi,
-                                    char *psz_aspect, libvlc_exception_t *p_e )
+                                    const char *psz_aspect, libvlc_exception_t *p_e )
 {
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
     int i_ret = -1;
@@ -341,7 +341,7 @@ end:
 }
 
 int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
-                                    char *psz_subtitle,
+                                    const char *psz_subtitle,
                                     libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
@@ -387,7 +387,7 @@ char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi,
 }
 
 void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
-                                    char *psz_geometry, libvlc_exception_t *p_e )
+                                     const char *psz_geometry, libvlc_exception_t *p_e )
 {
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
     int i_ret = -1;




More information about the vlc-devel mailing list