]> git.sesse.net Git - vlc/blobdiff - src/video_output/video_widgets.c
Fix menu removal of accelerators. This has yet to be more FIXMEd (jpeg :D)
[vlc] / src / video_output / video_widgets.c
index 9024f9024682f7bc8e4a274973fcafe3c30c5ef6..f0a1ded2bc0098f223d20a4196226232a0bd9a5f 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * video_widgets.c : OSD widgets manipulation functions
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2005 the VideoLAN team
  * $Id$
  *
  * Author: Yoann Peronneau <yoann@videolan.org>
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                                /* free() */
-#include <vlc/vout.h>
-#include <osd.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#define RECT_EMPTY 0
-#define RECT_FILLED 1
+#include <vlc_common.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
 
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void DrawRect( vout_thread_t *, subpicture_t *, int, int, int, int,
-                      short );
-static void DrawTriangle( vout_thread_t *, subpicture_t *, int, int, int, int,
-                          short );
-static void Render    ( vout_thread_t *, picture_t *, const subpicture_t * );
-static void RenderI420( vout_thread_t *, picture_t *, const subpicture_t *,
-                        int );
-static void RenderYUY2( vout_thread_t *, picture_t *, const subpicture_t *,
-                        int );
-static void RenderRV32( vout_thread_t *, picture_t *, const subpicture_t *,
-                        int );
-static subpicture_t *vout_CreateWidget( vout_thread_t * );
-static void FreeWidget( subpicture_t * );
-
-/**
- * Private data in a subpicture.
- */
-struct subpicture_sys_t
-{
-    int     i_x;
-    int     i_y;
-    int     i_width;
-    int     i_height;
-    uint8_t *p_pic;
-};
-
-/*****************************************************************************
- * Draws a rectangle at the given position in the subpic.
- * It may be filled (fill == RECT_FILLED) or empty (fill == RECT_EMPTY).
- *****************************************************************************/
-static void DrawRect( vout_thread_t *p_vout, subpicture_t *p_subpic,
-                      int i_x1, int i_y1, int i_x2, int i_y2, short fill )
-{
-    int x, y;
-    subpicture_sys_t *p_widget = p_subpic->p_sys;
-
-    if( fill == RECT_FILLED )
-    {
-        for( y = i_y1; y <= i_y2; y++ )
-        {
-            for( x = i_x1; x <= i_x2; x++ )
-            {
-                p_widget->p_pic[ x + p_widget->i_width * y ] = 1;
-            }
-        }
-    }
-    else
-    {
-        for( y = i_y1; y <= i_y2; y++ )
-        {
-            p_widget->p_pic[ i_x1 + p_widget->i_width * y ] = 1;
-            p_widget->p_pic[ i_x2 + p_widget->i_width * y ] = 1;
-        }
-        for( x = i_x1; x <= i_x2; x++ )
-        {
-            p_widget->p_pic[ x + p_widget->i_width * i_y1 ] = 1;
-            p_widget->p_pic[ x + p_widget->i_width * i_y2 ] = 1;
-        }
-    }
-}
-
-/*****************************************************************************
- * Draws a triangle at the given position in the subpic.
- * It may be filled (fill == RECT_FILLED) or empty (fill == RECT_EMPTY).
- *****************************************************************************/
-static void DrawTriangle( vout_thread_t *p_vout, subpicture_t *p_subpic,
-                          int i_x1, int i_y1, int i_x2, int i_y2, short fill )
-{
-    int x, y, i_mid, h;
-    subpicture_sys_t *p_widget = p_subpic->p_sys;
-
-    i_mid = i_y1 + ( ( i_y2 - i_y1 ) >> 1 );
-
-    if( fill == RECT_FILLED )
-    {
-        for( y = i_y1; y <= i_mid; y++ )
-        {
-            h = y - i_y1;
-            for( x = i_x1; x <= i_x1 + h && x <= i_x2; x++ )
-            {
-                p_widget->p_pic[ x + p_widget->i_width * y ] = 1;
-                p_widget->p_pic[ x + p_widget->i_width * ( i_y2 - h ) ] = 1;
-            }
-        }
-    }
-    else
-    {
-        for( y = i_y1; y <= i_mid; y++ )
-        {
-            h = y - i_y1;
-            p_widget->p_pic[ i_x1 + p_widget->i_width * y ] = 1;
-            p_widget->p_pic[ i_x1 + h + p_widget->i_width * y ] = 1;
-            p_widget->p_pic[ i_x1 + p_widget->i_width * ( i_y2 - h ) ] = 1;
-            p_widget->p_pic[ i_x1 + h + p_widget->i_width * ( i_y2 - h ) ] = 1;
-        }
-    }
-}
-
-/*****************************************************************************
- * Render: place string in picture
- *****************************************************************************
- * This function merges the previously rendered freetype glyphs into a picture
- *****************************************************************************/
-static void Render( vout_thread_t *p_vout, picture_t *p_pic,
-                    const subpicture_t *p_subpic )
-{
-    int i_fade_alpha = 255;
-    mtime_t i_fade_start = ( p_subpic->i_stop + p_subpic->i_start ) / 2;
-    mtime_t i_now = mdate();
-
-    if( i_now >= i_fade_start )
-    {
-        i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
-                       ( p_subpic->i_stop - i_fade_start );
-    }
-
-    switch( p_vout->output.i_chroma )
-    {
-        /* I420 target, no scaling */
-        case VLC_FOURCC('I','4','2','0'):
-        case VLC_FOURCC('I','Y','U','V'):
-        case VLC_FOURCC('Y','V','1','2'):
-            RenderI420( p_vout, p_pic, p_subpic, i_fade_alpha );
-            break;
-        /* RV32 target, scaling */
-        case VLC_FOURCC('R','V','2','4'):
-        case VLC_FOURCC('R','V','3','2'):
-            RenderRV32( p_vout, p_pic, p_subpic, i_fade_alpha );
-            break;
-        /* NVidia or BeOS overlay, no scaling */
-        case VLC_FOURCC('Y','U','Y','2'):
-            RenderYUY2( p_vout, p_pic, p_subpic, i_fade_alpha );
-            break;
-
-        default:
-            msg_Err( p_vout, "unknown chroma, can't render SPU" );
-            break;
-    }
-}
-
-/**
- * Draw a widget on a I420 (or similar) picture
- */
-static void RenderI420( vout_thread_t *p_vout, picture_t *p_pic,
-                    const subpicture_t *p_subpic, int i_fade_alpha )
-{
-    subpicture_sys_t *p_widget = p_subpic->p_sys;
-    int i_plane, x, y, pen_x, pen_y;
-
-    for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
-    {
-        uint8_t *p_in = p_pic->p[ i_plane ].p_pixels;
-        int i_pic_pitch = p_pic->p[ i_plane ].i_pitch;
-
-        if ( i_plane == 0 )
-        {
-            pen_x = p_widget->i_x;
-            pen_y = p_widget->i_y;
-#define alpha p_widget->p_pic[ x + y * p_widget->i_width ] * i_fade_alpha
-#define pixel p_in[ ( pen_y + y ) * i_pic_pitch + pen_x + x ]
-            for( y = 0; y < p_widget->i_height; y++ )
-            {
-                for( x = 0; x < p_widget->i_width; x++ )
-                {
-                    if( alpha == 0 ) continue;
-                    pen_y--;
-                    pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-                    pen_y++; pen_x--;
-                    pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-                    pen_x += 2;
-                    pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-                    pen_y++; pen_x--;
-                    pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-                    pen_y--;
-                }
-            }
-            for( y = 0; y < p_widget->i_height; y++ )
-            {
-                for( x = 0; x < p_widget->i_width; x++ )
-                {
-                    pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ) +
-                            ( 255 * alpha >> 8 );
-                 }
-             }
-#undef alpha
-#undef pixel
-        }
-        else
-        {
-            pen_x = p_widget->i_x >> 1;
-            pen_y = p_widget->i_y >> 1;
-#define alpha p_widget->p_pic[ x + y * p_widget->i_width ] * i_fade_alpha
-#define pixel p_in[ ( pen_y + (y >> 1) ) * i_pic_pitch + pen_x + (x >> 1) ]
-            for( y = 0; y < p_widget->i_height; y+=2 )
-            {
-                for( x = 0; x < p_widget->i_width; x+=2 )
-                {
-                    if( alpha == 0 ) continue;
-                    pixel = ( ( pixel * ( 0xFF - alpha ) ) >> 8 ) +
-                        ( 0x80 * alpha >> 8 );
-                }
-            }
-#undef alpha
-#undef pixel
-        }
-    }
-
-}
-
-/**
- * Draw a widget on a YUY2 picture
- */
-static void RenderYUY2( vout_thread_t *p_vout, picture_t *p_pic,
-                        const subpicture_t *p_subpic, int i_fade_alpha )
-{
-    subpicture_sys_t *p_widget = p_subpic->p_sys;
-    int x, y, pen_x, pen_y;
-    uint8_t *p_in = p_pic->p[0].p_pixels;
-    int i_pic_pitch = p_pic->p[0].i_pitch;
-
-    pen_x = p_widget->i_x;
-    pen_y = p_widget->i_y;
-#define alpha p_widget->p_pic[ x + y * p_widget->i_width ] * i_fade_alpha
-#define pixel p_in[ ( pen_y + y ) * i_pic_pitch + 2 * ( pen_x + x ) ]
-    for( y = 0; y < p_widget->i_height; y++ )
-    {
-        for( x = 0; x < p_widget->i_width; x++ )
-        {
-            pen_y--;
-            pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-            pen_y++; pen_x--;
-            pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-            pen_x += 2;
-            pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-            pen_y++; pen_x--;
-            pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 );
-            pen_y--;
-        }
-    }
-    for( y = 0; y < p_widget->i_height; y++ )
-    {
-        for( x = 0; x < p_widget->i_width; x++ )
-        {
-            pixel = ( ( pixel * ( 255 - alpha ) ) >> 8 ) +
-                    ( 255 * alpha >> 8 );
-         }
-     }
-#undef alpha
-#undef pixel
-}
-
-/**
- * Draw a widget on a RV32 picture
- */
-static void RenderRV32( vout_thread_t *p_vout, picture_t *p_pic,
-                    const subpicture_t *p_subpic, int i_fade_alpha )
-{
-    subpicture_sys_t *p_widget = p_subpic->p_sys;
-    int x, y, pen_x, pen_y;
-    uint8_t *p_in = p_pic->p[0].p_pixels;
-    int i_pic_pitch = p_pic->p[0].i_pitch;
-
-    pen_x = p_widget->i_x;
-    pen_y = p_widget->i_y;
-
-#define alpha p_widget->p_pic[ x + y * p_widget->i_width ] * i_fade_alpha
-#define pixel( c ) p_in[ ( pen_y + y ) * i_pic_pitch + 4 * ( pen_x + x ) + c ]
-    for(y = 0; y < p_widget->i_height; y++ )
-    {
-        for( x = 0; x < p_widget->i_width; x++ )
-        {
-            pen_y--;
-            pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
-            pen_y++; pen_x--;
-            pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
-            pen_x += 2;
-            pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
-            pen_y++; pen_x--;
-            pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 );
-            pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 );
-            pen_y--;
-        }
-    }
-    for(y = 0; y < p_widget->i_height; y++ )
-    {
-        for( x = 0; x < p_widget->i_width; x++ )
-        {
-            pixel( 0 ) = ( ( pixel( 0 ) * ( 255 - alpha ) ) >> 8 ) +
-                ( 255 * alpha >> 8 );
-            pixel( 1 ) = ( ( pixel( 1 ) * ( 255 - alpha ) ) >> 8 ) +
-                ( 255 * alpha >> 8 );
-            pixel( 2 ) = ( ( pixel( 2 ) * ( 255 - alpha ) ) >> 8 ) +
-                ( 255 * alpha >> 8 );
-        }
-    }
-#undef alpha
-#undef pixel
-}
-
-/*****************************************************************************
- * Creates and initializes an OSD widget.
- *****************************************************************************/
-subpicture_t *vout_CreateWidget( vout_thread_t *p_vout )
-{
-    subpicture_t *p_subpic;
-    subpicture_sys_t *p_widget;
-    mtime_t i_now = mdate();
-
-    p_subpic = 0;
-    p_widget = 0;
-
-    /* Create and initialize a subpicture */
-    p_subpic = vout_CreateSubPicture( p_vout, MEMORY_SUBPICTURE );
-    if( p_subpic == NULL )
-    {
-        return NULL;
-    }
-    p_subpic->pf_render = Render;
-    p_subpic->pf_destroy = FreeWidget;
-    p_subpic->i_start = i_now;
-    p_subpic->i_stop = i_now + 1200000;
-    p_subpic->b_ephemer = VLC_FALSE;
-
-    p_widget = malloc( sizeof(subpicture_sys_t) );
-    if( p_widget == NULL )
-    {
-        FreeWidget( p_subpic );
-        vout_DestroySubPicture( p_vout, p_subpic );
-        return NULL;
-    }
-    p_subpic->p_sys = p_widget;
-
-    return p_subpic;
-}
+#include <vlc_filter.h>
 
 /*****************************************************************************
  * Displays an OSD slider.
- * Type 0 is position slider-like, and type 1 is volume slider-like.
+ * Types are: OSD_HOR_SLIDER and OSD_VERT_SLIDER.
  *****************************************************************************/
