← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vdr-plugin-xineliboutput/trusty-proposed

« back to all changes in this revision

Viewing changes to xine_frontend_main.c

  • Committer: Package Import Robot
  • Author(s): Tobias Grimm
  • Date: 2012-01-29 01:51:20 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20120129015120-4444i6d8eb6awkcz
Tags: 1.0.7+cvs20120130.2334-1
http://bugs.debian.org/657063
http://bugs.debian.org/656732
* New Upstream Snapshot (Closes: #657063, #656732)
* Build-depend on vdr-dev (>= 1.7.23)

Show diffs side-by-side

added added

removed removed

Lines of Context:
xine_frontend_main.c
4
4
 * See the main source file 'xineliboutput.c' for copyright information and
5
5
 * how to reach the author.
6
6
 *
7
 
 * $Id: xine_frontend_main.c,v 1.99 2011/10/28 07:40:32 phintuka Exp $
 
7
 * $Id: xine_frontend_main.c,v 1.101 2012/01/30 10:41:56 phintuka Exp $
8
8
 *
9
9
 */
10
10
 
109
109
    "                                 --aspect=auto:path_to_script\n"
110
110
#ifndef IS_FBFE
111
111
    "   -f, --fullscreen              Fullscreen mode\n"
112
 
# ifdef HAVE_XRENDER
113
 
    "   -D, --hud[=flag[,flag]]       Head Up Display OSD mode using compositing\n"
 
112
# if defined(HAVE_XRENDER) || defined(HAVE_OPENGL)
 
113
    "   -D, --hud[=flag[,flag]]       Head Up Display OSD\n"
114
114
    "                                 Optional flags:\n"
115
 
#  ifdef HAVE_XCOMPOSITE
 
115
# endif
 
116
# ifdef HAVE_XRENDER
 
117
#   ifdef HAVE_XCOMPOSITE
116
118
    "                                 xrender Use XRender instead of compositing\n"
117
119
    "                                         (no compositing manager required)\n"
118
 
#  endif
119
 
#  ifdef HAVE_XSHAPE
 
120
#   endif
 
121
#   ifdef HAVE_XSHAPE
120
122
    "                                 xshape  Use XShape instead of compositing\n"
121
123
    "                                         (no compositing manager required)\n"
122
 
#  endif
123
 
#  ifdef HAVE_OPENGL
 
124
#   endif
 
125
# endif // HAVE_XRENDER
 
126
# ifdef HAVE_OPENGL
124
127
    "                                 opengl  Use OpenGL instead of compositing\n"
125
128
    "                                         (no compositing manager required)\n"
126
 
#  endif
127
 
#  ifdef HAVE_OPENGL
 
129
# endif
 
130
# ifdef HAVE_OPENGL
128
131
    "   -O, --opengl                  Use OpenGL for video and Head Up Display OSD\n"
129
 
#  endif
130
 
# endif // HAVE_XRENDER
 
132
# endif
131
133
    "   -w, --width=x                 Video window width\n"
132
134
    "   -h, --height=x                Video window height\n"
133
135
    "   -g, --geometry=WxH[+X+Y]      Set output window geometry (X style)\n"
359
361
    case 'O':
360
362
# ifdef HAVE_OPENGL
361
363
              opengl = 1;
362
 
              hud |= HUD_OPENGL;
363
 
              PRINTF("Using OpenGL to draw video and HUD OSD\n");
 
364
              PRINTF("Using OpenGL to draw video and OSD\n");
364
365
# else
365
366
              EXIT("OpenGL not supported\n");
366
367
# endif