X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=7848be40311562b5a3f4471ac98c34403f99aa9d;hb=26d4cf7850bd01d4a0cadc74d68476d21a9e7107;hp=d09b961855762a9416a6809667d1dc4f42c9daa5;hpb=6bffcd8055dd0728f2ef9c584af186bfcea89597;p=vlc

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index d09b961855..7848be4031 100644
--- 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 );
@@ -336,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 );
@@ -361,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 );
 }
 
 /*****************************************************************************
@@ -380,7 +373,7 @@ static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic )
     if( !p_subpic )
         return VLC_EGENERIC;
 
-    /* FIXME DEFAULT_CHAN is not good (used by the text) but
+    /* FIXME SPU_DEFAULT_CHANNEL is not good (used by the text) but
      * hardcoded 0 doesn't seem right */
     p_subpic->i_channel = 0;
     p_subpic->i_start = mdate();
@@ -402,7 +395,7 @@ static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic )
 static void VoutOsdSnapshot( vout_thread_t *p_vout, picture_t *p_pic, const char *psz_filename )
 {
     msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
-    vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN, "%s", psz_filename );
+    vout_OSDMessage( VLC_OBJECT( p_vout ), SPU_DEFAULT_CHANNEL, "%s", psz_filename );
 
     if( var_GetBool( p_vout, "snapshot-preview" ) )
     {
@@ -644,10 +637,10 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
     (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;
-    p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset;
-    p_vout->fmt_in.i_visible_height = p_vout->fmt_render.i_visible_height;
+    p_vout->p->fmt_in.i_x_offset = p_vout->p->fmt_render.i_x_offset;
+    p_vout->p->fmt_in.i_visible_width = p_vout->p->fmt_render.i_visible_width;
+    p_vout->p->fmt_in.i_y_offset = p_vout->p->fmt_render.i_y_offset;
+    p_vout->p->fmt_in.i_visible_height = p_vout->p->fmt_render.i_visible_height;
 
     if( !strcmp( psz_cmd, "crop" ) )
     {
@@ -661,22 +654,22 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
             i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
             if( psz_end == psz_parser || !i_aspect_den ) goto crop_end;
 
-            i_width = p_vout->fmt_in.i_sar_den*p_vout->fmt_render.i_visible_height *
-                i_aspect_num / i_aspect_den / p_vout->fmt_in.i_sar_num;
-            i_height = p_vout->fmt_render.i_visible_width*p_vout->fmt_in.i_sar_num *
-                i_aspect_den / i_aspect_num / p_vout->fmt_in.i_sar_den;
+            i_width = p_vout->p->fmt_in.i_sar_den*p_vout->p->fmt_render.i_visible_height *
+                i_aspect_num / i_aspect_den / p_vout->p->fmt_in.i_sar_num;
+            i_height = p_vout->p->fmt_render.i_visible_width*p_vout->p->fmt_in.i_sar_num *
+                i_aspect_den / i_aspect_num / p_vout->p->fmt_in.i_sar_den;
 
-            if( i_width < p_vout->fmt_render.i_visible_width )
+            if( i_width < p_vout->p->fmt_render.i_visible_width )
             {
-                p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset +
-                    (p_vout->fmt_render.i_visible_width - i_width) / 2;
-                p_vout->fmt_in.i_visible_width = i_width;
+                p_vout->p->fmt_in.i_x_offset = p_vout->p->fmt_render.i_x_offset +
+                    (p_vout->p->fmt_render.i_visible_width - i_width) / 2;
+                p_vout->p->fmt_in.i_visible_width = i_width;
             }
             else
             {
-                p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset +
-                    (p_vout->fmt_render.i_visible_height - i_height) / 2;
-                p_vout->fmt_in.i_visible_height = i_height;
+                p_vout->p->fmt_in.i_y_offset = p_vout->p->fmt_render.i_y_offset +
+                    (p_vout->p->fmt_render.i_visible_height - i_height) / 2;
+                p_vout->p->fmt_in.i_visible_height = i_height;
             }
         }
         else
@@ -702,21 +695,21 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
                 i_crop_top = strtol( psz_end, &psz_end, 10 );
                 if( *psz_end != '\0' ) goto crop_end;
 
-                if( i_crop_top + i_crop_height >= p_vout->fmt_render.i_visible_height ||
-                    i_crop_left + i_crop_width >= p_vout->fmt_render.i_visible_width )
+                if( i_crop_top + i_crop_height >= p_vout->p->fmt_render.i_visible_height ||
+                    i_crop_left + i_crop_width >= p_vout->p->fmt_render.i_visible_width )
                 {
                     msg_Err( p_vout, "Unable to crop over picture boundaries");
                     return VLC_EGENERIC;
                 }
 
                 i_width = i_crop_width;
-                p_vout->fmt_in.i_visible_width = i_width;
+                p_vout->p->fmt_in.i_visible_width = i_width;
 
                 i_height = i_crop_height;
-                p_vout->fmt_in.i_visible_height = i_height;
+                p_vout->p->fmt_in.i_visible_height = i_height;
 
-                p_vout->fmt_in.i_x_offset = i_crop_left;
-                p_vout->fmt_in.i_y_offset = i_crop_top;
+                p_vout->p->fmt_in.i_x_offset = i_crop_left;
+                p_vout->p->fmt_in.i_y_offset = i_crop_top;
             }
             else
             {
@@ -739,23 +732,23 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
                 i_crop_bottom = strtol( psz_end, &psz_end, 10 );
                 if( *psz_end != '\0' ) goto crop_end;
 
-                if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height ||
-                    i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width )
+                if( i_crop_top + i_crop_bottom >= p_vout->p->fmt_render.i_visible_height ||
+                    i_crop_right + i_crop_left >= p_vout->p->fmt_render.i_visible_width )
                 {
                     msg_Err( p_vout, "Unable to crop over picture boundaries" );
                     return VLC_EGENERIC;
                 }
 
-                i_width = p_vout->fmt_render.i_visible_width
+                i_width = p_vout->p->fmt_render.i_visible_width
                           - i_crop_left - i_crop_right;
-                p_vout->fmt_in.i_visible_width = i_width;
+                p_vout->p->fmt_in.i_visible_width = i_width;
 
-                i_height = p_vout->fmt_render.i_visible_height
+                i_height = p_vout->p->fmt_render.i_visible_height
                            - i_crop_top - i_crop_bottom;
-                p_vout->fmt_in.i_visible_height = i_height;
+                p_vout->p->fmt_in.i_visible_height = i_height;
 
-                p_vout->fmt_in.i_x_offset = i_crop_left;
-                p_vout->fmt_in.i_y_offset = i_crop_top;
+                p_vout->p->fmt_in.i_x_offset = i_crop_left;
+                p_vout->p->fmt_in.i_y_offset = i_crop_top;
             }
         }
     }
