From 87dcebb93801e6712a37cbc55211079f585c36ec Mon Sep 17 00:00:00 2001 From: Rocky Bernstein Date: Sun, 14 Mar 2004 23:42:41 +0000 Subject: [PATCH] Allow extended data in customized formats too. --- modules/access/cdda/access.c | 8 ++++++++ modules/access/cdda/cdda.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c index 4b4ba60b8c..fa573c7acc 100644 --- a/modules/access/cdda/access.c +++ b/modules/access/cdda/access.c @@ -667,6 +667,14 @@ CDDAFormatStr(const input_thread_t *p_input, cdda_data_t *p_cdda, add_format_str_info(t->artist); } else goto not_special; break; + case 'e': + if (p_cdda->i_cddb_enabled) { + cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc, + i_track-1); + if (t != NULL && t->ext_data != NULL) + add_format_str_info(t->ext_data); + } else goto not_special; + break; #endif case 'M': diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c index 7f0dbc8cb6..f747ee528f 100644 --- a/modules/access/cdda/cdda.c +++ b/modules/access/cdda/cdda.c @@ -2,7 +2,7 @@ * cddax.c : CD digital audio input module for vlc using libcdio ***************************************************************************** * Copyright (C) 2000,2003 VideoLAN - * $Id: cdda.c,v 1.18 2004/02/14 17:36:05 gbazin Exp $ + * $Id$ * * Authors: Rocky Bernstein * Laurent Aimar @@ -73,9 +73,10 @@ int E_(CDDBEnabledCB)( vlc_object_t *p_this, const char *psz_name, #define CDDB_TITLE_FMT_LONGTEXT N_( \ "Format used in the GUI Playlist Title. Similar to the Unix date \n" \ "Format specifiers that start with a percent sign. Specifiers are: \n" \ -" %a : The artist\n" \ +" %a : The artist (for the album)\n" \ " %A : The album information\n" \ " %C : Category\n" \ +" %e : The extended data (for a track)\n" \ " %I : CDDB disk ID\n" \ " %G : Genre\n" \ " %M : The current MRL\n" \ -- 2.39.2