patchCompact Disc Input and Control Library - Patches: patch #7670, CD-Text restructuring; Test case;...

 
 

patch #7670: CD-Text restructuring; Test case; Image parser additions

Submitter:  Leon Merten Lohse <greenleon>
Submitted:  Sun 20 Nov 2011 09:37:37 AM UTC
   
 
Category:  libcdio Priority:  5 - Normal
Status:  None Privacy:  Public
Assigned to:  None Open/Closed:  Closed
* Mandatory Fields

Add a New Comment Rich Markup
   

Fri 25 Nov 2011 05:44:36 PM UTC, comment #2: 

Weird it did not create the binary files.

The reason it does not complain about the missing files is that I more or less just copied and adapted a test from check_cue.sh - those test are skipped if a file is missing. grep the `remake test' output for " Don't see binary file ./data/cdtext.bin. Test CD-Text binary parser skipped. "

A few of the shell-script test are skipped, because the files do not exist by the way.

->uploaded cdtext.bin and cdtext.cdt here

Leon Merten Lohse <greenleon>
Group Member
Fri 25 Nov 2011 02:01:18 AM UTC, comment #1: 

Thanks for the hard work. Sorry for the delay in getting to this.

Your patch has now been applied in git without change.

However patch didn't create test/data/cdtext.bin or test/data/cdtext.cdt  And I don't see how this is tested. (I would have expected things to fail or give a message since not all of the files are there.

Rocky Bernstein <rocky>
Group administrator
Sun 20 Nov 2011 09:37:37 AM UTC, original submission:  

I have been working on this for quite a while. It turned out to be rather long. The changes are:
1) cdtext objects are no longer associated with a track but with the disc.
2) - cdio_get_cdtext no longer takes track as an argument
   - cdtext_get, cdtext_get_const, cdtext_set require track argument
3) Language, Genre, Genre Code and Encoding Fields are now properly parsed and stored in the cdtext object
4) Added public function cdio_get_cdtext_raw to extract the binary CD-Text
5) Added CDTEXTFILE keyword logic in cue sheet parser. Parses binary/raw CD-Text files
6) Added cdtext_genre2str to convert genre code
7) altered the example programs, test drivers, cdda-player and cd-info to work with these changes
8) Added test case
9) A few smaller changes

A disc either holds CD-Text for all the tracks or does not hold any. Therefore a CD-Text object for the whole disc seems more natural to me. It also enables us to store global fields, like genre, encoding, language.

I am sorry for the long patch but I had to include two binary files for the test case.

Patch was tested on GNU/Linux 32 bit running Gentoo.

Please let me know, if anything needs some more work.

Kind regards
Leon

Leon Merten Lohse <greenleon>
Group Member

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:
   
   
Comment:
   

Attached Files
file #24489:  cdtext.cdt added by greenleon (810B - application/octet-stream - fixed test file (removed 1 extra byte at the end); please replace in test/data/)
file #24456:  cdtext.bin added by greenleon (646KiB - application/octet-stream - cdt created with CDRWIN. cdtext.bin contains a few seconds of this http://www.freesound.org/people/roubignolle/sounds/34700/)
file #24457:  cdtext.cdt added by greenleon (811B - application/octet-stream - cdt created with CDRWIN. cdtext.bin contains a few seconds of this http://www.freesound.org/people/roubignolle/sounds/34700/)
file #24402:  0001-CD-Text-restructuring.patch added by greenleon (860KiB - text/x-patch - most of it is the binary files for the test case)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by rocky (Posted a comment)
  • -email is unavailable- added by greenleon (Submitted the item)
  •  

    There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

    Only logged-in users can vote.

     

    Follow 5 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2011-11-29 rocky Open/ClosedOpen Closed
    2011-11-28 greenleon Attached File- Added cdtext.cdt, #24489
    2011-11-25 greenleon Attached File- Added cdtext.bin, #24456
        Attached File- Added cdtext.cdt, #24457
    2011-11-20 greenleon Attached File- Added 0001-CD-Text-restructuring.patch, #24402

    Back to the top

    Powered by Savane 3.13-d3ae.
    Corresponding source code