Changeset 855 in ProjectBuilder

Timestamp:

Oct 5, 2009, 2:21:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Also test with CDDB protocol (http being not available today)

File:

• projects/CDDBeditor/bin/CDDBeditor (modified) (5 diffs)

projects/CDDBeditor/bin/CDDBeditor

@@ -170 +170 @@
 my %ce_config;
 $ce_config{"CDDB_HOST"}="freedb.freedb.org";
-$ce_config{"CDDB_PORT"}=80;
+$ce_config{"CDDB_PORT"}=888;
+#$ce_config{"CDDB_PORT"}=80;
 my %ce_cddb_mode;
-$ce_cddb_mode{"0"} = "http";
-$ce_cddb_mode{"1"} = "cddb";
-
-$ce_config{"CDDB_MODE"}=$ce_cddb_mode{"0"};
+$ce_cddb_mode{"0"} = "cddb";
+$ce_cddb_mode{"1"} = "http";
+
+$ce_config{"CDDB_MODE"}=$ce_cddb_mode{"1"};
 $ce_config{"CD_DEVICE"}="/dev/sr0";
 $ce_config{"HTTP_PROXY"}=$ENV{http_proxy} if $ENV{http_proxy};
@@ -193 +194 @@
 my $mode_group;
 my $proxy_entry = undef;
-if ($ce_config{"CDDB_MODE"} eq $ce_cddb_mode{"0"} ) {
-    $mode_group = Newt::HRadiogroup($ce_cddb_mode{"0"}, $ce_cddb_mode{"1"});
+$mode_group = Newt::HRadiogroup($ce_cddb_mode{"0"}, $ce_cddb_mode{"1"});
+if ($ce_config{"CDDB_MODE"} eq "http" ) {
     $proxy_entry = Newt::Entry($width, $flag, $ce_config{"HTTP_PROXY"});
-} else {
-    $mode_group = Newt::HRadiogroup($ce_cddb_mode{"1"}, $ce_cddb_mode{"0"});
 }
 $width = 40;
@@ -214 +213 @@
 my $ce_panel = Newt::Panel(2, 20, "CDDBeditor Configuration");
 my $flage = NEWT_ANCHOR_RIGHT;
-$ce_panel->Add(0, 0, $host_label,$flage);
+$ce_panel->Add(0, 0, $host_label, $flage);
 $flage = NEWT_ANCHOR_LEFT;
 $ce_panel->Add(1, 0, $host_entry, $flage);
 $flage = NEWT_ANCHOR_RIGHT;
-$ce_panel->Add(0, 1, $port_label,$flage);
+$ce_panel->Add(0, 1, $port_label, $flage);
 $flage = NEWT_ANCHOR_LEFT;
 $ce_panel->Add(1, 1, $port_entry, $flage);
 $flage = NEWT_ANCHOR_RIGHT;
-$ce_panel->Add(0, 2, $mode_label,$flage);
+$ce_panel->Add(0, 2, $mode_label, $flage);
 $flage = NEWT_ANCHOR_LEFT;
 $ce_panel->Add(1, 2, $mode_group, $flage);
+if ($ce_config{"CDDB_MODE"} eq "http" ) {
+    $flage = NEWT_ANCHOR_RIGHT;
+    $ce_panel->Add(0, 3, $proxy_label, $flage);
+    $flage = NEWT_ANCHOR_LEFT;
+    $ce_panel->Add(1, 3, $proxy_entry, $flage);
+    }
 $flage = NEWT_ANCHOR_RIGHT;
-$ce_panel->Add(0, 3, $proxy_label,$flage);
-$flage = NEWT_ANCHOR_LEFT;
-$ce_panel->Add(1, 3, $proxy_entry, $flage);
-$flage = NEWT_ANCHOR_RIGHT;
-$ce_panel->Add(0, 4, $dev_label,$flage);
+$ce_panel->Add(0, 4, $dev_label, $flage);
 $flage = NEWT_ANCHOR_LEFT;
 $ce_panel->Add(1, 4, $dev_entry, $flage);
 $flage = NEWT_ANCHOR_RIGHT;
-$ce_panel->Add(0, 5, $user_label,$flage);
+$ce_panel->Add(0, 5, $user_label, $flage);
 $flage = NEWT_ANCHOR_LEFT;
 $ce_panel->Add(1, 5, $user_group, $flage);
@@ -247 +248 @@
 exit 0 if ($data->Tag() eq "Quit");
 
+if ($ce_config{"CDDB_MODE"} eq "http" ) {
+    $ce_config{"HTTP_PROXY"}=$proxy_entry->Get();
+    }
 $ce_config{"CDDB_HOST"}=$host_entry->Get();
 $ce_config{"CDDB_PORT"}=$port_entry->Get();
 $ce_config{"CDDB_MODE"}=$ce_cddb_mode{$mode_group->Get()};
 $ce_config{"CD_DEVICE"}=$dev_entry->Get();
-$ce_config{"HTTP_PROXY"}=$proxy_entry->Get();
 $ce_config{"input"}=$user_group->Get();
+$ce_config{"HELLO_ID"} = "bruno musique-ancienne.org fastrip 0.77";
 
 # Components
@@ -288 +292 @@
     my $artist_entry = Newt::Entry($width, $flag, $ce_cd{artist});
     my $title_entry = Newt::Entry($width, $flag, $ce_cd{title});
+    # http://www.freedb.org/en/faq.3.html
+    # Category list is data, folk, jazz, misc, rock, country, blues, newage, reggae, classical, and soundtrack
     my $category_entry = Newt::Entry($width, $flag, $ce_cd{cat});
     my $genre_entry = Newt::Entry($width, $flag, $ce_cd{genre});