From: Rocky B. <ro...@us...> - 2003-10-05 10:14:58
|
Update of /cvsroot/xine/xine-vcdnav/input In directory sc8-pr-cvs1:/tmp/cvs-serv9650 Modified Files: xineplug_inp_cd.c Log Message: Pick up MCN if that's around. Index: xineplug_inp_cd.c =================================================================== RCS file: /cvsroot/xine/xine-vcdnav/input/xineplug_inp_cd.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- xineplug_inp_cd.c 1 Oct 2003 04:52:32 -0000 1.37 +++ xineplug_inp_cd.c 5 Oct 2003 10:14:47 -0000 1.38 @@ -17,11 +17,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * Compact Disc Digital Audio (CDDA) Input Plugin - * by Mike Melanson (mel...@pc...) + * Compact Disc Digital Audio (CD-DA) Input Plugin + * by R. Bernstein (ro...@pa...) + * + * Derived from plugin code by by Mike Melanson (mel...@pc...) * * Completely rewritten and more fully completed - * by R. Bernstein (ro...@pa...) * * to use *LIBRARIES* * libcdio - for disc reading and CD control @@ -162,6 +163,7 @@ lsn_t last_frame; /* LSN of last frame of this track */ lsn_t last_disk_frame;/* LSN of last frame on disk */ unsigned int disk_size; /* Size in bytes of disk */ + char * mcn; /* Media Catalog Number */ #ifdef HAVE_CDDB struct { @@ -1104,6 +1106,7 @@ #endif free(this->mrl); + free(this->mcn); free(this); } @@ -1145,6 +1148,7 @@ %I : CDDB disk ID %G : Genre %M : The current MRL + %m : The CD-DA Media Catalog Number (MCN) %T : The track number %t : The name %Y : The year 19xx or 20xx @@ -1217,6 +1221,9 @@ case 'M': add_format_str_info(this->mrl); break; + case 'm': + add_format_str_info(this->mcn); + break; case 'T': add_format_num_info(this->cur_track, "%d"); break; @@ -1390,6 +1397,7 @@ this->disk_size = cdio_get_track_lsn(cdio, CDIO_CDROM_LEADOUT_TRACK) * CDIO_CD_FRAMESIZE_RAW; this->last_disk_frame= cdio_get_track_lsn(cdio, CDIO_CDROM_LEADOUT_TRACK); + this->mcn = cdio_get_mcn(cdio); class->ip = this; this->class = class; @@ -1765,7 +1773,7 @@ class->v_config.comment_format = strdup(x_conf->register_string(x_conf, "cdda.cddb_comment_format", - "MRL %M", + "MRL %M, MCN: %m", _("format for stream comment field (when CDDB info not available)"), _("Format used in the GUI Title. Similar to the Unix date " "command. Format specifiers that start with a percent sign. Specifiers are " @@ -1781,7 +1789,7 @@ _("format string for display banner (when CDDB info available)"), "Format used in the GUI Title. Similar to the Unix date " "command. Format specifiers that start with a percent sign. Specifiers are " - "%a, %A, %C, %G, %I %M, %T, %Y and %%.", + "%a, %A, %C, %G, %I %M, %m, %T, %Y and %%.", 0, cddb_cddb_title_format_changed_cb, (void *) class)); @@ -1789,7 +1797,7 @@ class->v_config.cddb_comment_format = strdup(x_conf->register_string(x_conf, "cdda.cddb_cddb_comment_format", - "MRL %M, Disc Id %I", + "MRL %M, Disc Id %I, MCN: %m", _("format string for stream comment field"), _("Format used in the GUI Title. Similar to the Unix date " "command. Format specifiers that start with a percent sign. Specifiers are " |