Fixed setup.py to create bundle memorize instad of memosono.

Cleaned the csound instrument and changed sndplayer accordingly.

5 files changed, 7 insertions, 73 deletions

diff --git a/csound/univorc.csd b/csound/univorc.csd
index 3851ca3..639aa27 100644
--- a/csound/univorc.csd
+++ b/csound/univorc.csd
@@ -7,12 +7,8 @@ sr=22050
 ksmps=100
 nchnls=2
 
-gaudp1  init 0
-gaudp2  init 0
-
-
 /**************************************************************************
- General Soundfile Player - Used by Memosono
+ General Soundfile Player - Used by Memorize Activity
 **************************************************************************/
 
 instr 108
@@ -20,13 +16,11 @@ instr 108
   p4 : filename
   p5 : unique instance ID
   p6 : output gain (0-1)
-  p7 : udp send gain (0-1)
-  p8 : offset in seconds
+  p7 : offset in seconds
 
   channels:
   sfplay.<ID>.on  - instance control channel (1:on 0: off)
   sfplay.<ID>.gain - soundfile play gain (0-1)
-  sfplay.<ID>.udpgain - udp send gain (0-1)
   sfplay.<ID>.flen  - holds the channel length
 */
 S1 strget p4
@@ -47,11 +41,9 @@ endif
 Splay sprintf "sfplay.%d.on", inst  ; instance control channel
 Sname sprintf "sfplay.%d.fname", inst  ; filename channel
 Sgain sprintf "sfplay.%d.gain", inst ; gain channel
-Sudp  sprintf "sfplay.%d.udpgain", inst ; udp gain channel  
 chnset S1, Sname
 chnset 1,  Splay
 chnset p6, Sgain
-chnset p7, Sudp
 event_i "i",109,0,iln,inst,ich,ioffset
 turnoff
 endin
@@ -68,10 +60,8 @@ ioffset = p6
 Splay sprintf "sfplay.%d.on", inst  ; instance control channel
 Sname sprintf "sfplay.%d.fname", inst  ; filename channel
 Sgain sprintf "sfplay.%d.gain", inst ; gain channel
-Sudp  sprintf "sfplay.%d.udpgain", inst ; udp gain channel   
 kon chnget Splay
 kg1 chnget Sgain
-kg2 chnget Sudp
 S1  chnget Sname
 if kon == 0 then
 printf "sfplay:%d OFF\n", 1, inst
@@ -84,14 +74,9 @@ else
 a1,a2 diskin2 S1,1,ioffset,1
 endif
      outs a1*kg1, a2*kg1
-gaudp1 = a1*kg2 + gaudp1
-gaudp2 = a2*kg2 + gaudp2
 printf_i "sfplay:%d\n", 1, inst
 endin
 
-
-
-
 </CsInstruments>
 <CsScore>
 f0 600000
diff --git a/game.py b/game.py
index a07b428..ad25dcb 100755
--- a/game.py
+++ b/game.py
@@ -148,7 +148,7 @@ class MemorizeGame(gobject.GObject):
             if snd == None:
                 _logger.debug('Audio: no sound in this game.')
             else:
-                self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0.5 0'%(snd))                
+                self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0.1'%(snd))                
                 _logger.debug('Audio: play sound=%s'%snd)
                 
         # First card case
diff --git a/games/drumgit/drumgit.mem b/games/drumgit/drumgit.mem
index a563341..42db853 100644
--- a/games/drumgit/drumgit.mem
+++ b/games/drumgit/drumgit.mem
@@ -17,9 +17,9 @@
  <pair aimg="guitar4_2.jpg" asnd="flashcomp2b.aiff" bimg="guitar4_2.jpg" bsnd="flashcomp2b.aiff" color="100" />
 
  <pair aimg="guitar5_2.jpg" asnd="gedaempft.aiff" bimg="guitar5_2.jpg" bsnd="gedaempft.aiff" color="100" />
- <pair aimg="guitar6_2.jpg" asnd="gedaempft.aiff" bimg="guitar6_2.jpg" bsnd="gedaempft.aiff" color="100" />
- <pair aimg="guitar7_2.jpg" asnd="ungedaempft.aiff" bimg="guitar7_2.jpg" bsnd="ungedaempft.aiff" color="100" />
- <pair aimg="guitar8_2.jpg" asnd="jimi4.aiff" bimg="guitar8_2.jpg" bsnd="jimi4.aiff" color="100" />
+ <pair aimg="guitar6_2.jpg" asnd="ungedaempft.aiff" bimg="guitar6_2.jpg" bsnd="ungedaempft.aiff" color="100" />
+ <pair aimg="guitar7_2.jpg" asnd="jimi4.aiff" bimg="guitar7_2.jpg" bsnd="jimi4.aiff" color="100" />
+ <pair aimg="guitar8_2.jpg" asnd="git_hit1.aiff" bimg="guitar8_2.jpg" bsnd="git_hit1.aiff" color="100" />
 
 </memorize>
 
