summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2010-05-26 12:10:02 +0000
committerphintuka <phintuka>2010-05-26 12:10:02 +0000
commit24dd8f5bc0e7e09969efab412315ea0cc826aee1 (patch)
tree6c30b8086047a5082aeab781c0ae9b11f8e185fd
parent6352370425a9c6b417892f8b54f0219ce19f0fbd (diff)
downloadxineliboutput-24dd8f5bc0e7e09969efab412315ea0cc826aee1.tar.gz
xineliboutput-24dd8f5bc0e7e09969efab412315ea0cc826aee1.tar.bz2
Added command-line options for opengl HUD OSD
(Thanks to grueni75, patch #2978033)
-rw-r--r--config.c14
-rw-r--r--xine_frontend_main.c18
2 files changed, 30 insertions, 2 deletions
diff --git a/config.c b/config.c
index 0f1a3f58..66797741 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.91 2010-05-26 11:53:13 phintuka Exp $
+ * $Id: config.c,v 1.92 2010-05-26 12:10:02 phintuka Exp $
*
*/
@@ -685,6 +685,8 @@ bool config_t::ProcessArgs(int argc, char *argv[])
static const struct option long_options[] = {
{ "fullscreen", no_argument, NULL, 'f' },
{ "hud", no_argument, NULL, 'D' },
+ { "opengl-always",no_argument, NULL, 'O' },
+ { "opengl-hud", no_argument, NULL, 'Q' },
{ "width", required_argument, NULL, 'w' },
{ "height", required_argument, NULL, 'h' },
//{ "xkeyboard", no_argument, NULL, 'k' },
@@ -714,6 +716,16 @@ bool config_t::ProcessArgs(int argc, char *argv[])
LOGMSG("HUD OSD not supported\n");
#endif
break;
+ case 'O': ProcessArg("OpenglAlways", "1");
+#ifndef HAVE_OPENGL
+ LOGMSG("OpenGL HUD OSD not supported\n");
+#endif
+ break;
+ case 'Q': ProcessArg("OpenglHUDOSD", "1");
+#ifndef HAVE_OPENGL
+ LOGMSG("OpenGL HUD OSD not supported\n");
+#endif
+ break;
case 'w': ProcessArg("Fullscreen", "0");
ProcessArg("X11.WindowWidth", optarg);
break;
diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index c8b4b48c..f475ab69 100644
--- a/xine_frontend_main.c
+++ b/xine_frontend_main.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_frontend_main.c,v 1.87 2010-05-26 11:54:26 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.88 2010-05-26 12:10:02 phintuka Exp $
*
*/
@@ -440,6 +440,8 @@ static const struct option long_options[] = {
{ "fullscreen", no_argument, NULL, 'f' },
{ "geometry", required_argument, NULL, 'g' },
{ "hud", no_argument, NULL, 'D' },
+ { "opengl-always",no_argument, NULL, 'O' },
+ { "opengl-hud", no_argument, NULL, 'Q' },
{ "width", required_argument, NULL, 'w' },
{ "height", required_argument, NULL, 'h' },
{ "buffers", required_argument, NULL, 'B' },
@@ -571,6 +573,20 @@ int main(int argc, char *argv[])
PRINTF("HUD OSD not supported\n");
#endif
break;
+ case 'O': opengl_always=1;
+#ifdef HAVE_OPENGL
+ PRINTF("Using OpenGL to draw video and HUD OSD\n");
+#else
+ PRINTF("OpenGL not supported\n");
+#endif
+ break;
+ case 'Q': opengl_hud=1;
+#ifdef HAVE_OPENGL
+ PRINTF("Using OpenGL to draw HUD OSD\n");
+#else
+ PRINTF("OpenGL not supported\n");
+#endif
+ break;
case 'w': width = atoi(optarg);
PRINTF("Width: %d\n", width);
break;