-void vout_OSDSlider( vlc_object_t *p_caller, int i_position, short i_type )
+void vout_OSDSlider( vlc_object_t *p_caller, int i_channel, int i_position,
+                     short i_type )
 {
     vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
                                              FIND_ANYWHERE );
-    subpicture_t *p_subpic;
-    subpicture_sys_t *p_widget;
-    int i_x_margin, i_y_margin;
-
-    if( p_vout == NULL || !config_GetInt( p_caller, "osd" ) || i_position < 0 )
-    {
-        return;
-    }
-
-    p_subpic = vout_CreateWidget( p_vout );
-    if( p_subpic == NULL )
-    {
-        return;
-    }
-    p_widget = p_subpic->p_sys;
-
-    i_y_margin = p_vout->render.i_height / 10;
-    i_x_margin = i_y_margin;
-    if( i_type == 0 )
-    {
-        p_widget->i_width = p_vout->render.i_width - 2 * i_x_margin;
-        p_widget->i_height = p_vout->render.i_height / 20;
-        p_widget->i_x = i_x_margin;
-        p_widget->i_y = p_vout->render.i_height - i_y_margin -
-                        p_widget->i_height;
-    }
-    else
-    {
-        p_widget->i_width = p_vout->render.i_width / 40;
-        p_widget->i_height = p_vout->render.i_height - 2 * i_y_margin;
-        p_widget->i_x = p_vout->render.i_width - i_x_margin -
-                        p_widget->i_width;
-        p_widget->i_y = i_y_margin;
-    }
-
-    p_widget->p_pic = (uint8_t *)malloc( p_widget->i_width *
-                                         p_widget->i_height );
-    if( p_widget->p_pic == NULL )
-    {
-        FreeWidget( p_subpic );
-        vout_DestroySubPicture( p_vout, p_subpic );
-        return;
-    }
-    memset( p_widget->p_pic, 0, p_widget->i_width * p_widget->i_height );
-
-    if( i_type == 0 )
-    {
-        int i_x_pos = ( p_widget->i_width - 2 ) * i_position / 100;
-        int i_y_pos = p_widget->i_height / 2;
-        DrawRect( p_vout, p_subpic, i_x_pos - 1, 2, i_x_pos + 1,
-                  p_widget->i_height - 3, RECT_FILLED );
-        DrawRect( p_vout, p_subpic, 0, 0, p_widget->i_width - 1,
-                  p_widget->i_height - 1, RECT_EMPTY );
-    }
-    else if( i_type == 1 )
-    {
-        int i_y_pos = p_widget->i_height / 2;
-        DrawRect( p_vout, p_subpic, 2, p_widget->i_height -
-                  ( p_widget->i_height - 2 ) * i_position / 100,
-                  p_widget->i_width - 3, p_widget->i_height - 3,
-                  RECT_FILLED );
-        DrawRect( p_vout, p_subpic, 1, i_y_pos, 1, i_y_pos, RECT_FILLED );
-        DrawRect( p_vout, p_subpic, p_widget->i_width - 2, i_y_pos,
-                  p_widget->i_width - 2, i_y_pos, RECT_FILLED );
-        DrawRect( p_vout, p_subpic, 0, 0, p_widget->i_width - 1,
-                  p_widget->i_height - 1, RECT_EMPTY );
-    }
 
