some improvements

diff --git a/sound/weapons/loopfinder/findloop.c b/sound/weapons/loopfinder/findloop.c
index cbfc43409b94fd7012701ae838371911987dc984..997e11e3b2dd6efc78f05219f0f455465b99bb38 100644 (file)
--- a/sound/weapons/loopfinder/findloop.c
+++ b/sound/weapons/loopfinder/findloop.c
@@ -97,8 +97,8 @@ sf_count_t findMaximum(double (*func) (sf_count_t), sf_count_t x0, sf_count_t xg
                        break;
                //fprintf(stderr, "round:\n");
                sf_count_t bestguess = findMaximumSingle(func, xg, xg2, size / 32 + 1);
                        break;
                //fprintf(stderr, "round:\n");
                sf_count_t bestguess = findMaximumSingle(func, xg, xg2, size / 32 + 1);

-               xg = MAX(xg, bestguess - size / 3);
-               xg2 = MIN(bestguess + size / 3, xg2);
+               xg = MAX(xg0, bestguess - size / 3);
+               xg2 = MIN(bestguess + size / 3, xg20);

        }
 
        fprintf(stderr, "guessed: %d\n", (int)xg);
        }
 
        fprintf(stderr, "guessed: %d\n", (int)xg);

diff --git a/sound/weapons/tuba_loopnote_maker.mid.pl b/sound/weapons/tuba_loopnote_maker.mid.pl
index 5f9a3f311421e033a2e7d60bc6303222d19a273f..1a9e69ad48c211846ea7bd3741633573b39549a7 100644 (file)
--- a/sound/weapons/tuba_loopnote_maker.mid.pl
+++ b/sound/weapons/tuba_loopnote_maker.mid.pl
@@ -11,10 +11,12 @@ my $track = MIDI::Track->new();
 
 $track->new_event('set_tempo', 0, $delta * 1000000);
 $track->new_event('patch_change', 0, 0, $program - 1);
 
 $track->new_event('set_tempo', 0, $delta * 1000000);
 $track->new_event('patch_change', 0, 0, $program - 1);

+my $first = 1;

 for(@notes)
 {
 for(@notes)
 {

-       $track->new_event('note_on', 96, 0, $transpose + $_, $velocity);
+       $track->new_event('note_on', $first ? 0 : 96, 0, $transpose + $_, $velocity);

        $track->new_event('note_off', 96, 0, $transpose + $_, $velocity);
        $track->new_event('note_off', 96, 0, $transpose + $_, $velocity);

+       $first = 0;

 }
 
 my $opus = MIDI::Opus->new({
 }
 
 my $opus = MIDI::Opus->new({

diff --git a/sound/weapons/tuba_loopnote_maker.sh b/sound/weapons/tuba_loopnote_maker.sh
index cd399880f6414405f6a02c6e30a301a2fc59e598..4289b4d06103c64f48895be383d9e4f24839340c 100755 (executable)
--- a/sound/weapons/tuba_loopnote_maker.sh
+++ b/sound/weapons/tuba_loopnote_maker.sh
@@ -23,6 +23,7 @@ loopmax=1.5
 len=1.8
 
 perl tuba_loopnote_maker.mid.pl "$t"/tuba_loopnote_maker.mid $delta $program $velocity $transpose -18 -12 -6 0 6 12 18 24
 len=1.8
 
 perl tuba_loopnote_maker.mid.pl "$t"/tuba_loopnote_maker.mid $delta $program $velocity $transpose -18 -12 -6 0 6 12 18 24

+cp "$t"/tuba_loopnote_maker.mid tuba$tubaid.mid

 
 case "$synth" in
        timidity)
 
 case "$synth" in
        timidity)


@@ -35,7 +36,7 @@ esac
 
 normalize --peak "$t"/out.wav
 
 
 normalize --peak "$t"/out.wav
 

-start=$delta
+start=0

 step=$(($delta*2))
 for note in -18 -12 -6 0 6 12 18 24; do
        sox "$t"/out.wav "$t"/n$note.wav \
 step=$(($delta*2))
 for note in -18 -12 -6 0 6 12 18 24; do
        sox "$t"/out.wav "$t"/n$note.wav \

diff --git a/sound/weapons/tuba_loopnotes.sh b/sound/weapons/tuba_loopnotes.sh
index b007a9c2d16238ff7bb4ffce620fe7fa48fe854e..e3997360592a78f6ffd2d17660b168ba4f9e4c92 100644 (file)
--- a/sound/weapons/tuba_loopnotes.sh
+++ b/sound/weapons/tuba_loopnotes.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # tuba = 59
 #!/bin/sh
 
 # tuba = 59

-sh tuba_loopnote_maker.sh fluidsynth 59 100 48 ""  /usr/share/soundfonts/fluidr3/FluidR3GM.SF2
+sh tuba_loopnote_maker.sh timidity 59 100 48 ""  -EFreverb=G4

 
 # accordeon = 24
 
 # accordeon = 24

-sh tuba_loopnote_maker.sh fluidsynth 24 100 60 "1" /usr/share/soundfonts/fluidr3/FluidR3GM.SF2
+sh tuba_loopnote_maker.sh timidity 24 100 60 "1" -EFreverb=G4