Skip to content

Parse "REM DISCID" and "REM COMPOSER" lines #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cycloctane wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse "REM DISCID" and "REM COMPOSER" lines #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cue_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ Cd *cue_parse_string(const char*);
%type <ival> rem_item
%token <ival> DATE
%token <ival> XXX_GENRE /* parsed in REM but stored in CD-TEXT */
%token <ival> XXX_DISCID
%token <ival> XXX_COMPOSER
%token <ival> REPLAYGAIN_ALBUM_GAIN
%token <ival> REPLAYGAIN_ALBUM_PEAK
%token <ival> REPLAYGAIN_TRACK_GAIN
Expand Down Expand Up @@ -310,6 +312,8 @@ time
rem
: rem_item STRING '\n' { rem_set($1, $2, rem); }
| XXX_GENRE STRING '\n' { cdtext_set($1, $2, cdtext); }
| XXX_DISCID STRING '\n' { cdtext_set($1, $2, cdtext); }
| XXX_COMPOSER STRING '\n' { cdtext_set($1, $2, cdtext); }
;

rem_item
Expand Down
2 changes: 2 additions & 0 deletions cue_scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ REM { BEGIN(REM); /* exclusive rules for special exceptions */ }

<REM>DATE { BEGIN(NAME); yylval.ival = REM_DATE; return DATE; }
<REM>GENRE { BEGIN(NAME); yylval.ival = PTI_GENRE; return XXX_GENRE; }
<REM>DISCID { BEGIN(NAME); yylval.ival = PTI_DISC_ID; return XXX_DISCID; }
<REM>COMPOSER { BEGIN(NAME); yylval.ival = PTI_COMPOSER; return XXX_COMPOSER; }
<REM>REPLAYGAIN_ALBUM_GAIN { BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_ALBUM_GAIN;
return REPLAYGAIN_ALBUM_GAIN; }
<REM>REPLAYGAIN_ALBUM_PEAK { BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_ALBUM_PEAK;
Expand Down
4 changes: 4 additions & 0 deletions t/standard_cue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ static char* cue_test()
mu_assert ("error getting CD total discs", val != NULL);
mu_assert ("error validating CD total discs", strcmp (val, "2") == 0);

val = cdtext_get (PTI_DISC_ID, cdtext);
mu_assert ("error getting CD disc id", val != NULL);
mu_assert ("error validating CD disc id", strcmp (val, "860B640B") == 0);

val = rem_get (REM_COMMENT, rem);
mu_assert ("error getting CD comment", val != NULL);
mu_assert ("error validating CD comment", strcmp (val, "ExactAudioCopy v0.95b4") == 0);
Expand Down