diff --git a/games/drumgit/drumgit.mson b/games/drumgit/drumgit.mson
deleted file mode 100644
index bd5a9a4..0000000
--- a/games/drumgit/drumgit.mson
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<memosono name="drumgit">
- <pair aimg="drumkit1_b.jpg" asnd="beat1_a.aiff" bimg="drumkit1_b.jpg" bsnd="beat1_a.aiff" color="100" />
- <pair aimg="drumkit2_b.jpg" asnd="beat1_b.aiff" bimg="drumkit2_b.jpg" bsnd="beat1_b.aiff" color="100" />
- <pair aimg="drumkit3_b.jpg" asnd="beat1_c.aiff" bimg="drumkit3_b.jpg" bsnd="beat1_c.aiff" color="100" />
- <pair aimg="drumkit4_b.jpg" asnd="beat8.aiff" bimg="drumkit4_b.jpg" bsnd="beat8.aiff" color="100" />
-
- <pair aimg="drumkit6_b.jpg" asnd="beat3.aiff" bimg="drumkit6_b.jpg" bsnd="beat3.aiff" color="100" />
- <pair aimg="drumkit7_b.jpg" asnd="beat4.aiff" bimg="drumkit7_b.jpg" bsnd="beat4.aiff" color="100" />
- <pair aimg="drumkit8_b.jpg" asnd="beat14.aiff" bimg="drumkit8_b.jpg" bsnd="beat14.aiff" color="100" />
- <pair aimg="drumkit9_b.jpg" asnd="beat6_2.aiff" bimg="drumkit9_b.jpg" bsnd="beat6_2.aiff" color="100" />
-
- <pair aimg="guitar1_2.jpg" asnd="bending_a.aiff" bimg="guitar1_2.jpg" bsnd="bending_a.aiff" color="100" />
- <pair aimg="guitar2_2.jpg" asnd="bending_b.aiff" bimg="guitar2_2.jpg" bsnd="bending_b.aiff" color="100" />
- <pair aimg="guitar3_2.jpg" asnd="flashcomp2a.aiff" bimg="guitar3_2.jpg" bsnd="flashcomp2a.aiff" color="100" />
- <pair aimg="guitar4_2.jpg" asnd="flashcomp2b.aiff" bimg="guitar4_2.jpg" bsnd="flashcomp2b.aiff" color="100" />
-
- <pair aimg="guitar5_2.jpg" asnd="gedaempft.aiff" bimg="guitar5_2.jpg" bsnd="gedaempft.aiff" color="100" />
- <pair aimg="guitar6_2.jpg" asnd="ungedaempft.aiff" bimg="guitar6_2.jpg" bsnd="ungedaempft.aiff" color="100" />
- <pair aimg="guitar7_2.jpg" asnd="git_hit1.aiff" bimg="guitar7_2.jpg" bsnd="git_hit1.aiff" color="100" />
- <pair aimg="guitar8_2.jpg" asnd="jimi4.aiff" bimg="guitar8_2.jpg" bsnd="jimi4.aiff" color="100" />
-
-</memosono>
-
-<!--
- <pair aimg="" asnd="" bimg="" bsnd="" color="100" />
-drumkit1_b.jpg beat1_a.aiff 
-drumkit2_b.jpg beat1_b.aiff  
-drumkit3_b.jpg beat1_c.aiff  
-drumkit4_b.jpg beat8.aiff  
-drumkit5_b.jpg beat2.aiff  
-drumkit6_b.jpg beat3.aiff   
-drumkit7_b.jpg beat4.aiff   
-drumkit8_b.jpg beat14.aiff    
-drumkit9_b.jpg beat6_2.aiff    
-drumkit10_b.jpg beat16.aiff   
-drumkit11_b.jpg beat17.aiff    
-drumkit12_b.jpg beat10.aiff      
-guitar1_2.jpg bending_a.aiff 
-guitar2_2.jpg bending_b.aiff 
-guitar3_2.jpg flashcomp2a.aiff 
-guitar4_2.jpg flashcomp2b.aiff  
-guitar5_2.jpg gedaempft.aiff 
-guitar6_2.jpg ungedaempft.aiff
-guitar7_2.jpg jimi4.aiff 
-guitar8_2.jpg git_hit1.aiff 
-guitar9_2.jpg git_hit4.aiff 
-guitar10_2.jpg guitcello.aiff 
-guitar11_2.jpg flasholet4.aiff 
-guitar12_2.jpg jimi1.aiff 
--->
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 98cfe83..6d18075 100755
--- a/setup.py
+++ b/setup.py
@@ -18,4 +18,4 @@
 
 from sugar.activity import bundlebuilder
 
-bundlebuilder.start('Memosono')
+bundlebuilder.start('Memorize')