Stay polite
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 15 Feb 2009 17:49:55 +0000 (19:49 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 15 Feb 2009 17:51:07 +0000 (19:51 +0200)
src/video_output/vout_intf.c

index 7cb21e8..d61684f 100644 (file)
@@ -907,18 +907,12 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name,
 static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
                             unsigned *pi_height )
 {
-    vlc_value_t val;
-    int i_width, i_height;
-    uint64_t ll_zoom;
-
 #define FP_FACTOR 1000                             /* our fixed point factor */
 
-    var_Get( p_vout, "width", &val );
-    i_width = val.i_int;
-    var_Get( p_vout, "height", &val );
-    i_height = val.i_int;
-    var_Get( p_vout, "zoom", &val );
-    ll_zoom = (uint64_t)( FP_FACTOR * val.f_float );
+    int i_width = var_GetInteger( p_vout, "width" );
+    int i_height = var_GetInteger( p_vout, "height" );
+    float f_zoom = var_GetFloat( p_vout, "zoom" );
+    uint64_t ll_zoom = (uint64_t)( FP_FACTOR * f_zoom );
 
     if( i_width > 0 && i_height > 0)
     {
@@ -944,7 +938,7 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
     }
 
     if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) {
-        msg_Warn( p_vout, "fucked up aspect" );
+        msg_Warn( p_vout, "aspect ratio screwed up" );
         *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);
     }