diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 23:32:42 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 23:32:42 +0200 |
| commit | 3840fddba7fa30ec4280fb3a643592e28bedca86 (patch) | |
| tree | fb442b016ec54d7bbe3331b1faf9bc53bad39dd7 | |
| parent | 8ce642aa3a921198477b538136e626ce3ac689d1 (diff) | |
| download | xine-lib-3840fddba7fa30ec4280fb3a643592e28bedca86.tar.gz xine-lib-3840fddba7fa30ec4280fb3a643592e28bedca86.tar.bz2 | |
Remove vo_buttons_t structure.
The only place where this was used was in video_overlay_object_t, which
is not used by anything in xine-lib, nor in xine-ui, gxine, oxine or
Kaffeine.
With this change (that basically reverts most of changeset 1517) the
size of video_overlay_t structure drops from 4MB to less than 3KB.
It also reduces xine-lib's memory consumption by 10MB straight.
| -rw-r--r-- | src/xine-engine/video_overlay.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h index b15eadc7b..d8711363b 100644 --- a/src/xine-engine/video_overlay.h +++ b/src/xine-engine/video_overlay.h @@ -46,38 +46,6 @@ #define OVERLAY_EVENT_MENU_BUTTON 3 #define OVERLAY_EVENT_FREE_HANDLE 8 /* Frees a handle, previous allocated via get_handle */ -/* number of colors in the overlay palette. Currently limited to 256 - at most, because some alphablend functions use an 8-bit index into - the palette. This should probably be classified as a bug. */ -/* FIXME: Also defines in video_out.h */ -#define OVL_PALETTE_SIZE 256 - -typedef struct vo_buttons_s { - int32_t type; /* 0:Button not valid, - 1:Button Valid, no auto_action, - 2:Button Valid, auto_action. - */ - - /* The following clipping coordinates are relative to the left upper corner - * of the OVERLAY, not of the target FRAME. Please do not mix them up! */ - int32_t hili_top; - int32_t hili_bottom; - int32_t hili_left; - int32_t hili_right; - int32_t up; - int32_t down; - int32_t left; - int32_t right; - int32_t hili_rgb_clut; /* true if clut was converted to rgb*/ - /* FIXME: Probably not needed ^^^ */ - uint32_t select_color[OVL_PALETTE_SIZE]; - uint8_t select_trans[OVL_PALETTE_SIZE]; - xine_event_t select_event; - uint32_t active_color[OVL_PALETTE_SIZE]; - uint8_t active_trans[OVL_PALETTE_SIZE]; - xine_event_t active_event; -} vo_buttons_t; - typedef struct video_overlay_object_s { int32_t handle; /* Used to match Show and Hide events. */ uint32_t object_type; /* 0=Subtitle, 1=Menu */ @@ -85,9 +53,6 @@ typedef struct video_overlay_object_s { vo_overlay_t *overlay; /* The image data. */ uint32_t *palette; /* If NULL, no palette contained in this event. */ uint32_t palette_type; /* 1 Y'CrCB, 2 R'G'B' */ - int32_t buttonN; /* Current highlighed button. 0 means no info on which button to higlight */ - /* -1 means don't use this button info. */ - vo_buttons_t button[32]; /* Info regarding each button on the overlay */ } video_overlay_object_t; /* This will hold all details of an event item, needed for event queue to function */ |