Changeset 2666 in ProjectBuilder

Timestamp:

Feb 17, 2021, 1:44:52 AM (3 years ago)

Author:

Bruno Cornec

Message:

Version 0.6 adds support for CD-TEXT

File:

• projects/CDDBeditor/devel/CDDBeditor/bin/CDDBeditor (modified) (4 diffs)

projects/CDDBeditor/devel/CDDBeditor/bin/CDDBeditor

@@ -27 +27 @@
 use Device::Cdio::Device;
 use Device::Cdio::Track;
+use perlcdio;
 use File::Copy;
 use File::Basename;
@@ -362 +363 @@
         $ind--;
     }
+
     # Point now to the right CD
     $ce_cd = $cecd[$ind];
@@ -412 +414 @@
         my $device = Device::Cdio::Device->new(-source=>$ce_config{"CD_DEVICE"});
         my $track  = $device->get_last_track();
+        my $cd = perlcdio::open_cd(undef,$perlcdio::DRIVER_DEVICE,undef);
+        # Prepare to get info from CD-TEXT if defined
+        my $cdtext = perlcdio::cdio_get_cdtext($cd);
         $ce_cd->{tno} = $track->{track};
         my $n = 0;
 
-        # If they were not found
+        # If they were not found, try to get them from CD-TEXT
+        $ce_cd->{artist} = perlcdio::cdtext_get_const($cdtext,$perlcdio::CDTEXT_FIELD_PERFORMER,$n) if (not defined $ce_cd->{artist});
         $ce_cd->{artist} = "" if (not defined $ce_cd->{artist});
+        my $composer = perlcdio::cdtext_get_const($cdtext,$perlcdio::CDTEXT_FIELD_COMPOSER,$n);
+        $ce_cd->{title} = perlcdio::cdtext_get_const($cdtext,$perlcdio::CDTEXT_FIELD_TITLE,$n) if (not defined $ce_cd->{title});
         $ce_cd->{title} = "" if (not defined $ce_cd->{title});
+        $ce_cd->{title} = $composer.": ".$ce_cd->{title} if ((defined $composer) && ($composer ne ""));
+        $ce_cd->{genre} = perlcdio::cdtext_get_const($cdtext,$perlcdio::CDTEXT_FIELD_GENRE,$n)  if (not defined $ce_cd->{genre});
         $ce_cd->{genre} = "" if (not defined $ce_cd->{genre});
         $ce_cd->{cat} = "" if (not defined $ce_cd->{cat});
@@ -428 +438 @@
             $track->set_track($n+1);
             # Again only if not found previously
-            $ce_cd->{track}[$n] = "" if (not defined $ce_cd->{track}[$n]);
+            if (not defined $ce_cd->{track}[$n]) {
+                # Try to get it from CD-TEXT
+                my $title = perlcdio::cdtext_get_const($cdtext,$perlcdio::CDTEXT_FIELD_TITLE,$n+1);
+                $title = $composer." / ".$title if ((defined $composer) && ($composer ne ""));
+                $ce_cd->{track}[$n] = $title;
+                $ce_cd->{track}[$n] = "" if (not defined $ce_cd->{track}[$n]);
+            }
             my ($m, $s, $f) = split(/:/,$track->get_msf());
             $ce_cd->{frames}[$n] = $f + 75*$s + 75*60*$m;