Version 6 changes: Record Activity compatibility updated

3 files changed, 16 insertions, 14 deletions

diff --git a/FileMixReadMe.txt b/FileMixReadMe.txt
index ad81a7b..a9b949c 100755
--- a/FileMixReadMe.txt
+++ b/FileMixReadMe.txt
@@ -33,13 +33,13 @@ FRANCIS SPRINGS [www.arthunkins.com].)
 The natural vehicle for soundfile creation is the Record activity.
 This activity is fairly simple and straightforward; the only problem
 is that many versions of it do not work with various incarnations of
-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 3/2011).
-Please note that Record prior to v74 (except for v61-64) produce ogg
-*speex* files; these files are *not* compatible with FileMix.
+Sugar. The following pairings of Record with Sugar seem to work
+reliably: v86 with XO-1.5 and XO-1 upgraded to Sugar 0.84, Sugar-on-
+a-Stick Strawberry (0.84) and Blueberry (0.86). Sugar 0.86 and above
+(as of 5/2011) are compatible with Record v90, including XO's
+updated to at least 0.90. Please note that Record prior to v74
+(except for v61-64) produce ogg *speex* files; these files are
+incompatible with FileMix.
 
 Soundfiles must be moved into the folder where this file resides,
 and be renamed soundin.1 through soundin.4. Alternatively, and more
@@ -58,8 +58,8 @@ 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, adventureous users may run the fine Audacity application
-to record and edit. (Happily, none of the limitations of the Record
+Otherwise, adventurous 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>
   yum import audacity <Enter>
@@ -124,3 +124,4 @@ The font display of this activity can be resized in csndsugui.py,
 using any text editor. Further instructions are found toward the
 beginning of csndsugui.py. (Simply change the value of the "resize"
 variable (= 0), plus or minus.)
+
diff --git a/activity/activity.info b/activity/activity.info
index 82f5709..0ca66bb 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,7 +5,7 @@ name = FileMix
 bundle_id = org.laptop.FileMix
 icon = activity-filemix
 
-activity_version = 5
+activity_version = 6
 
 host_version = 1
 
diff --git a/filemix.py b/filemix.py
index 078ad76..c1df77b 100755
--- a/filemix.py
+++ b/filemix.py
@@ -11,8 +11,8 @@
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# version 4  Changes:
-#    ObjectChooser and Sugar-version ID code reworked.
+# version 6  Changes:
+#    Record Activity compatibility updated.
 
 
 import csndsugui
@@ -128,8 +128,8 @@ are ignored.</i> ", all, brown)
      version = [0, 82]
    if version >= [0, 84]:
      win.text("  Optionally, <b>before choosing version above</b>, \
-select your own <b>audio</b> file(s) from\n    Journal. \
-Deselect by closing Journal. Record with Record v64/v78/v86 \
+select your own <b>audio</b> file(s) from\n  the Journal. \
+Deselect by closing Journal. Record with Record v86, v90 \
 or Audacity.", self.b2box, brown)
      win.text("   Load File(s):", self.b2box, brown)
      but5 = win.cbbutton(self.b2box, self.choose1, " 1 ")
@@ -358,3 +358,4 @@ self.r)
    self.but.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0, 0x7700, 0))
 
 
+