RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-06 07:01:45 +00:00
Code Issues Releases Wiki Activity

mplayer: change how pause status is indicated in terminal

Browse Source 
Pausing the player used to print the message "=====  PAUSE  =====". It
also inserted a newline for some reason. When pausing and unpausing a
lot, the terminal would be clobbered with "old" useless status lines.

Remove the pause message, and display the status message instead. This
looks better, doesn't fill up the terminal with crap, and needs less
code.

Side note: when cache is enabled, the status line is reprinted on every
idle iteration to reflect possible cache changes. If the platform's
WAKEUP_PERIOD is very small (like on Windows) and terminal output is
slow (like on Windows), it's possible that this leads to a minor
performance degradation. This is probably not a problem (and I don't
care anyway), but maybe something that should be kept in mind.
Disabling the status line with --quiet will help.
This commit is contained in:
wm4 2012-07-30 21:07:54 +02:00
parent 4f86c0a3a4
commit 7cdfd2ba39
2 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mp_core.h
View File

@ -210,9 +210,6 @@ typedef struct MPContext {
// step this many frames, then pause
int step_frames;
bool status_printed;
int paused_cache_fill;
// Set after showing warning about decoding being too slow for realtime
// playback rate. Used to avoid showing it multiple times.
bool drop_message_shown;

63
mplayer.c
View File

@ -1118,13 +1118,16 @@ static void print_status(struct MPContext *mpctx, double a_pos, bool at_frame)
#endif
line = malloc(width + 1); // one additional char for the terminating null
// Playback position
// Playback status
if (mpctx->paused)
saddf(line, &pos, width, "(PAUSED!) ");
if (mpctx->sh_audio)
saddf(line, &pos, width, "A");
if (mpctx->sh_video)
saddf(line, &pos, width, "V");
saddf(line, &pos, width, ":");
// Playback position
double cur = MP_NOPTS_VALUE;
if (mpctx->sh_audio && a_pos != MP_NOPTS_VALUE) {
cur = a_pos;
@ -1181,8 +1184,6 @@ static void print_status(struct MPContext *mpctx, double a_pos, bool at_frame)
mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s\r", line);
}
free(line);
mpctx->status_printed = true;
}
struct stream_dump_progress {
@ -2712,48 +2713,6 @@ static double update_video(struct MPContext *mpctx)
return frame_time;
}
static int get_cache_fill(struct MPContext *mpctx)
{
#ifdef CONFIG_STREAM_CACHE
if (stream_cache_size > 0)
return cache_fill_status(mpctx->stream);
#endif
return -1;
}
static void update_pause_message(struct MPContext *mpctx)
{
struct MPOpts *opts = &mpctx->opts;
if (opts->quiet)
return;
int cache_fill = get_cache_fill(mpctx);
bool cache_changed = cache_fill != mpctx->paused_cache_fill;
if (!mpctx->status_printed && !cache_changed)
return;
char *msg = mp_gtext(" ===== PAUSE =====");
char *tmpmem = NULL;
if (cache_fill >= 0)
msg = tmpmem = talloc_asprintf(NULL, "%s %d%%", msg, cache_fill);
if (opts->term_osd && !mpctx->sh_video) {
set_osd_msg(OSD_MSG_PAUSE, 1, 0, "%s", msg);
update_osd_msg(mpctx);
} else {
if (mpctx->status_printed)
mp_msg(MSGT_CPLAYER, MSGL_STATUS, "\n");
mp_msg(MSGT_CPLAYER, MSGL_STATUS, "%s\r", msg);
}
mpctx->paused_cache_fill = cache_fill;
mpctx->status_printed = false;
talloc_free(tmpmem);
}
void pause_player(struct MPContext *mpctx)
{
if (mpctx->paused)
@ -2769,9 +2728,7 @@ void pause_player(struct MPContext *mpctx)
if (mpctx->ao && mpctx->sh_audio)
ao_pause(mpctx->ao); // pause audio, keep data if possible
mpctx->paused_cache_fill = get_cache_fill(mpctx);
mpctx->status_printed = true;
update_pause_message(mpctx);
print_status(mpctx, MP_NOPTS_VALUE, false);
if (!mpctx->opts.quiet)
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
@ -3432,8 +3389,13 @@ static void run_playloop(struct MPContext *mpctx)
buffered_audio = mpctx->paused ? 0 : ao_get_delay(mpctx->ao);
update_osd_msg(mpctx);
if (mpctx->paused)
update_pause_message(mpctx);
#ifdef CONFIG_STREAM_CACHE
// The cache status is part of the status line. Possibly update it.
if (mpctx->paused && stream_cache_size > 0)
print_status(mpctx, MP_NOPTS_VALUE, false);
#endif
if (!video_left && (!mpctx->paused || was_restart)) {
double a_pos = 0;
if (mpctx->sh_audio) {
@ -3643,7 +3605,6 @@ int main(int argc, char *argv[])
.set_of_sub_pos = -1,
.file_format = DEMUXER_TYPE_UNKNOWN,
.last_dvb_step = 1,
.paused_cache_fill = -1,
.terminal_osd_text = talloc_strdup(mpctx, ""),
};