From: Max Kellermann <max.kellermann@gmail.com>
Date: Mon, 20 Mar 2017 19:34:27 +0000 (+0100)
Subject: screen: move code to paint_top_window()
X-Git-Tag: v0.27~29
X-Git-Url: https://git.tokkee.org/?p=ncmpc.git;a=commitdiff_plain;h=8e421efc742bb6eef670f28064706be8f3021b77

screen: move code to paint_top_window()
---

diff --git a/src/screen.c b/src/screen.c
index 781b68f..1f7b7a6 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -148,9 +148,18 @@ screen_next_mode(struct mpdclient *c, int offset)
 }
 
 static void
-paint_top_window(const char *header, const struct mpdclient *c)
+paint_top_window(const struct mpdclient *c)
 {
-	title_bar_paint(&screen.title_bar, header, c->status);
+	const char *title =
+#ifndef NCMPC_MINI
+		screen.welcome_source_id == 0 &&
+#endif
+		mode_fn->get_title != NULL
+		? mode_fn->get_title(screen.buf, screen.buf_size)
+		: "";
+	assert(title != NULL);
+
+	title_bar_paint(&screen.title_bar, title, c->status);
 }
 
 static void
@@ -249,10 +258,7 @@ welcome_timer_callback(gpointer data)
 
 	screen.welcome_source_id = 0;
 
-	paint_top_window(mode_fn->get_title != NULL
-			 ? mode_fn->get_title(screen.buf, screen.buf_size)
-			 : "",
-			 c);
+	paint_top_window(c);
 	doupdate();
 
 	return false;
@@ -324,15 +330,7 @@ static void
 screen_refresh(struct mpdclient *c, bool main_dirty)
 {
 	/* update title/header window */
-	const char *title =
-#ifndef NCMPC_MINI
-		screen.welcome_source_id == 0 &&
-#endif
-		mode_fn->get_title != NULL
-		? mode_fn->get_title(screen.buf, screen.buf_size)
-		: "";
-	assert(title != NULL);
-	paint_top_window(title, c);
+	paint_top_window(c);
 
 	/* paint the bottom window */