Version 2 changes: Sound files tweaked and a bug fixed

5 files changed, 17 insertions, 9 deletions

diff --git a/FileMixAuto.csd b/FileMixAuto.csd
index 4661512..7448697 100755
--- a/FileMixAuto.csd
+++ b/FileMixAuto.csd
@@ -112,7 +112,7 @@ iamp    tab_i   p1 - 2, 3
 kamp2   =       iamp
         goto skip2
 skip:
-kamp    rspline iamp, 1 - girvol, girrate, girrate
+kamp    rspline iamp - (iamp * girvol), iamp, girrate, girrate
 kamp2   table   kamp * 512, 1
 kamp2   port    kamp2, .01
 skip2:
diff --git a/FileMixAutoReadMe.txt b/FileMixAutoReadMe.txt
index 71a982e..f51d81f 100755
--- a/FileMixAutoReadMe.txt
+++ b/FileMixAutoReadMe.txt
@@ -38,7 +38,7 @@ Sugar. The following versions of Record seem to work well or fairly
 well: v86 with the XO-1.5 and the XO-1 upgraded to Sugar 0.84; and
 v64 with Sugar-on-a-Stick Strawberry (0.84). The XO-1.5 works *best*
 with v78 (strangely named the "Grabar" activity). No current Record
-versions work correctly with Sugar 0.86 and higher (as of 12/2010).
+versions work correctly with Sugar 0.86 and higher (as of 3/2011).
 Please note that Record prior to v74 (except for v61-64) produce ogg
 *speex* files; these files are *not* compatible with FileMixAuto.
 
@@ -48,12 +48,18 @@ practically, however, user sound-files may be loaded from the Journal
 (Sugar 0.84 and later). In this case, only wav and ogg/vorbis formats
 are allowed.
 
+Unfortunately, no other Sugar activity (including TimeLapse,
+ShowNTell, and most importantly, Etoys) produces soundfiles useable
+by FileMixAuto. Either they write files other than Ogg Vorbis or wav,
+are restricted to Sugar 0.82, or their output is inaccessible to the
+Journal and other activities (the case with Etoys).
+
 More advanced users may wish to record their soundfiles on some other
 system, and import their wav or ogg vorbis files into the Journal via
 a USB drive. (Display drive contents in Journal view, and drag your
 file onto the Journal icon.)
 
-Otherwise, advanced users can also run the fine Audacity application
+Otherwise, adventureous users may run the fine Audacity application
 to record and edit. (Happily, none of the limitations of the Record
 activity apply here.) In the Terminal, connected to the web, enter:
   su <Enter>
@@ -119,12 +125,14 @@ These durations are included in Total Duration (below). Positive
 numbers are SECONDS, negative numbers are MINUTES. Range: 0 seconds to
 10 minutes.
 
-1) Total Duration: self-explanatory. All files begin and end at the
+10) Total Duration: self-explanatory. All files begin and end at the
 same time (though they start at different locations within; see below).
-Though the performance will conclude at the time specified, it can
-always be halted sooner by hitting STOP (in which case, of course,
-there is no final fade). When a performance concludes naturally, the
-START button immediately reappears.
+Positive numbers indicate MINUTES, negative numbers are HOURS. 0 = 30
+seconds. Range: 30 seconds to 24 hours. Though the performance will
+conclude at the time specified, it can always be halted sooner by
+hitting STOP (in which case, of course, there is no final fade). When a
+performance concludes naturally, the START button immediately
+reappears.
 
 Note: Every file begins from a different random position each time a
 performance is started.
diff --git a/activity/activity.info b/activity/activity.info
index 09cdde3..2f96420 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,7 +5,7 @@ name = FileMixAuto
 bundle_id = org.laptop.FileMixAuto
 icon = activity-filemixauto
 
-activity_version = 1
+activity_version = 2
 
 host_version = 1
 
diff --git a/soundin.2 b/soundin.2
index 94abfe5..0cd14ce 100755
--- a/soundin.2
+++ b/soundin.2
diff --git a/soundin.4 b/soundin.4
index 9b981c0..3ca9efe 100755
--- a/soundin.4
+++ b/soundin.4