RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 15:34:31 +00:00
Code Issues Releases Wiki Activity

command: always show OSD message when changing volume etc.

Browse Source 
If there's a command that uses the OSD by default, then always print the
associated message (or a fallback made of name + value), even if the
command has an associated OSD bar.

This means volume, gamma, panscan, etc. all show both a message and a
OSD bar.

Also, add a '%' to the volume message. The extra_msg thing is not needed
anymore.

See issue #1103.
This commit is contained in:
wm4 2014-09-21 15:55:22 +02:00
parent 58db0a55f3
commit a0cee03394
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
player/command.c
View File

@ -3012,8 +3012,6 @@ static const struct property_osd_display {
int seek_msg, seek_bar; int seek_msg, seek_bar;
// Free-form message (if NULL, osd_name or the property name is used) // Free-form message (if NULL, osd_name or the property name is used)
const char *msg; const char *msg;
// Extra free-form message (just for volume)
const char *extra_msg;
} property_osd_display[] = { } property_osd_display[] = {
// general // general
{ "loop", "Loop" }, { "loop", "Loop" },
@ -3026,7 +3024,8 @@ static const struct property_osd_display {
{ "clock", "Clock" }, { "clock", "Clock" },
// audio // audio
{ "volume", "Volume", { "volume", "Volume",
.extra_msg = "${?mute==yes:(Muted)}", .osd_progbar = OSD_VOLUME }, .msg = "Volume: ${volume} % ${?mute==yes:(Muted)}",
.osd_progbar = OSD_VOLUME },
{ "mute", "Mute" }, { "mute", "Mute" },
{ "audio-delay", "A-V delay" }, { "audio-delay", "A-V delay" },
{ "audio", "Audio" }, { "audio", "Audio" },
@ -3081,7 +3080,6 @@ static void show_property_osd(MPContext *mpctx, const char *pname, int osd_mode)
int osd_progbar = 0; int osd_progbar = 0;
const char *osd_name = NULL; const char *osd_name = NULL;
const char *msg = NULL; const char *msg = NULL;
const char *extra_msg = NULL;
// look for the command // look for the command
for (p = property_osd_display; p->name; p++) { for (p = property_osd_display; p->name; p++) {
@ -3094,17 +3092,14 @@ static void show_property_osd(MPContext *mpctx, const char *pname, int osd_mode)
if (!p->name) if (!p->name)
p = NULL; p = NULL;
if (p) { if (p)
msg = p->msg; msg = p->msg;
extra_msg = p->extra_msg;
}
if (osd_mode != MP_ON_OSD_AUTO) { if (osd_mode != MP_ON_OSD_AUTO) {
osd_name = osd_name ? osd_name : name; osd_name = osd_name ? osd_name : name;
if (!(osd_mode & MP_ON_OSD_MSG)) { if (!(osd_mode & MP_ON_OSD_MSG)) {
osd_name = NULL; osd_name = NULL;
msg = NULL; msg = NULL;
extra_msg = NULL;
} }
osd_progbar = osd_progbar ? osd_progbar : ' '; osd_progbar = osd_progbar ? osd_progbar : ' ';
if (!(osd_mode & MP_ON_OSD_BAR)) if (!(osd_mode & MP_ON_OSD_BAR))
@ -3141,18 +3136,11 @@ static void show_property_osd(MPContext *mpctx, const char *pname, int osd_mode)
if (ok) if (ok)
set_osd_bar(mpctx, osd_progbar, osd_name, prop.min, prop.max, n, f); set_osd_bar(mpctx, osd_progbar, osd_name, prop.min, prop.max, n, f);
} }
if (ok && osd_mode == MP_ON_OSD_AUTO && opts->osd_bar_visible)
msg = NULL;
} }
char *osd_msg = NULL; char *osd_msg = NULL;
if (msg) if (msg)
osd_msg = talloc_steal(tmp, mp_property_expand_string(mpctx, msg)); osd_msg = talloc_steal(tmp, mp_property_expand_string(mpctx, msg));
if (extra_msg) {
char *t = talloc_steal(tmp, mp_property_expand_string(mpctx, extra_msg));
osd_msg = talloc_asprintf(tmp, "%s%s%s", osd_msg ? osd_msg : "",
osd_msg && osd_msg[0] ? " " : "", t);
}
if (osd_msg && osd_msg[0]) if (osd_msg && osd_msg[0])
set_osd_msg(mpctx, 1, opts->osd_duration, "%s", osd_msg); set_osd_msg(mpctx, 1, opts->osd_duration, "%s", osd_msg);