At input EOF, wait for all pictures to be displayed.

[vlc] / src / video_output / vout_intf.c

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index b4f354fbd22e1b35f5021cdd0be903164250024b..53bf47ff306777f643a9208d8b71e3aae831beab 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -175,13 +175,11 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Create( p_vout, "mouse-hide-timeout",
                 VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 
-    p_vout->p->b_title_show = var_CreateGetBool( p_vout, "video-title-show" );
-    p_vout->p->i_title_timeout =
-        (mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" );
-    p_vout->p->i_title_position =
-        var_CreateGetInteger( p_vout, "video-title-position" );
-    p_vout->p->psz_title =  NULL;
-
+    p_vout->p->title.show = var_CreateGetBool( p_vout, "video-title-show" );
+    p_vout->p->title.timeout = var_CreateGetInteger( p_vout,
+                                                     "video-title-timeout" );
+    p_vout->p->title.position = var_CreateGetInteger( p_vout,
+                                                      "video-title-position" );
     var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL );
     var_AddCallback( p_vout, "video-title-timeout", TitleTimeoutCallback, NULL );
     var_AddCallback( p_vout, "video-title-position", TitlePositionCallback, NULL );
@@ -329,7 +327,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
     text.psz_string = _("Scale factor");
     var_Change( p_vout, "scale", VLC_VAR_SETTEXT, &text, NULL );
     var_AddCallback( p_vout, "scale", ScalingCallback, NULL );
-    p_vout->i_zoom = (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) );
 
     /* Add a variable to indicate if the window should be on top of others */
     var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT
@@ -337,16 +334,14 @@ void vout_IntfInit( vout_thread_t *p_vout )
     text.psz_string = _("Always on top");
     var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
     var_AddCallback( p_vout, "video-on-top", OnTopCallback, NULL );
+    var_TriggerCallback( p_vout, "video-on-top" );
 
     /* Add a variable to indicate whether we want window decoration or not */
     var_Create( p_vout, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 
     /* Add a fullscreen variable */
-    if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) )
-    {
-        /* user requested fullscreen */
-        p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
-    }
+    var_Create( p_vout, "fullscreen",
+                VLC_VAR_BOOL | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
     text.psz_string = _("Fullscreen");
     var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL );
     var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL );
@@ -362,9 +357,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS );
     var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS );
     var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
-
-    var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
-    var_SetBool( p_vout, "intf-change", true );
 }
 
 /*****************************************************************************
@@ -792,7 +784,7 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
     }
 
  crop_end:
-    p_vout->i_changes |= VOUT_CROP_CHANGE;
+    p_vout->p->i_changes |= VOUT_CROP_CHANGE;
 
     msg_Dbg( p_vout, "cropping picture %ix%i to %i,%i,%ix%i",
              p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
@@ -818,10 +810,6 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
     /* Restore defaults */
     p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
     p_vout->fmt_in.i_sar_den = p_vout->fmt_render.i_sar_den;
-    p_vout->render.i_aspect = (int64_t)p_vout->fmt_render.i_sar_num *
-                                       p_vout->fmt_render.i_width *
-                                       VOUT_ASPECT_FACTOR /
-                                       p_vout->fmt_render.i_sar_den / p_vout->fmt_render.i_height;
 
     if( !psz_parser ) goto aspect_end;
 
@@ -836,21 +824,15 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
     vlc_ureduce( &i_sar_num, &i_sar_den, i_sar_num, i_sar_den, 0 );
     p_vout->fmt_in.i_sar_num = i_sar_num;
     p_vout->fmt_in.i_sar_den = i_sar_den;
-    p_vout->render.i_aspect = i_aspect_num * VOUT_ASPECT_FACTOR / i_aspect_den;
 
  aspect_end:
     if( p_vout->p->i_par_num && p_vout->p->i_par_den )
     {
         p_vout->fmt_in.i_sar_num *= p_vout->p->i_par_den;
         p_vout->fmt_in.i_sar_den *= p_vout->p->i_par_num;
-        p_vout->render.i_aspect = (int64_t)p_vout->fmt_in.i_sar_num *
-                                           p_vout->fmt_in.i_width *
-                                           VOUT_ASPECT_FACTOR /
-                                           p_vout->fmt_in.i_sar_den /
-                                           p_vout->fmt_in.i_height;
     }
 
-    p_vout->i_changes |= VOUT_ASPECT_CHANGE;
+    p_vout->p->i_changes |= VOUT_ASPECT_CHANGE;
 
     msg_Dbg( p_vout, "new aspect-ratio %i:%i, sample aspect-ratio %i:%i",
              p_vout->fmt_in.i_sar_num * p_vout->fmt_in.i_width,
@@ -871,18 +853,10 @@ static int ScalingCallback( vlc_object_t *p_this, char const *psz_cmd,
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     (void)oldval; (void)newval; (void)p_data;
 
-    vlc_mutex_lock( &p_vout->change_lock );
-
     if( !strcmp( psz_cmd, "autoscale" ) )
-    {
-        p_vout->i_changes |= VOUT_SCALE_CHANGE;
-    }
+        vout_ControlChangeDisplayFilled( p_vout, newval.b_bool );
     else if( !strcmp( psz_cmd, "scale" ) )
-    {
-        p_vout->i_changes |= VOUT_ZOOM_CHANGE;
-    }
-
-    vlc_mutex_unlock( &p_vout->change_lock );
+        vout_ControlChangeZoom( p_vout, 1000 * newval.f_float, 1000 );
 
     return VLC_SUCCESS;
 }
@@ -891,13 +865,9 @@ static int OnTopCallback( 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;
-
-    vlc_mutex_lock( &p_vout->change_lock );
-    p_vout->i_changes |= VOUT_ON_TOP_CHANGE;
-    p_vout->b_on_top = newval.b_bool;
-    vlc_mutex_unlock( &p_vout->change_lock );
-
     (void)psz_cmd; (void)oldval; (void)p_data;
+
+    vout_ControlChangeOnTop( p_vout, newval.b_bool );
     return VLC_SUCCESS;
 }
 
@@ -905,15 +875,10 @@ static int FullscreenCallback( 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;
-    vlc_value_t val;
     (void)psz_cmd; (void)p_data;
 
-    if( oldval.b_bool == newval.b_bool )
-        return VLC_SUCCESS; /* no-op */
-    p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
-
-    val.b_bool = true;
-    var_Set( p_vout, "intf-change", val );
+    if( oldval.b_bool != newval.b_bool )
+        vout_ControlChangeFullscreen( p_vout, newval.b_bool );
     return VLC_SUCCESS;
 }
 
@@ -934,7 +899,7 @@ static int TitleShowCallback( vlc_object_t *p_this, char const *psz_cmd,
     VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
     VLC_UNUSED(p_data);
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    p_vout->p->b_title_show = newval.b_bool;
+    p_vout->p->title.show = newval.b_bool;
     return VLC_SUCCESS;
 }
 
@@ -943,7 +908,7 @@ static int TitleTimeoutCallback( vlc_object_t *p_this, char const *psz_cmd,
 {
     VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    p_vout->p->i_title_timeout = (mtime_t) newval.i_int;
+    p_vout->p->title.timeout = (mtime_t) newval.i_int;
     return VLC_SUCCESS;
 }
 
@@ -953,6 +918,6 @@ static int TitlePositionCallback( vlc_object_t *p_this, char const *psz_cmd,
     VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
     VLC_UNUSED(p_data);
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    p_vout->p->i_title_position = newval.i_int;
+    p_vout->p->title.position = newval.i_int;
     return VLC_SUCCESS;
 }