diff options
| -rwxr-xr-x | City/CsSched.py | 2 | ||||
| -rwxr-xr-x | activity/activity.info | 2 | ||||
| -rw-r--r-- | run.py | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/City/CsSched.py b/City/CsSched.py index 1dc6ab2..d3288dc 100755 --- a/City/CsSched.py +++ b/City/CsSched.py @@ -120,7 +120,7 @@ class CsoundPerformer: self.csound.setScore(orcObj.sco) self.time = 0 if platform == "Sugar": - self.csound.setCommand("csound -b256 -B2048 -+rtaudio=alsa -odac --expression-opt --sched=1 -d -m0 /tmp/tmp.orc /tmp/tmp.sco") + self.csound.setCommand("csound -b256 -B2048 -odac --expression-opt --sched=1 -d -m0 /tmp/tmp.orc /tmp/tmp.sco") else: self.csound.setCommand("csound -b256 -B2048 -odac --expression-opt -d -m0 /tmp/tmp.orc /tmp/tmp.sco") self.csound.exportForPerformance() diff --git a/activity/activity.info b/activity/activity.info index 03553b3..e190964 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Jam2Jam -activity_version = 1 +activity_version = 2 host_version = 1 bundle_id = au.net.acid.Jam2Jam1 icon = activity @@ -127,7 +127,12 @@ class jamScene( object ): panelColour = (0,0,0) self.snap_store = (olpcgames.ACTIVITY.snap_store if platform == 'Sugar' else []) self.feedbackgroundImage = None - self.setbackgroundImage(pygame.image.load(ImagePath + "/jam2jamXO_2.png").convert()) + if self.screenSize == (1200, 780): + self.setbackgroundImage(pygame.image.load(ImagePath + "/jam2jamXO_2.png").convert()) + else: + bgi = pygame.image.load(ImagePath + "/jam2jamXO_2.png").convert() + bgi_scaled = pygame.transform.scale(bgi, self.playArea.size) + self.setbackgroundImage(bgi_scaled) self.panel = pygame.Surface((self.panelArea.width, self.panelArea.height)) self.panel.fill(panelColour) self.screen.blit(self.panel, self.panelArea) |