-    vlc_mutex_lock( &p_vout->change_lock );
-
-    if( p_vout->p_last_osd_message )
+    if( p_vout && ( config_GetInt( p_caller, "osd" ) || ( i_position >= 0 ) ) )
     {
-        vout_DestroySubPicture( p_vout, p_vout->p_last_osd_message );
+        osd_Slider( p_caller, p_vout->p_spu, p_vout->render.i_width,
+            p_vout->render.i_height, p_vout->fmt_in.i_x_offset,
+            p_vout->fmt_in.i_height - p_vout->fmt_in.i_visible_height
+                                    - p_vout->fmt_in.i_y_offset,
+            i_channel, i_position, i_type );
     }
-    p_vout->p_last_osd_message = p_subpic;
-    vout_DisplaySubPicture( p_vout, p_subpic );
-
-    vlc_mutex_unlock( &p_vout->change_lock );
-
     vlc_object_release( p_vout );
-    return;
 }
 
 /*****************************************************************************
  * Displays an OSD icon.
- * Types are: OSD_PLAY_ICON, OSD_PAUSE_ICON
+ * Types are: OSD_PLAY_ICON, OSD_PAUSE_ICON, OSD_SPEAKER_ICON, OSD_MUTE_ICON
  *****************************************************************************/
-void vout_OSDIcon( vlc_object_t *p_caller, short i_type )
+void vout_OSDIcon( vlc_object_t *p_caller, int i_channel, short i_type )
 {
     vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
                                              FIND_ANYWHERE );