@@ -771,33 +764,33 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
         i_crop_right = var_GetInteger( p_vout, "crop-right" );
         i_crop_bottom = var_GetInteger( p_vout, "crop-bottom" );
 
-        if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height ||
-            i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width )
+        if( i_crop_top + i_crop_bottom >= p_vout->p->fmt_render.i_visible_height ||
+            i_crop_right + i_crop_left >= p_vout->p->fmt_render.i_visible_width )
         {
             msg_Err( p_vout, "Unable to crop over picture boundaries" );
             return VLC_EGENERIC;
         }
 
-        i_width = p_vout->fmt_render.i_visible_width
+        i_width = p_vout->p->fmt_render.i_visible_width
                   - i_crop_left - i_crop_right;
-        p_vout->fmt_in.i_visible_width = i_width;
+        p_vout->p->fmt_in.i_visible_width = i_width;
 
-        i_height = p_vout->fmt_render.i_visible_height
+        i_height = p_vout->p->fmt_render.i_visible_height
                    - i_crop_top - i_crop_bottom;
-        p_vout->fmt_in.i_visible_height = i_height;
+        p_vout->p->fmt_in.i_visible_height = i_height;
 
-        p_vout->fmt_in.i_x_offset = i_crop_left;
-        p_vout->fmt_in.i_y_offset = i_crop_top;
+        p_vout->p->fmt_in.i_x_offset = i_crop_left;
+        p_vout->p->fmt_in.i_y_offset = i_crop_top;
     }
 
  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,
-             p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset,
-             p_vout->fmt_in.i_visible_width,
-             p_vout->fmt_in.i_visible_height );
+             p_vout->p->fmt_in.i_width, p_vout->p->fmt_in.i_height,
+             p_vout->p->fmt_in.i_x_offset, p_vout->p->fmt_in.i_y_offset,
+             p_vout->p->fmt_in.i_visible_width,
+             p_vout->p->fmt_in.i_visible_height );
 
     var_TriggerCallback( p_vout, "crop-update" );
 
@@ -815,12 +808,8 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
     (void)psz_cmd; (void)oldval; (void)p_data;
 
     /* 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;
+    p_vout->p->fmt_in.i_sar_num = p_vout->p->fmt_render.i_sar_num;
+    p_vout->p->fmt_in.i_sar_den = p_vout->p->fmt_render.i_sar_den;
 
     if( !psz_parser ) goto aspect_end;
 
@@ -830,31 +819,25 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
     i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
     if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end;
 
-    i_sar_num = i_aspect_num * p_vout->fmt_render.i_visible_height;
-    i_sar_den = i_aspect_den * p_vout->fmt_render.i_visible_width;
+    i_sar_num = i_aspect_num * p_vout->p->fmt_render.i_visible_height;
+    i_sar_den = i_aspect_den * p_vout->p->fmt_render.i_visible_width;
     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;
+    p_vout->p->fmt_in.i_sar_num = i_sar_num;
+    p_vout->p->fmt_in.i_sar_den = i_sar_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->p->fmt_in.i_sar_num *= p_vout->p->i_par_den;
+        p_vout->p->fmt_in.i_sar_den *= p_vout->p->i_par_num;
     }
 
-    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,
-             p_vout->fmt_in.i_sar_den * p_vout->fmt_in.i_height,
-             p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
+             p_vout->p->fmt_in.i_sar_num * p_vout->p->fmt_in.i_width,
+             p_vout->p->fmt_in.i_sar_den * p_vout->p->fmt_in.i_height,
+             p_vout->p->fmt_in.i_sar_num, p_vout->p->fmt_in.i_sar_den );
 
     if( var_Get( p_vout, "crop", &val ) )
         return VLC_EGENERIC;
@@ -870,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;
 }
@@ -890,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;
 }
 
@@ -904,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;
 }
 
@@ -933,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;
 }
 
@@ -942,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;
 }
 
@@ -952,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;
 }