Changeset 1169 in ProjectBuilder for projects/CDDBeditor

Timestamp:

Jan 30, 2011, 8:13:29 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds support for CD choice in CDDBeditor

File:

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

projects/CDDBeditor/devel/CDDBeditor/bin/CDDBeditor

@@ -169 +169 @@
 my $dev_label = Newt::Label("Device: ");
 my $proxy_label = Newt::Label("Proxy: ");
-my $user_label = Newt::Label("Multi CD: ");
 
 my $wait_label = Newt::Label("Please wait while searching ...");
@@ -188 +187 @@
 $ce_config{"HTTP_PROXY"}=$ENV{http_proxy} if $ENV{http_proxy};
 $ce_config{"input"}=0;
+$ce_config{"multi"}=1;
 $ce_config{"PROTO_VERSION"} = 6;
 $ce_config{"DOMAIN"} = "musique-ancienne.org";
@@ -217 +217 @@
 my $dev_entry = Newt::Entry($width, $flag, $ce_config{"CD_DEVICE"});
 my $user_group;
-if ($ce_config{input} == 0 ) {
-    $user_group = Newt::HRadiogroup('FALSE', 'TRUE');
-} else {
-    $user_group = Newt::HRadiogroup('TRUE', 'FALSE');
-}
 my $quit_button = Newt::Button("Quit");
 $quit_button->Tag("Quit");
@@ -250 +245 @@
 $flage = NEWT_ANCHOR_LEFT;
 $ce_panel->Add(1, 4, $dev_entry, $flage);
-$flage = NEWT_ANCHOR_RIGHT;
-$ce_panel->Add(0, 5, $user_label, $flage);
 $flage = NEWT_ANCHOR_LEFT;
-$ce_panel->Add(1, 5, $user_group, $flage);
 $ce_panel->Add(0, 6, $empty_label);
 $ce_panel->Add(0, 7, $next_button);
@@ -271 +263 @@
 $ce_config{"CDDB_MODE"}=$ce_cddb_mode{$mode_group->Get()};
 $ce_config{"CD_DEVICE"}=$dev_entry->Get();
-$ce_config{"input"}=$user_group->Get();
 
 # Components
@@ -280 +271 @@
 
 my $firsttime = 1;
+my @cecd;
 my $ce_cd;
 my $artist_entry;
@@ -303 +295 @@
     # CDDB query if first time
     if ($firsttime == 1) {
-        my %ce_cd = get_cddb(\%ce_config);
-        $ce_cd = \%ce_cd if (defined %ce_cd);
+        @cecd = get_cddb(\%ce_config);
+        # by default use first one
+        $ce_cd = @cecd[0] if (defined @cecd[0]);
     }
     $firsttime = 0;
 
-    #print Dumper($ce_cd)."\n";
-    #exit 0;
+    my @vradio;
+    my $ind = 0;
+    foreach my $entry (@cecd) {
+        push @vradio,sprintf "%02d (%s - %d tracks) - %s",$ind,$entry->{cat},$entry->{tno},$entry->{title};
+        $ind++;
+    }
+
+    if ($ind gt 1) {
+        # We have multiple entries chose the right one
+        # Second panel for configuration parameters
+        Newt::Cls();
+        Newt::DrawRootText(ce_center_string($ce_title), 1, $ce_title);
+        Newt::PushHelpLine($ce_help);
+        Newt::Refresh();
+
+        my $user_group = Newt::VRadiogroup(@vradio);
+        my $quit_button = Newt::Button("Quit");
+        $quit_button->Tag("Quit");
+        my $next_button = Newt::Button("Next");
+        $next_button->Tag("Next");
+        
+        my $ce_panel = Newt::Panel(2, 20, "CD chooser");
+        $flage = NEWT_ANCHOR_LEFT;
+        $ce_panel->Add(0, 5, $user_group, $flage);
+        $ce_panel->Add(0, 10, $empty_label);
+        $ce_panel->Add(0, 11, $next_button);
+        $ce_panel->Add(1, 11, $quit_button);
+        
+        Newt::Refresh();
+        my ($reason, $data) = $ce_panel->Run();
+
+        Newt::Cls();
+        exit 0 if ($data->Tag() eq "Quit");
+        
+        $ind=$user_group->Get();
+    }
+    # Point now to the right CD
+    $ce_cd = @cecd[$ind-1];
+
     if (not defined $ce_cd->{title}) {
         # Get the disc id first