Re: [Libcdio-devel] How tolerant to be towards CD-TEXT character set mislabeling ?

[Serge Pouliquen]

Hi,

I made the proposed modifications:

diff --git a/lib/driver/cdtext.c b/lib/driver/cdtext.c
index 868cef5..d8d1c1a 100644
--- a/lib/driver/cdtext.c
+++ b/lib/driver/cdtext.c
@@ -714,10 +714,10 @@ cdtext_data_init(cdtext_t *p_cdtext, uint8_t 
*wdata, size_t i_data)
         switch (blocksize.charcode){
           case CDTEXT_CHARCODE_ISO_8859_1:
             /* default */
-            charset = (char *) "ISO-8859-1";
+            charset = (char *) "CP1252";
             break;
           case CDTEXT_CHARCODE_ASCII:
-            charset = (char *) "ASCII";
+            charset = (char *) "CP1252";
             break;
           case CDTEXT_CHARCODE_SHIFT_JIS:
             charset = (char *) "SHIFT_JIS";


I found one regression, my results are:

media declaring ascii but containing accent (called starmania) : OK 
(displaying correctly accent and no warning about iconv)
media declaring iso-8859-1 with accent : OK
6 medias with only ascii characters : OK

media bulle_bob_plage : KO (a new iconv warning for track 8 title)
  I attached cdrskin output to https://savannah.gnu.org/bugs/?53929
  failing to display for track 8, correct title is    Il va où notre 
chateau ?    (I'm not sure about the space before ?)
  track2 has an error for accent, correct title is    Tiens voilà la pelle
  track7 has an error for accent, correct title is    Douce et salée

cd-info v0.83 is old but still current version for debian stable...

Regards,

Serge