* Ported Glide and MGA plugins to the new module API. MGA never worked,

[vlc] / src / video_output / video_output.c

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 2ddf26675fd02fdf277357d4c19863d11ea0ac5d..6d48fd4b7c1925cc6fa0b6767fb35bdc593b3933 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -161,9 +161,9 @@ vout_thread_t * vout_CreateThread   ( int *pi_status )
     p_vout->b_interface           = 0;
     p_vout->b_scale               = 1;
 
-    intf_DbgMsg( "wished configuration: %dx%d, %d/%d bpp (%d Bpl)",
-                 p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
-                 p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
+    intf_WarnMsg( 1, "wished configuration: %dx%d, %d/%d bpp (%d Bpl)",
+                  p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
+                  p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
 
     /* Initialize idle screen */
     p_vout->last_display_date   = 0;
@@ -199,12 +199,12 @@ vout_thread_t * vout_CreateThread   ( int *pi_status )
         free( p_vout );
         return( NULL );
     }
-    intf_DbgMsg( "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
-                 "masks: 0x%x/0x%x/0x%x",
-                 p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
-                 p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line,
-                 p_vout->i_red_mask, p_vout->i_green_mask,
-                 p_vout->i_blue_mask );
+    intf_WarnMsg( 1, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
+                  "masks: 0x%x/0x%x/0x%x",
+                  p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
+                  p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line,
+                  p_vout->i_red_mask, p_vout->i_green_mask,
+                  p_vout->i_blue_mask );
 
     /* Calculate shifts from system-updated masks */
     MaskToShift( &p_vout->i_red_lshift, &p_vout->i_red_rshift,
@@ -222,11 +222,7 @@ vout_thread_t * vout_CreateThread   ( int *pi_status )
 
     /* Load fonts - fonts must be initialized after the system method since
      * they may be dependant on screen depth and other thread properties */
-    p_vout->p_default_font = vout_LoadFont( DATA_PATH "/" VOUT_DEFAULT_FONT );
-    if( p_vout->p_default_font == NULL )
-    {
-        p_vout->p_default_font = vout_LoadFont( "share/" VOUT_DEFAULT_FONT );
-    }
+    p_vout->p_default_font = vout_LoadFont( VOUT_DEFAULT_FONT );
     if( p_vout->p_default_font == NULL )
     {
         intf_ErrMsg( "vout error: could not load default font" );
@@ -234,11 +230,8 @@ vout_thread_t * vout_CreateThread   ( int *pi_status )
         free( p_vout );
         return( NULL );
     }
-    p_vout->p_large_font = vout_LoadFont( DATA_PATH "/" VOUT_LARGE_FONT );
-    if( p_vout->p_large_font == NULL )
-    {
-        p_vout->p_large_font = vout_LoadFont( "share/" VOUT_LARGE_FONT );
-    }
+
+    p_vout->p_large_font = vout_LoadFont( VOUT_LARGE_FONT );
     if( p_vout->p_large_font == NULL )
     {
         intf_ErrMsg( "vout error: could not load large font" );
@@ -857,23 +850,23 @@ static int BinaryLog(u32 i)
 
     if(i & 0xffff0000)
     {
-       i_log += 16;
+        i_log += 16;
     }
     if(i & 0xff00ff00)
     {
-       i_log += 8;
+        i_log += 8;
     }
     if(i & 0xf0f0f0f0)
     {
-       i_log += 4;
+        i_log += 4;
     }
     if(i & 0xcccccccc)
     {
-       i_log += 2;
+        i_log += 2;
     }
     if(i & 0xaaaaaaaa)
     {
-       i_log += 1;
+        i_log += 1;
     }
 
     if (i != ((u32)1 << i_log))
@@ -930,14 +923,11 @@ static int InitThread( vout_thread_t *p_vout )
         return( 1 );
     }
 
-    if( p_vout->b_need_render )
+    /* Initialize convertion tables and functions */
+    if( vout_InitYUV( p_vout ) )
     {
-        /* Initialize convertion tables and functions */
-        if( vout_InitYUV( p_vout ) )
-        {
-            intf_ErrMsg("vout error: can't allocate YUV translation tables");
-            return( 1 );
-        }
+        intf_ErrMsg("vout error: can't allocate YUV translation tables");
+        return( 1 );
     }
 
     /* Mark thread as running and return */
@@ -1833,12 +1823,14 @@ int RenderSplash( vout_thread_t *p_vout )
  *****************************************************************************/
 int RenderIdle( vout_thread_t *p_vout )
 {
+#if 0
     int         i_x = 0, i_y = 0;                           /* text position */
     int         i_width, i_height;                              /* text size */
-    mtime_t     current_date;                                /* current date */
     int         i_amount = 0;                             /*  amount to draw */
     char *psz_text =    "Waiting for stream";            /* text to display */
     char *psz_wtext =   "[................]";
+#endif
+    mtime_t     current_date;                                /* current date */
 
 
     memset( p_vout->p_buffer[ p_vout->i_buffer_index ].p_data,
@@ -1850,6 +1842,8 @@ int RenderIdle( vout_thread_t *p_vout )
 //            && (current_date - p_vout->last_idle_date) > VOUT_IDLE_DELAY 
     )
     {
+        /* FIXME: idle screen disabled */
+#if 0
         SetBufferPicture( p_vout, NULL );
         vout_TextSize( p_vout->p_large_font, WIDE_TEXT | OUTLINED_TEXT, psz_text,
                        &i_width, &i_height );
@@ -1873,6 +1867,7 @@ int RenderIdle( vout_thread_t *p_vout )
 
             SetBufferArea( p_vout, i_x, i_y, i_width, i_height * 2 );
         }
+#endif
         return( 1 );
     }
     return( 0 );