RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

x11: mp_msg conversion for fstype help output

This commit is contained in:
wm4 2013-12-21 20:11:45 +01:00
parent 9428e05b3f
commit 8cd1b33a22
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
player/main.c
View File

@ -211,7 +211,7 @@ static bool handle_help_options(struct MPContext *mpctx)
} }
#if HAVE_X11 #if HAVE_X11
if (opts->vo.fstype_list && strcmp(opts->vo.fstype_list[0], "help") == 0) { if (opts->vo.fstype_list && strcmp(opts->vo.fstype_list[0], "help") == 0) {
fstype_help(); fstype_help(log);
MP_INFO(mpctx, "\n"); MP_INFO(mpctx, "\n");
opt_exit = 1; opt_exit = 1;
} }

15
video/out/x11_common.c
View File

@ -237,16 +237,13 @@ static const struct fstype fstypes[] = {
{0}, {0},
}; };
void fstype_help(void) void fstype_help(struct mp_log *log)
{ {
mp_msg(MSGT_VO, MSGL_INFO, "Available fullscreen layer change modes:\n"); mp_info(log, "Available fullscreen layer change modes:\n");
for (int n = 0; fstypes[n].sym; n++) { for (int n = 0; fstypes[n].sym; n++)
mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", fstypes[n].sym, mp_info(log, " %-15s %s\n", fstypes[n].sym, fstypes[n].help);
fstypes[n].help); mp_info(log,
} "You can also negate the settings with simply putting '-' in the beginning\n");
mp_msg(MSGT_VO, MSGL_INFO,
"You can also negate the settings with simply putting '-' in the beginning");
mp_msg(MSGT_VO, MSGL_INFO, "\n");
} }
static void fstype_dump(struct vo_x11_state *x11) static void fstype_dump(struct vo_x11_state *x11)

3
video/out/x11_common.h
View File

@ -26,6 +26,7 @@
struct vo; struct vo;
struct mp_rect; struct mp_rect;
struct mp_log;
struct vo_x11_state { struct vo_x11_state {
struct mp_log *log; struct mp_log *log;
@ -124,7 +125,7 @@ int vo_x11_init(struct vo *vo);
void vo_x11_uninit(struct vo *vo); void vo_x11_uninit(struct vo *vo);
int vo_x11_check_events(struct vo *vo); int vo_x11_check_events(struct vo *vo);
bool vo_x11_screen_is_composited(struct vo *vo); bool vo_x11_screen_is_composited(struct vo *vo);
void fstype_help(void); void fstype_help(struct mp_log *log);
void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis, void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis,
int x, int y, unsigned int width, int x, int y, unsigned int width,
unsigned int height, int flags, unsigned int height, int flags,