diff options
Diffstat (limited to 'src/video_out/x11osd.c')
| -rw-r--r-- | src/video_out/x11osd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c index f1e0656d1..450812f90 100644 --- a/src/video_out/x11osd.c +++ b/src/video_out/x11osd.c @@ -15,9 +15,7 @@ * * 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-1307, USA - * - * $Id: x11osd.c,v 1.15 2005/09/25 00:44:04 miguelfreitas Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * x11osd.c, use X11 Nonrectangular Window Shape Extension to draw xine OSD * @@ -53,7 +51,7 @@ #define LOG */ -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "x11osd.h" struct x11osd @@ -436,7 +434,7 @@ void x11osd_clear(x11osd *osd) osd->clean = WIPED; } -#define TRANSPARENT 0xffffffff +#define X11OSD_TRANSPARENT 0xffffffff #define saturate(n, l, u) ((n) < (l) ? (l) : ((n) > (u) ? (u) : (n))) @@ -526,13 +524,13 @@ void x11osd_blend(x11osd *osd, vo_overlay_t *overlay) } } else { - palette[use_clip_palette][j] = TRANSPARENT; + palette[use_clip_palette][j] = X11OSD_TRANSPARENT; } } max_palette_colour[use_clip_palette] = overlay->rle[i].color; } - if(palette[use_clip_palette][overlay->rle[i].color] != TRANSPARENT) { + if(palette[use_clip_palette][overlay->rle[i].color] != X11OSD_TRANSPARENT) { XSetForeground(osd->display, osd->gc, palette[use_clip_palette][overlay->rle[i].color]); XFillRectangle(osd->display, osd->bitmap, osd->gc, overlay->x + x, overlay->y + y, width, 1); if(osd->mode==X11OSD_SHAPED) |