Show title on video output based on users preferences. Defaults are:--video-title...

[vlc] / src / video_output / vout_intf.c

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 38122186c7412fa937c27e6f7b192253e00804e2..c8b6e241a1eeb0e7976a32646be524e6938212bf 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vout_intf.c : video output interface
  *****************************************************************************
- * Copyright (C) 2000-2006 the VideoLAN team
+ * Copyright (C) 2000-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -62,6 +62,8 @@ static int FullscreenCallback( vlc_object_t *, char const *,
                                vlc_value_t, vlc_value_t, void * );
 static int SnapshotCallback( vlc_object_t *, char const *,
                              vlc_value_t, vlc_value_t, void * );
+static int TitleCallback( vlc_object_t *, char const *,
+                       vlc_value_t, vlc_value_t, void * );
 
 /*****************************************************************************
  * vout_RequestWindow: Create/Get a video window if possible.
@@ -209,6 +211,18 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Create( p_vout, "video-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 
+    var_Create( p_vout, "video-title-show", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "video-title-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "video-title-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+    p_vout->b_title_show = var_GetBool( p_vout, "video-title-show" );
+    p_vout->i_title_timeout = (mtime_t) var_GetInteger( p_vout, "video-title-timeout" );
+    p_vout->i_title_position = var_GetInteger( p_vout, "video-title-position" );
+
+    var_AddCallback( p_vout, "video-title-show", TitleCallback, NULL );
+    var_AddCallback( p_vout, "video-title-timeout", TitleCallback, NULL );
+    var_AddCallback( p_vout, "video-title-position", TitleCallback, NULL );
+
     /* Zoom object var */
     var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND |
                 VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
@@ -273,10 +287,18 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
     val.psz_string = "16:10"; text.psz_string = "16:10";
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "221:100"; text.psz_string = "221:100";
-    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
     val.psz_string = "5:4"; text.psz_string = "5:4";
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+    val.psz_string = "5:3"; text.psz_string = "5:3";
+    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+    val.psz_string = "1.85:1"; text.psz_string = "1.85:1";
+    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+    val.psz_string = "221:100"; text.psz_string = "2.21:1";
+    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+    val.psz_string = "235:100"; text.psz_string = "2.35:1";
+    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
+    val.psz_string = "239:100"; text.psz_string = "2.39:1";
+    var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
 
     /* Add custom crop ratios */
     psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" );
@@ -360,7 +382,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
     val.psz_string = "16:10"; text.psz_string = "16:10";
     var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "221:100"; text.psz_string = "221:100";
+    val.psz_string = "221:100"; text.psz_string = "2.21:1";
     var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
     val.psz_string = "5:4"; text.psz_string = "5:4";
     var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text );
