summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2010-05-26 11:53:13 +0000
committerphintuka <phintuka>2010-05-26 11:53:13 +0000
commit23a6a8c4eafc284f03e6551c7d2a8be4fad03bd7 (patch)
treeac27f71204df782cf1aa3445a1774bee02e0e529
parentb0b0efc6bce254c9c572dc300af0bd0d93ebd4dc (diff)
downloadxineliboutput-23a6a8c4eafc284f03e6551c7d2a8be4fad03bd7.tar.gz
xineliboutput-23a6a8c4eafc284f03e6551c7d2a8be4fad03bd7.tar.bz2
Added opengl options for HUD OSD
(Thanks to grueni75, patch #2978033)
-rw-r--r--config.c6
-rw-r--r--config.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/config.c b/config.c
index 2410ee07..0f1a3f58 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c,v 1.90 2010-05-21 12:44:22 phintuka Exp $
+ * $Id: config.c,v 1.91 2010-05-26 11:53:13 phintuka Exp $
*
*/
@@ -569,6 +569,8 @@ config_t::config_t() {
osd_scaling = OSD_SCALING_NEAREST;
osd_spu_scaling = OSD_SCALING_NEAREST;
hud_osd = 0;
+ opengl_always = 0;
+ opengl_hud = 0;
osd_blending = OSD_BLENDING_SOFTWARE;
osd_blending_lowresvideo = OSD_BLENDING_HARDWARE;
@@ -792,6 +794,8 @@ bool config_t::SetupParse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "X11.WindowHeight")) height = atoi(Value);
else if (!strcasecmp(Name, "X11.UseKeyboard")) use_x_keyboard = atoi(Value);
else if (!strcasecmp(Name, "X11.HUDOSD")) hud_osd = atoi(Value);
+ else if (!strcasecmp(Name, "X11.OpenglAlways")) opengl_always = atoi(Value);
+ else if (!strcasecmp(Name, "X11.OpenglHUDOSD")) opengl_hud = atoi(Value);
else if (!strcasecmp(Name, "Audio.Driver")) STRN0CPY(audio_driver, Value);
else if (!strcasecmp(Name, "Audio.Port")) STRN0CPY(audio_port, Value);
diff --git a/config.h b/config.h
index 8b1d0ae9..9ce59fdd 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h,v 1.69 2010-03-12 23:00:26 phintuka Exp $
+ * $Id: config.h,v 1.70 2010-05-26 11:53:13 phintuka Exp $
*
*/
@@ -311,6 +311,8 @@ class config_t {
int osd_scaling; // OSD scaling mode: off, nearest, bilinear
int osd_spu_scaling; // SPU OSD scaling mode: off, nearest, bilinear
int hud_osd; // head up display OSD
+ int opengl_always; // use opengl acceleration for video and HUD OSD
+ int opengl_hud; // use opengl acceleration for HUD OSD only
int osd_blending; // OSD blending method
int osd_blending_lowresvideo; // Use hardware blending for low-resolution video
int alpha_correction;