finish program support

diff --git a/misc/tools/midi2cfg-ng.pl b/misc/tools/midi2cfg-ng.pl
index 8dd6bdf9957b0b5bfbc5e8d943b4425d22441aad..ca6fe9b88d771265b5342f6c42b8ce5efd7cebe0 100755 (executable)
--- a/misc/tools/midi2cfg-ng.pl
+++ b/misc/tools/midi2cfg-ng.pl
@@ -429,8 +429,8 @@ sub busybot_note_on_bot($$$$$$$)
        my ($bot, $time, $channel, $program, $note, $init, $force) = @_;
        return -1 # I won't play on this channel
                if defined $bot->{channels} and not $bot->{channels}->{$channel};
-#      return -1 # I won't play this program
-#              if defined $bot->{programs} and not $bot->{programs}->{$program};
+       return -1 # I won't play this program
+               if defined $bot->{programs} and not $bot->{programs}->{$program};
 
        my ($cmds, $cmds_off, $k0, $k1) = busybot_get_cmds_bot($bot, $channel, $note);
 
@@ -749,7 +749,7 @@ sub ConvertMIDI($$)
                if($_->[0] eq 'note_on')
                {
                        my $chan = $_->[4] + 1;
-                       ++$notes_seen{$chan}{$_->[5]}
+                       ++$notes_seen{$chan}{($programs{$chan} || 1)}{$_->[5]}
                                if $chan != 10 and $chan > 0;
                        if($midinotes{$chan}{$_->[5]})
                        {
@@ -788,41 +788,44 @@ sub ConvertMIDI($$)
                my $good = 0;
                for my $channel(sort keys %notes_seen)
                {
-                       for my $note(sort keys %{$notes_seen{$channel}})
+                       for my $program(sort keys %{$notes_seen{$channel}})
                        {
-                               my $cnt = $notes_seen{$channel}{$note};
-                               my $votehigh = 0;
-                               my $votelow = 0;
-                               my $votegood = 0;
-                               for(@busybots_allocated)
+                               for my $note(sort keys %{$notes_seen{$channel}{$program}})
                                {
-                                       next # I won't play on this channel
-                                               if defined $_->{channels} and not $_->{channels}->{$channel};
-#                                      next # I won't play this program
-#                                              if defined $bot->{programs} and not $bot->{programs}->{$program};
-                                       my $transposed = $note - ($_->{transpose} || 0) - $testtranspose;
-                                       if(exists $_->{notes_on}{$transposed})
+                                       my $cnt = $notes_seen{$channel}{$program}{$note};
+                                       my $votehigh = 0;
+                                       my $votelow = 0;
+                                       my $votegood = 0;
+                                       for(@busybots_allocated)
                                        {
-                                               ++$votegood;
+                                               next # I won't play on this channel
+                                                       if defined $_->{channels} and not $_->{channels}->{$channel};
+                                               next # I won't play this program
+                                                       if defined $_->{programs} and not $_->{programs}->{$program};
+                                               my $transposed = $note - ($_->{transpose} || 0) - $testtranspose;
+                                               if(exists $_->{notes_on}{$transposed})
+                                               {
+                                                       ++$votegood;
+                                               }
+                                               else
+                                               {
+                                                       ++$votehigh if $transposed >= 0;
+                                                       ++$votelow if $transposed < 0;
+                                               }
+                                       }
+                                       if($votegood)
+                                       {
+                                               $good += $cnt;
+                                       }
+                                       elsif($votelow >= $votehigh)
+                                       {
+                                               $toolow += $cnt;
                                        }
                                        else
                                        {
-                                               ++$votehigh if $transposed >= 0;
-                                               ++$votelow if $transposed < 0;
+                                               $toohigh += $cnt;
                                        }
                                }
-                               if($votegood)
-                               {
-                                       $good += $cnt;
-                               }
-                               elsif($votelow >= $votehigh)
-                               {
-                                       $toolow += $cnt;
-                               }
-                               else
-                               {
-                                       $toohigh += $cnt;
-                               }
                        }
                }
                next if !$toohigh != !$toolow;

diff --git a/misc/tools/midi2cfg/stairs-min.sh b/misc/tools/midi2cfg/stairs-min.sh
index 5b034829841d1468ca486e2ac104eaebd2468c8f..dfbfe26fe62e9e6478cc384f40ba354f2255dda2 100755 (executable)
--- a/misc/tools/midi2cfg/stairs-min.sh
+++ b/misc/tools/midi2cfg/stairs-min.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../midi2cfg-ng.pl ../midi2cfg-ng.conf  2 2 2 2 2 2 stairs-min.mid 60 > ~/.xonotic/data/stairs.cfg
+../midi2cfg-ng.pl ../midi2cfg-ng.conf stairs-min.mid 60 > ~/.xonotic/data/stairs.cfg