summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-18 01:21:21 +0200
committerwm4 <wm4@nowhere>2014-08-18 01:21:21 +0200
commiteb2924054ff0c30fa7f414dfdc883c0afb25862e (patch)
tree1b81fc519141d8f518cc933fdbdf5b90655008da
parent0cee4498f12a3db053a08e3ffc084042a904a141 (diff)
downloadmpv-eb2924054ff0c30fa7f414dfdc883c0afb25862e.tar.bz2
mpv-eb2924054ff0c30fa7f414dfdc883c0afb25862e.tar.xz
player: remove unneeded call
print_status() is called at a later point anyway (and before sleeping), so this code has little effect. This code was added in commit a4f7a3df5, and I can't observe any problems with idle mode anymore. Now print_status() is called from a single place only, within osd.c.
-rw-r--r--player/core.h1
-rw-r--r--player/osd.c2
-rw-r--r--player/playloop.c4
3 files changed, 1 insertions, 6 deletions
diff --git a/player/core.h b/player/core.h
index 2530e8acd2..5a81a7288a 100644
--- a/player/core.h
+++ b/player/core.h
@@ -434,7 +434,6 @@ void update_window_title(struct MPContext *mpctx, bool force);
void stream_dump(struct MPContext *mpctx);
// osd.c
-void print_status(struct MPContext *mpctx);
void set_osd_bar(struct MPContext *mpctx, int type, const char* name,
double min, double max, double neutral, double val);
void set_osd_msg(struct MPContext *mpctx, int level, int time,
diff --git a/player/osd.c b/player/osd.c
index 6fba20468e..094e99e5b6 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -146,7 +146,7 @@ static void add_term_osd_bar(struct MPContext *mpctx, char **line, int width)
saddf(line, "%.*s", BSTR_P(parts[4]));
}
-void print_status(struct MPContext *mpctx)
+static void print_status(struct MPContext *mpctx)
{
struct MPOpts *opts = mpctx->opts;
diff --git a/player/playloop.c b/player/playloop.c
index 2ea6c62665..5b4c7c7fab 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -71,10 +71,6 @@ void pause_player(struct MPContext *mpctx)
if (mpctx->video_out)
vo_set_paused(mpctx->video_out, true);
- // Only print status if there's actually a file being played.
- if (mpctx->num_sources)
- print_status(mpctx);
-
end:
mp_notify(mpctx, mpctx->opts->pause ? MPV_EVENT_PAUSE : MPV_EVENT_UNPAUSE, 0);
}