Removing osd_widgets.c.

diff --git a/Makefile.am b/Makefile.am
index 1a41a747d00c2e53fb937ab787bfb84331db28c2..45d08056e44b5df6d68906d72ade02743827c792 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -429,7 +429,6 @@ SOURCES_libvlc_common = \
        src/stream_output/sap.c \
        src/stream_output/acl.c \
        src/osd/osd.c \
-       src/osd/osd_widgets.c \
        src/osd/osd_parser.c \
        src/misc/charset.c \
        src/misc/httpd.c \
@@ -606,8 +605,8 @@ VLC-release.app: vlc
            wizard.m \
            extended.h \
            extended.m \
-        bookmarks.h \
-        bookmarks.m \
+           bookmarks.h \
+           bookmarks.m \
            update.h \
            update.m \
            vout.m; do \
@@ -722,8 +721,8 @@ VLC.app: vlc
            wizard.m \
            extended.h \
            extended.m \
-        bookmarks.h \
-        bookmarks.m \
+           bookmarks.h \
+           bookmarks.m \
            update.h \
            update.m \
            vout.m; do \

diff --git a/src/osd/osd_widgets.c b/src/osd/osd_widgets.c
deleted file mode 100644 (file)
index 02da110..0000000
--- a/src/osd/osd_widgets.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*****************************************************************************\r
- * osd_widgets.c : OSD widgets manipulation functions\r
- *****************************************************************************\r
- * Copyright (C) 2005 M2X\r
- * Copyright (C) 2004 VideoLAN (Centrale Réseaux) and its contributors\r
- *\r
- * $Id: osd_widgets.c 9274 2004-11-10 15:16:51Z gbazin $\r
- *\r
- * Author: Jean-Paul Saman <jpsaman #_at_# m2x dot nl>\r
- *\r
- * Based on: src/video_output/video_widgets.c\r
- *     from: Yoann Peronneau <yoann@videolan.org>\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\r
- *****************************************************************************/\r
-\r
-/*****************************************************************************\r
- * Preamble\r
- *****************************************************************************/\r
-#include <stdlib.h>                                                /* free() */\r
-#include <vlc/vlc.h>\r
-#include <vlc/vout.h>\r
-#include <osd.h>\r
-\r
-#define STYLE_EMPTY 0\r
-#define STYLE_FILLED 1\r
-\r
-/*****************************************************************************\r
- * Local prototypes\r
- *****************************************************************************/\r
-static void DrawRect( picture_t *, int, int, int, int, short );\r
-static void DrawTriangle( picture_t *, int, int, int, int, short );\r
-static picture_t *osd_CreatePicture( int, int );\r
-\r
-/*****************************************************************************\r
- * Draws a rectangle at the given position in the subpic.\r
- * It may be filled (fill == STYLE_FILLED) or empty (fill == STYLE_EMPTY).\r
- *****************************************************************************/\r
-static void DrawRect( picture_t *p_picture, int i_x1, int i_y1,\r
-                      int i_x2, int i_y2, short fill )\r
-{\r
-    int x, y;\r
-    uint8_t *p_a = p_picture->A_PIXELS;\r
-    int i_pitch = p_picture->Y_PITCH;\r
-\r
-    if( fill == STYLE_FILLED )\r
-    {\r
-        for( y = i_y1; y <= i_y2; y++ )\r
-        {\r
-            for( x = i_x1; x <= i_x2; x++ )\r
-            {\r
-                p_a[ x + i_pitch * y ] = 0xff;\r
-            }\r
-        }\r
-    }\r
-    else\r
-    {\r
-        for( y = i_y1; y <= i_y2; y++ )\r
-        {\r
-            p_a[ i_x1 + i_pitch * y ] = 0xff;\r
-            p_a[ i_x2 + i_pitch * y ] = 0xff;\r
-        }\r
-        for( x = i_x1; x <= i_x2; x++ )\r
-        {\r
-            p_a[ x + i_pitch * i_y1 ] = 0xff;\r
-            p_a[ x + i_pitch * i_y2 ] = 0xff;\r
-        }\r
-    }\r
-}\r
-\r
-/*****************************************************************************\r
- * Draws a triangle at the given position in the subpic.\r
- * It may be filled (fill == STYLE_FILLED) or empty (fill == STYLE_EMPTY).\r
- *****************************************************************************/\r
-static void DrawTriangle( picture_t *p_picture, int i_x1, int i_y1,\r
-                          int i_x2, int i_y2, short fill )\r
-{\r
-    int x, y, i_mid, h;\r
-    uint8_t *p_a = p_picture->A_PIXELS;\r
-    int i_pitch = p_picture->Y_PITCH;\r
-\r
-    i_mid = i_y1 + ( ( i_y2 - i_y1 ) >> 1 );\r
-\r
-    if( i_x2 >= i_x1 )\r
-    {\r
-        if( fill == STYLE_FILLED )\r
-        {\r
-            for( y = i_y1; y <= i_mid; y++ )\r
-            {\r
-                h = y - i_y1;\r
-                for( x = i_x1; x <= i_x1 + h && x <= i_x2; x++ )\r
-                {\r
-                    p_a[ x + i_pitch * y ] = 0xff;\r
-                    p_a[ x + i_pitch * ( i_y2 - h ) ] = 0xff;\r
-                }\r
-            }\r
-        }\r
-        else\r
-        {\r
-            for( y = i_y1; y <= i_mid; y++ )\r
-            {\r
-                h = y - i_y1;\r
-                p_a[ i_x1 + i_pitch * y ] = 0xff;\r
-                p_a[ i_x1 + h + i_pitch * y ] = 0xff;\r
-                p_a[ i_x1 + i_pitch * ( i_y2 - h ) ] = 0xff;\r
-                p_a[ i_x1 + h + i_pitch * ( i_y2 - h ) ] = 0xff;\r
-            }\r
-        }\r
-    }\r
-    else\r
-    {\r
-        if( fill == STYLE_FILLED )\r
-        {\r
-            for( y = i_y1; y <= i_mid; y++ )\r
-            {\r
-                h = y - i_y1;\r
-                for( x = i_x1; x >= i_x1 - h && x >= i_x2; x-- )\r
-                {\r
-                    p_a[ x + i_pitch * y ] = 0xff;\r
-                    p_a[ x + i_pitch * ( i_y2 - h ) ] = 0xff;\r
-                }\r
-            }\r
-        }\r
-        else\r
-        {\r
-            for( y = i_y1; y <= i_mid; y++ )\r
-            {\r
-                h = y - i_y1;\r
-                p_a[ i_x1 + i_pitch * y ] = 0xff;\r
-                p_a[ i_x1 - h + i_pitch * y ] = 0xff;\r
-                p_a[ i_x1 + i_pitch * ( i_y2 - h ) ] = 0xff;\r
-                p_a[ i_x1 - h + i_pitch * ( i_y2 - h ) ] = 0xff;\r
-            }\r
-        }\r
-    }\r
-}\r
-\r
-/*****************************************************************************\r
- * Create Picture: creates picture\r
- *****************************************************************************/\r
-static picture_t *osd_CreatePicture( int i_width, int i_height )\r
-{\r
-    picture_t *p_picture = NULL;\r
-    uint8_t *p_y, *p_u, *p_v, *p_a;\r
-    int i_pitch;\r
-\r
-    p_picture = (picture_t*) malloc( sizeof(picture_t) );\r
-    if( p_picture == NULL )\r
-    {\r
-        return NULL;\r
-    }\r
-    /* Clear the memory */\r
-    memset( p_picture, 0, sizeof(picture_t) );\r
-\r
-    p_y = p_picture->Y_PIXELS;\r
-    p_u = p_picture->U_PIXELS;\r
-    p_v = p_picture->V_PIXELS;\r
-    p_a = p_picture->A_PIXELS;\r
-    i_pitch = p_picture->Y_PITCH;\r
-\r
-    /* Initialize the region pixels (only the alpha will be changed later) */\r
-    memset( p_y, 0xff, i_pitch * i_height );\r
-    memset( p_u, 0x80, i_pitch * i_height );\r
-    memset( p_v, 0x80, i_pitch * i_height );\r
-    memset( p_a, 0x00, i_pitch * i_height );\r
-\r
-    return p_picture;\r
-}\r
-\r
-/*****************************************************************************\r
- * Displays an OSD slider.\r
- * Types are: OSD_HOR_SLIDER and OSD_VERT_SLIDER.\r
- *****************************************************************************/\r
-picture_t *osd_Slider( int i_width, int i_height, int i_position, short i_type )\r
-{\r
-    picture_t *p_picture;\r
-    int i_x_margin, i_y_margin, i_x, i_y;\r
-\r
-    p_picture = osd_CreatePicture( i_width, i_height );\r
-    if( p_picture == NULL )\r
-        return NULL;\r
-\r
-    i_y_margin = i_height / 10;\r
-    i_x_margin = i_y_margin;\r
-    if( i_type == OSD_HOR_SLIDER )\r
-    {\r
-        i_width = i_width - 2 * i_x_margin;\r
-        i_height = i_height / 20;\r
-        i_x = i_x_margin;\r
-        i_y = i_height - i_y_margin - i_height;\r
-    }\r
-    else\r
-    {\r
-        i_width = i_width / 40;\r
-        i_height = i_height - 2 * i_y_margin;\r
-        i_x = i_width - i_x_margin - i_width;\r
-        i_y = i_y_margin;\r
-    }\r
-\r
-    if( i_type == OSD_HOR_SLIDER )\r
-    {\r
-        int i_x_pos = ( i_width - 2 ) * i_position / 100;\r
-        DrawRect( p_picture, i_x_pos - 1, 2, i_x_pos + 1,\r
-                  i_height - 3, STYLE_FILLED );\r
-        DrawRect( p_picture, 0, 0, i_width - 1, i_height - 1, STYLE_EMPTY );\r
-    }\r
-    else if( i_type == OSD_VERT_SLIDER )\r
-    {\r
-        int i_y_pos = i_height / 2;\r
-        DrawRect( p_picture, 2, i_height - ( i_height - 2 ) * i_position / 100,\r
-                  i_width - 3, i_height - 3, STYLE_FILLED );\r
-        DrawRect( p_picture, 1, i_y_pos, 1, i_y_pos, STYLE_FILLED );\r
-        DrawRect( p_picture, i_width - 2, i_y_pos,\r
-                  i_width - 2, i_y_pos, STYLE_FILLED );\r
-        DrawRect( p_picture, 0, 0, i_width - 1, i_height - 1, STYLE_EMPTY );\r
-    }\r
-\r
-    return p_picture;\r
-}\r
-\r
-/*****************************************************************************\r
- * Displays an OSD icon.\r
- * Types are: OSD_PLAY_ICON, OSD_PAUSE_ICON, OSD_SPEAKER_ICON, OSD_MUTE_ICON\r
- *****************************************************************************/\r
-picture_t *osd_Icon( int i_width, int i_height, short i_type )\r
-{\r
-    picture_t *p_picture = NULL;\r
-    int i_x_margin, i_y_margin, i_x, i_y;\r
-\r
-    p_picture = osd_CreatePicture( i_width, i_height );\r
-    if( p_picture == NULL )\r
-        return NULL;\r
-\r
-    i_y_margin = i_height / 15;\r
-    i_x_margin = i_y_margin;\r
-    i_x = i_width - i_x_margin - i_width;\r
-    i_y = i_y_margin;\r
-\r
-    if( i_type == OSD_PAUSE_ICON )\r
-    {\r
-        int i_bar_width = i_width / 3;\r
-        DrawRect( p_picture, 0, 0, i_bar_width - 1, i_height -1, STYLE_FILLED );\r
-        DrawRect( p_picture, i_width - i_bar_width, 0,\r
-                  i_width - 1, i_height - 1, STYLE_FILLED );\r
-    }\r
-    else if( i_type == OSD_PLAY_ICON )\r
-    {\r
-        int i_mid = i_height >> 1;\r
-        int i_delta = ( i_width - i_mid ) >> 1;\r
-        int i_y2 = ( ( i_height - 1 ) >> 1 ) * 2;\r
-        DrawTriangle( p_picture, i_delta, 0, i_width - i_delta, i_y2,\r
-                      STYLE_FILLED );\r
-    }\r
-    else if( i_type == OSD_SPEAKER_ICON || i_type == OSD_MUTE_ICON )\r
-    {\r
-        int i_mid = i_height >> 1;\r
-        int i_delta = ( i_width - i_mid ) >> 1;\r
-        int i_y2 = ( ( i_height - 1 ) >> 1 ) * 2;\r
-        DrawRect( p_picture, i_delta, i_mid / 2, i_width - i_delta,\r
-                  i_height - 1 - i_mid / 2, STYLE_FILLED );\r
-        DrawTriangle( p_picture, i_width - i_delta, 0, i_delta, i_y2,\r
-                      STYLE_FILLED );\r
-        if( i_type == OSD_MUTE_ICON )\r
-        {\r
-            uint8_t *p_a = p_picture->A_PIXELS;\r
-            int i_pitch = p_picture->Y_PITCH;\r
-            int i;\r
-            for( i = 1; i < i_pitch; i++ )\r
-            {\r
-                int k = i + ( i_height - i - 1 ) * i_pitch;\r
-                p_a[ k ] = 0xff - p_a[ k ];\r
-            }\r
-        }\r
-    }\r
-    \r
-    return p_picture;\r
-}\r