From ab64fa187f7df94a3242982722d1cd05242446c7 Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <waker@users.sourceforge.net>
Date: Thu, 19 Jun 2014 21:52:01 +0200
Subject: gtkui, playlist: disable custom title in both "add location" and
 playlist context menu, until new title formatting is finished

---
 playlist.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'playlist.c')

diff --git a/playlist.c b/playlist.c
index 16f0e6a1..d3d3a6be 100644
--- a/playlist.c
+++ b/playlist.c
@@ -62,6 +62,9 @@
 #include "volume.h"
 #include "pltmeta.h"
 
+// disable custom title function, until we have new title formatting (0.7)
+#define DISABLE_CUSTOM_TITLE
+
 #define DISABLE_LOCKING 0
 #define DEBUG_LOCKING 0
 #define DETECT_PL_LOCK_RC 0
@@ -2906,11 +2909,18 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s,
             }
             else if (*fmt == 'a') {
                 meta = pl_find_meta_raw (it, "artist");
+#ifndef DISABLE_CUSTOM_TITLE
                 const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
-                if (!meta && !custom) {
+#endif
+                if (!meta
+#ifndef DISABLE_CUSTOM_TITLE
+                && !custom
+#endif
+                ) {
                     meta = "Unknown artist";
                 }
 
+#ifndef DISABLE_CUSTOM_TITLE
                 if (custom) {
                     if (!meta) {
                         meta = custom;
@@ -2922,6 +2932,7 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s,
                         meta = out;
                     }
                 }
+#endif
             }
             else if (*fmt == 't') {
                 meta = pl_find_meta_raw (it, "title");
@@ -2970,6 +2981,7 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s,
                     }
                 }
 
+#ifndef DISABLE_CUSTOM_TITLE
                 const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
                 if (custom) {
                     if (!meta) {
@@ -2982,6 +2994,7 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s,
                         meta = out;
                     }
                 }
+#endif
             }
             else if (*fmt == 'C') {
                 meta = pl_find_meta_raw (it, "composer");
-- 
cgit v1.2.3