+
+/* Adds a string-valued entry to the stream and media information if
+ the string is not null or the null string.
+ */
+#define add_cddb_info_str(CATEGORY, TITLE, FIELD) \
+ if (FIELD && strlen(FIELD)) { \
+ input_Control( p_cdda->p_input, INPUT_ADD_INFO, CATEGORY, \
+ _(TITLE), "%s", FIELD ); \
+ }
+
+/* Adds a numeric-valued entry to the stream and media information */
+#define add_cddb_info_val(CATEGORY, TITLE, FMT, FIELD) \
+ if (FIELD) { \
+ input_Control( p_cdda->p_input, INPUT_ADD_INFO, CATEGORY, \
+ _(TITLE), FMT, FIELD ); \
+ }
+
+#define add_cddb_disc_info_str(TITLE, FIELD) \
+ add_cddb_info_str("Disc", TITLE, p_cdda->cddb.disc->FIELD)
+
+#define add_cddb_disc_info_val(TITLE, FMT, FIELD) \
+ add_cddb_info_val("Disc", TITLE, FMT, p_cdda->cddb.disc->FIELD)
+
+/*#if UPDATE_TRACK_INFORMATION_FINISHED*/
+#if 1