summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/osd.c15
-rw-r--r--src/xine-engine/osd.h3
-rw-r--r--src/xine-engine/xine_interface.c5
3 files changed, 15 insertions, 8 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 0bc1574ca..4b521e539 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -1542,13 +1542,18 @@ static void osd_draw_bitmap(osd_object_t *osd, uint8_t *bitmap,
}
}
-static void osd_set_argb_buffer(osd_object_t *osd, uint32_t *argb_buffer)
+static void osd_set_argb_buffer(osd_object_t *osd, uint32_t *argb_buffer,
+ int x, int y, int width, int height)
{
osd->argb_buffer = argb_buffer;
- osd->x2 = osd->width;
- osd->x1 = 0;
- osd->y2 = osd->height;
- osd->y1 = 0;
+ if(osd->x1 == 0 || x < osd->x1)
+ osd->x1 = x;
+ if(osd->x2 == 0 || (x + width) > osd->x2)
+ osd->x2 = x + width;
+ if(osd->y1 == 0 || y < osd->y1)
+ osd->y1 = y;
+ if(osd->y2 == 0 || (y + height) > osd->y2)
+ osd->y2 = y + height;
}
static uint32_t osd_get_capabilities (osd_object_t *osd) {
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h
index ed3118a05..a6acc11ab 100644
--- a/src/xine-engine/osd.h
+++ b/src/xine-engine/osd.h
@@ -221,7 +221,8 @@ struct osd_renderer_s {
/*
* set a buffer to an argb buffer
*/
- void (*set_argb_buffer) (osd_object_t *osd, uint32_t *argb_buffer);
+ void (*set_argb_buffer) (osd_object_t *osd, uint32_t *argb_buffer,
+ int x, int y, int width, int height);
/* private stuff */
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 1f6175a06..4f59785a1 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -855,8 +855,9 @@ void xine_osd_draw_bitmap(xine_osd_t *this, uint8_t *bitmap,
this->osd.renderer->draw_bitmap(&this->osd, bitmap, x1, y1, width, height, palette_map);
}
-void xine_osd_set_argb_buffer(xine_osd_t *this, uint32_t *argb_buffer) {
- this->osd.renderer->set_argb_buffer(&this->osd, argb_buffer);
+void xine_osd_set_argb_buffer(xine_osd_t *this, uint32_t *argb_buffer,
+ int x, int y, int width, int height) {
+ this->osd.renderer->set_argb_buffer(&this->osd, argb_buffer, x, y, width, height);
}