Commit 87dcebb9 authored by Rocky Bernstein's avatar Rocky Bernstein
Browse files

Allow extended data in customized formats too.

parent 28e2ca98
...@@ -667,6 +667,14 @@ CDDAFormatStr(const input_thread_t *p_input, cdda_data_t *p_cdda, ...@@ -667,6 +667,14 @@ CDDAFormatStr(const input_thread_t *p_input, cdda_data_t *p_cdda,
add_format_str_info(t->artist); add_format_str_info(t->artist);
} else goto not_special; } else goto not_special;
break; 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 #endif
case 'M': case 'M':
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* cddax.c : CD digital audio input module for vlc using libcdio * cddax.c : CD digital audio input module for vlc using libcdio
***************************************************************************** *****************************************************************************
* Copyright (C) 2000,2003 VideoLAN * Copyright (C) 2000,2003 VideoLAN
* $Id: cdda.c,v 1.18 2004/02/14 17:36:05 gbazin Exp $ * $Id$
* *
* Authors: Rocky Bernstein <rocky@panix.com> * Authors: Rocky Bernstein <rocky@panix.com>
* Laurent Aimar <fenrir@via.ecp.fr> * Laurent Aimar <fenrir@via.ecp.fr>
...@@ -73,9 +73,10 @@ int E_(CDDBEnabledCB)( vlc_object_t *p_this, const char *psz_name, ...@@ -73,9 +73,10 @@ int E_(CDDBEnabledCB)( vlc_object_t *p_this, const char *psz_name,
#define CDDB_TITLE_FMT_LONGTEXT N_( \ #define CDDB_TITLE_FMT_LONGTEXT N_( \
"Format used in the GUI Playlist Title. Similar to the Unix date \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" \ "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" \ " %A : The album information\n" \
" %C : Category\n" \ " %C : Category\n" \
" %e : The extended data (for a track)\n" \
" %I : CDDB disk ID\n" \ " %I : CDDB disk ID\n" \
" %G : Genre\n" \ " %G : Genre\n" \
" %M : The current MRL\n" \ " %M : The current MRL\n" \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment