From 6beb9557d7cda7379d8e2b67e236a802b8a18886 Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-05-28-21.localdomain>
Date: Thu, 14 Feb 2008 09:11:42 +0000
Subject: network

---
(limited to 'TamTamJam.activity')

diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index 8794a38..9029265 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -1141,7 +1141,6 @@ class JamMain(gtk.EventBox):
 
         self.updateSync()
 
-
     def _setBeat( self, beat ):
         curTick = self.csnd.loopGetTick( self.heartbeatLoop ) % self.syncTicks
         curBeat = int(curTick) // Config.TICKS_PER_BEAT
@@ -1165,23 +1164,6 @@ class JamMain(gtk.EventBox):
         self.playbackToolbar.updateBeatWheel( self.curBeat )
         return True
 
-    def anextHeartbeat( self ):
-        delta = time.time() - self.heartbeatStart
-        return self.beatDuration - (delta % self.beatDuration)
-
-    def anextHeartbeatInTicks( self ):
-        delta = time.time() - self.heartbeatStart
-        next = self.beatDuration - (delta % self.beatDuration)
-        return self.ticksPerSecond*next
-
-    def aheartbeatElapsed( self ):
-        delta = time.time() - self.heartbeatStart
-        return delta % self.beatDuration
-
-    def aheartbeatElapsedTicks( self ):
-        delta = time.time() - self.heartbeatStart
-        return self.ticksPerSecond*(delta % self.beatDuration)
-    
     def correctedHeartbeat( self ):
         elapsedTicks = (time.time() - self.heartbeatStart)*self.ticksPerSecond
         return (elapsedTicks + self.offsetTicks) % (self.syncTicks*HEARTBEAT_BUFFER)
@@ -1213,7 +1195,7 @@ class JamMain(gtk.EventBox):
 
         #print "correctSync", curTick, corTick, err, maxTick, self.offsetTicks
 
-        if abs(err) > 10*Config.TICKS_PER_BEAT: # we're way off
+        if abs(err) > 4*Config.TICKS_PER_BEAT: # we're way off
             for id in self.desktop.getLoopIds() + [ self.heartbeatLoop ]:
                 tick = self.csnd.loopGetTick( id )
                 maxTick = self.csnd.loopGetNumTicks( id )
diff --git a/TamTamJam.activity/icons/beats.svg b/TamTamJam.activity/icons/beats.svg
new file mode 100755
index 0000000..b1592b5
--- /dev/null
+++ b/TamTamJam.activity/icons/beats.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<g>
+	
+		<line fill="#808284" stroke="#888B8C" stroke-width="10" stroke-linecap="round" x1="26.969" y1="17.141" x2="26.969" y2="37.141"/>
+</g>
+</svg>
diff --git a/TamTamJam.activity/icons/mute.svg b/TamTamJam.activity/icons/mute.svg
new file mode 100755
index 0000000..425b205
--- /dev/null
+++ b/TamTamJam.activity/icons/mute.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.592" r="18.677"/>
+<g>
+	<polygon fill="#FFFFFF" points="20.527,28.386 34.246,20.471 34.258,36.268 	"/>
+	<rect x="20.083" y="22.354" fill="#FFFFFF" width="6" height="12"/>
+</g>
+<line fill="none" x1="15.312" y1="19" x2="39.562" y2="38.938"/>
+<line fill="none" stroke="#4C4D4F" stroke-width="4" x1="39.062" y1="13.375" x2="15.562" y2="42.062"/>
+</svg>
--
cgit v0.9.1