@@ -444,15 +466,17 @@ void vout_IntfInit( vout_thread_t *p_vout )
 int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
 {
     image_handler_t *p_image = image_HandlerCreate( p_vout );
-    video_format_t fmt_in = {0}, fmt_out = {0};
+    video_format_t fmt_in, fmt_out;
     char *psz_filename = NULL;
     subpicture_t *p_subpic;
     picture_t *p_pif;
     vlc_value_t val, format;
     DIR *path;
-
     int i_ret;
 
+    memset( &fmt_in, 0, sizeof(video_format_t));
+    memset( &fmt_out, 0, sizeof(video_format_t));
+
     var_Get( p_vout, "snapshot-path", &val );
     if( val.psz_string && !*val.psz_string )
     {
@@ -597,7 +621,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
 
         if( p_mypicturesdir == NULL )
         {
-            asprintf( &val.psz_string, "%s/" CONFIG_DIR,
+            asprintf( &val.psz_string, "%s\\" CONFIG_DIR,
                       p_vout->p_libvlc->psz_homedir );
         }
         else
@@ -636,15 +660,22 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
     {
         char *psz_prefix = var_GetString( p_vout, "snapshot-prefix" );
         if( !psz_prefix ) psz_prefix = strdup( "vlcsnap-" );
+        else
+        {
+            char *psz_tmp = str_format( p_vout, psz_prefix );
+            filename_sanitize( psz_tmp );
+            free( psz_prefix );
+            psz_prefix = psz_tmp;
+        }
 
-        vlc_closedir_wrapper( path );
+        closedir( path );
         if( var_GetBool( p_vout, "snapshot-sequential" ) == VLC_TRUE )
         {
             int i_num = var_GetInteger( p_vout, "snapshot-num" );
             FILE *p_file;
             do
             {
-                asprintf( &psz_filename, "%s/%s%05d.%s", val.psz_string,
+                asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s", val.psz_string,
                           psz_prefix, i_num++, format.psz_string );
             }
             while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
@@ -652,7 +683,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
         }
         else
         {
-            asprintf( &psz_filename, "%s/%s%u.%s", val.psz_string,
+            asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s", val.psz_string,
                       psz_prefix,
                       (unsigned int)(p_pic->date / 100000) & 0xFFFFFF,
                       format.psz_string );
@@ -662,7 +693,8 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
     }
     else // The user specified a full path name (including file name)
     {
-        psz_filename = str_format_meta( p_vout, val.psz_string );
+        psz_filename = str_format( p_vout, val.psz_string );
+        path_sanitize( psz_filename );
     }
 
     free( val.psz_string );
@@ -782,6 +814,7 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name,
  *****************************************************************************/
 int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args )
 {
+    (void)args;
     switch( i_query )
     {
     case VOUT_REPARENT:
@@ -850,7 +883,12 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
         goto initwsize_end;
     }
 
-    if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
+    if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) {
+        msg_Warn( p_vout, "fucked up aspect" );
+        *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom / FP_FACTOR );
+        *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom /FP_FACTOR);
+    }
+    else if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
     {
         *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
             p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den / FP_FACTOR );
@@ -879,6 +917,7 @@ static int ZoomCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
     InitWindowSize( p_vout, &p_vout->i_window_width,
                     &p_vout->i_window_height );
     vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
@@ -893,6 +932,8 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
     int64_t i_aspect_num, i_aspect_den;
     unsigned int i_width, i_height;
 
+    (void)oldval; (void)p_data;
+
     /* Restore defaults */
     p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset;
     p_vout->fmt_in.i_visible_width = p_vout->fmt_render.i_visible_width;
@@ -1042,6 +1083,7 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
     vlc_value_t val;
 
     char *psz_end, *psz_parser = strchr( newval.psz_string, ':' );
+    (void)psz_cmd; (void)oldval; (void)p_data;
 
     /* Restore defaults */
     p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
@@ -1095,6 +1137,7 @@ static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     playlist_t *p_playlist = pl_Yield( p_this );
     vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool );
+    (void)psz_cmd; (void)oldval; (void)p_data;
 
     /* Modify playlist as well because the vout might have to be restarted */
     var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
@@ -1110,6 +1153,7 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd,
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     vlc_value_t val;
     playlist_t *p_playlist = pl_Yield( p_this );
+    (void)psz_cmd; (void)oldval; (void)p_data;
 
     p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
 
@@ -1134,5 +1178,19 @@ static int SnapshotCallback( vlc_object_t *p_this, char const *psz_cmd,
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     vout_Control( p_vout, VOUT_SNAPSHOT );
+    (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
     return VLC_SUCCESS;
 }
+
+static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd,
+                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+
+    if( !strncmp( psz_cmd, "video-title-show", 16 ) )
+        p_vout->b_title_show = newval.b_bool;
+    else if( !strncmp( psz_cmd, "video-title-timeout", 19 ) )
+        p_vout->i_title_timeout = (mtime_t) newval.i_int;
+    else if( !strncmp( psz_cmd, "video-title-position", 20 ) )
+        p_vout->i_title_position = newval.i_int;
+}