-    subpicture_t *p_subpic;
-    subpicture_sys_t *p_widget;
-    int i_x_margin, i_y_margin;
-
-    if( p_vout == NULL || !config_GetInt( p_caller, "osd" ) )
-    {
-        return;
-    }
-
-    p_subpic = vout_CreateWidget( p_vout );
-    if( p_subpic == NULL )
-    {
-        return;
-    }
-    p_widget = p_subpic->p_sys;
-
-    i_y_margin = p_vout->render.i_height / 15;
-    i_x_margin = i_y_margin;
-    p_widget->i_width = p_vout->render.i_width / 22;
-    p_widget->i_height = p_widget->i_width;
-    p_widget->i_x = p_vout->render.i_width - i_x_margin -
-                    p_widget->i_width;
-    p_widget->i_y = i_y_margin;
-
-    p_widget->p_pic = (uint8_t *)malloc( p_widget->i_width *
-                                         p_widget->i_height );
-    if( p_widget->p_pic == NULL )
-    {
-        FreeWidget( p_subpic );
-        vout_DestroySubPicture( p_vout, p_subpic );
-        return;
-    }
-    memset( p_widget->p_pic, 0, p_widget->i_width * p_widget->i_height );
-
-    if( i_type == OSD_PAUSE_ICON )
-    {
-        int i_bar_width = p_widget->i_width / 3;
-        DrawRect( p_vout, p_subpic, 0, 0, i_bar_width - 1,
-                  p_widget->i_height - 1, RECT_FILLED );
-        DrawRect( p_vout, p_subpic, p_widget->i_width - i_bar_width, 0,
-                  p_widget->i_width - 1, p_widget->i_height - 1, RECT_FILLED );
-    }
-    else if( i_type == OSD_PLAY_ICON )
-    {
-        int i_mid = p_widget->i_height >> 1;
-        int i_delta = ( p_widget->i_width - i_mid ) >> 1;
-        int i_y2 = ( ( p_widget->i_height - 1 ) >> 1 ) * 2;
-        DrawTriangle( p_vout, p_subpic, i_delta, 0,
-                      p_widget->i_width - i_delta, i_y2, RECT_FILLED );
-    }
 
