Changeset 1170 in ProjectBuilder

Timestamp:

Jan 30, 2011, 9:41:10 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix some remaining issues with multi CD support

File:

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

projects/CDDBeditor/devel/CDDBeditor/bin/CDDBeditor

@@ -143 +143 @@
 
 Newt::Init();
-my ($ce_sl, $ce_sh) = Newt::GetScreenSize();
 
 # String definitions
@@ -203 +202 @@
 
 my $flag = NEWT_ENTRY_SCROLL;
+my ($ce_sl, $ce_sh) = Newt::GetScreenSize();
 # Need 23 char for track and time
 my $width = $ce_sl - 23;
@@ -297 +297 @@
         @cecd = get_cddb(\%ce_config);
         # by default use first one
-        $ce_cd = @cecd[0] if (defined @cecd[0]);
+        $ce_cd = $cecd[0] if (defined $cecd[0]);
     }
     $firsttime = 0;
@@ -304 +304 @@
     my $ind = 0;
     foreach my $entry (@cecd) {
-        push @vradio,sprintf "%02d (%s - %d tracks) - %s",$ind,$entry->{cat},$entry->{tno},$entry->{title};
+        my $cat = "";
+        my $tno = "";
+        my $title = "";
+        $cat = $entry->{cat} if (defined $entry->{cat});
+        $tno = $entry->{tno} if (defined $entry->{tno});
+        $title = $entry->{title} if (defined $entry->{title});
+        push @vradio,sprintf "%02d (%s - %d tracks) - %s",$ind,$cat,$tno,$title;
         $ind++;
     }
@@ -338 +344 @@
     }
     # Point now to the right CD
-    $ce_cd = @cecd[$ind-1];
+    $ce_cd = $cecd[$ind-1];
 
     if (not defined $ce_cd->{title}) {
@@ -421 +427 @@
     
     # Build interface
+    ($ce_sl, $ce_sh) = Newt::GetScreenSize();
     $ce_panel = Newt::Panel(4, $ce_sh, "CDDB Info");
     $flage = NEWT_ANCHOR_RIGHT;