From 3ad2a67d3f7f063ac6ed5dbeddbe74fe4032b5c7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 26 Mar 2014 16:57:38 +0100
Subject: stream_cdda: print cd text header only if there are any cd text
 fields

---
 stream/stream_cdda.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'stream')

diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 3d13dd0f59..bc9576cd62 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -129,8 +129,8 @@ static bool print_cdtext(stream_t *s, int track)
 #else
     cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
 #endif
+    int header = 0;
     if (text) {
-        MP_INFO(s, "CD-Text (%s):\n", track ? "track" : "CD");
         for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
             const char *name = cdtext_name[i];
 #ifdef OLD_API
@@ -138,8 +138,12 @@ static bool print_cdtext(stream_t *s, int track)
 #else
             const char *value = cdtext_get_const(text, i, track);
 #endif
-            if (name && value)
+            if (name && value) {
+                if (!header)
+                    MP_INFO(s, "CD-Text (%s):\n", track ? "track" : "CD");
+                header = 1;
                 MP_INFO(s, "  %s: '%s'\n", name, value);
+            }
         }
         return true;
     }
-- 
cgit v1.2.3