-    vlc_mutex_lock( &p_vout->change_lock );
+    if( !p_vout ) return;
 
-    if( p_vout->p_last_osd_message )
+    if( config_GetInt( p_caller, "osd" ) )
     {
-        vout_DestroySubPicture( p_vout, p_vout->p_last_osd_message );
+        osd_Icon( p_caller,
+                  p_vout->p_spu,
+                  p_vout->render.i_width,
+                  p_vout->render.i_height,
+                  p_vout->fmt_in.i_width - p_vout->fmt_in.i_visible_width
+                                         - p_vout->fmt_in.i_x_offset,
+                  p_vout->fmt_in.i_y_offset,
+                  i_channel, i_type );
     }
-    p_vout->p_last_osd_message = p_subpic;
-    vout_DisplaySubPicture( p_vout, p_subpic );
-
-    vlc_mutex_unlock( &p_vout->change_lock );
-
     vlc_object_release( p_vout );
-    return;
 }
 
-/**
- * Frees the widget.
- */
-static void FreeWidget( subpicture_t *p_subpic )
-{
-    subpicture_sys_t *p_widget = p_subpic->p_sys;
-
-    if( p_subpic->p_sys == NULL ) return;
-
-    if( p_widget->p_pic != NULL )
-    {
-        free( p_widget->p_pic );
-    }
-    free( p_widget );
-}