bugfixes and midi2cfg changes from my secret branch

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index f136663b6bb86a7412c512b83a5a7ba76d5b9ac0..b3fe3d4174d2535b6cc78e031b5a799e3dee9d7f 100644 (file)
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -866,7 +866,7 @@ bot common
 bot instance_tuba_red
        include tuba_red
        include common
 bot instance_tuba_red
        include tuba_red
        include common

-       count 8
+       count 16

        init
                cmd movetotarget @places_tuba
                cmd barrier
        init
                cmd movetotarget @places_tuba
                cmd barrier


@@ -875,7 +875,7 @@ bot instance_tuba_red
 bot instance_tuba_blue
        include tuba_blue
        include common
 bot instance_tuba_blue
        include tuba_blue
        include common

-       count 8
+       count 16

        init
                cmd movetotarget @places_tuba
                cmd barrier
        init
                cmd movetotarget @places_tuba
                cmd barrier


@@ -884,7 +884,7 @@ bot instance_tuba_blue
 bot instance_accordeon_red
        include accordeon_red
        include common
 bot instance_accordeon_red
        include accordeon_red
        include common

-       count 8
+       count 16

        init
                cmd movetotarget @places_tuba
                cmd barrier
        init
                cmd movetotarget @places_tuba
                cmd barrier


@@ -893,7 +893,7 @@ bot instance_accordeon_red
 bot instance_accordeon_blue
        include accordeon_blue
        include common
 bot instance_accordeon_blue
        include accordeon_blue
        include common

-       count 8
+       count 16

        init
                cmd movetotarget @places_tuba
                cmd barrier
        init
                cmd movetotarget @places_tuba
                cmd barrier

diff --git a/misc/tools/midi2cfg-ng.pl b/misc/tools/midi2cfg-ng.pl
index 4fe6a0cecb8b47a73a74b4c4f6e48ca8d359bdac..ad06b746807b931b671d7a59cd148cb38f0cd8dc 100755 (executable)
--- a/misc/tools/midi2cfg-ng.pl
+++ b/misc/tools/midi2cfg-ng.pl
@@ -857,7 +857,7 @@ sub ConvertMIDI($$)
                                        my $votehigh = 0;
                                        my $votelow = 0;
                                        my $votegood = 0;
                                        my $votehigh = 0;
                                        my $votelow = 0;
                                        my $votegood = 0;

-                                       for(@busybots_allocated)
+                                       for(@busybots_allocated, grep { $_->{count} > 0 } values %$busybots)

                                        {
                                                next # I won't play on this channel
                                                        if defined $_->{channels} and not $_->{channels}->{$channel};
                                        {
                                                next # I won't play on this channel
                                                        if defined $_->{channels} and not $_->{channels}->{$channel};