Jam works

10 files changed, 41 insertions, 46 deletions

diff --git a/TamTamJam.activity/Jam/Block.py b/TamTamJam.activity/Jam/Block.py
index f0789fd..83be3f0 100644
--- a/TamTamJam.activity/Jam/Block.py
+++ b/TamTamJam.activity/Jam/Block.py
@@ -5,9 +5,9 @@ import gtk
 
 import random
 
-import Config
+import common.Config as Config
 
-from Util.NoteDB import PARAMETER
+from common.Util.NoteDB import PARAMETER
 
 #::: NOTE:
 # All the graphics resources are loaded in Desktop and referenced here as necessary
diff --git a/TamTamJam.activity/Jam/Desktop.py b/TamTamJam.activity/Jam/Desktop.py
index 7b1acba..68bf14e 100644
--- a/TamTamJam.activity/Jam/Desktop.py
+++ b/TamTamJam.activity/Jam/Desktop.py
@@ -3,7 +3,7 @@ import pygtk
 pygtk.require( '2.0' )
 import gtk
 
-import Config
+import common.Config as Config
 
 from gettext import gettext as _
 
diff --git a/TamTamJam.activity/Jam/Fillin.py b/TamTamJam.activity/Jam/Fillin.py
index 72e2ae3..8588f6d 100644
--- a/TamTamJam.activity/Jam/Fillin.py
+++ b/TamTamJam.activity/Jam/Fillin.py
@@ -4,9 +4,9 @@ import gtk
 import gobject
 
 from RythmGenerator import *
-from Util.CSoundClient import new_csound_client
-from Util.NoteDB import Note
-import Config
+from common.Util.CSoundClient import new_csound_client
+from common.Util.NoteDB import Note
+import common.Config as Config
 
 class Fillin:
     def __init__( self, nbeats, tempo, instrument, reverb, volume ):
diff --git a/TamTamJam.activity/Jam/GenRythm.py b/TamTamJam.activity/Jam/GenRythm.py
index d0e23e3..330e174 100644
--- a/TamTamJam.activity/Jam/GenRythm.py
+++ b/TamTamJam.activity/Jam/GenRythm.py
@@ -1,8 +1,8 @@
 import random
-import Config
+import common.Config as Config
 
-from Generation.GenerationConstants import GenerationConstants
-from Generation.Utils import *
+from common.Generation.GenerationConstants import GenerationConstants
+from common.Generation.Utils import *
 
 class GenRythm:
     def drumRythmSequence(self, instrumentName, nbeats, density, regularity ):
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index c339ae6..3ea49fb 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -4,11 +4,9 @@ pygtk.require( '2.0' )
 import gtk
 import pango
 
-from SubActivity import SubActivity
-
 import os, sys, shutil
 
-import Config
+import common.Config as Config
 from   gettext import gettext as _
 import sugar.graphics.style as style
 
@@ -18,31 +16,31 @@ import Jam.Block as Block
 from Jam.Toolbars import JamToolbar, DesktopToolbar
 
     
-from Util.CSoundNote import CSoundNote
-from Util.CSoundClient import new_csound_client
-import Util.InstrumentDB as InstrumentDB
-from Util import NoteDB
+from common.Util.CSoundNote import CSoundNote
+from common.Util.CSoundClient import new_csound_client
+import common.Util.InstrumentDB as InstrumentDB
+from common.Util import NoteDB
 
 from Fillin import Fillin
 from RythmGenerator import generator
-from Generation.GenerationConstants import GenerationConstants
-from Util.NoteDB import Note, Page
+from common.Generation.GenerationConstants import GenerationConstants
+from common.Util.NoteDB import Note, Page
 
-from Util import ControlStream
+from common.Util import ControlStream
 
 import xdrlib
 import time
 import gobject
-import Util.Network as Net
+import common.Util.Network as Net
 from sugar.presence import presenceservice
 from sugar.graphics.xocolor import XoColor
 
 from math import sqrt
 
-class JamMain(SubActivity):
+class JamMain(gtk.EventBox):
     
-    def __init__(self, activity, set_mode):
-        SubActivity.__init__(self, set_mode)
+    def __init__(self, activity):
+        gtk.EventBox.__init__(self)
 
         self.activity = activity
 
@@ -273,7 +271,7 @@ class JamMain(SubActivity):
         #-- Desktops ------------------------------------------
         self.curDesktop = None
         # copy preset desktops
-        path = Config.TAM_TAM_ROOT+"/Resources/Desktops/"
+        path = Config.TAM_TAM_ROOT+"/common/Resources/Desktops/"
         filelist = os.listdir( path )
         for file in filelist:
             shutil.copyfile( path+file, Config.SCRATCH_DIR+file ) 
@@ -318,15 +316,12 @@ class JamMain(SubActivity):
     # SubActivity Handlers 
 
     def onActivate( self, arg ):
-        SubActivity.onActivate( self, arg )
-
+        pass
     def onDeactivate( self ):
-        SubActivity.onDeactivate( self )
+        pass
 
-    def onDestroy( self ):
-        SubActivity.onDestroy( self )
-    
-        # clear up scratch folder    
+    def onDestroy( self ):    
+        #clear up scratch folder    
         path = Config.SCRATCH_DIR
         filelist = os.listdir( path )
         for file in filelist:
diff --git a/TamTamJam.activity/Jam/Parasite.py b/TamTamJam.activity/Jam/Parasite.py
index 084d092..74b9e0d 100644
--- a/TamTamJam.activity/Jam/Parasite.py
+++ b/TamTamJam.activity/Jam/Parasite.py
@@ -2,10 +2,10 @@ import pygtk
 pygtk.require( '2.0' )
 import gtk
 
-import Config
+import common.Config as Config
 
-from Util.NoteDB import PARAMETER
-from Util.CSoundClient import new_csound_client
+from common.Util.NoteDB import PARAMETER
+from common.Util.CSoundClient import new_csound_client
 
 class LoopParasite:
 
diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py
index b69a73f..8d59807 100644
--- a/TamTamJam.activity/Jam/Picker.py
+++ b/TamTamJam.activity/Jam/Picker.py
@@ -8,13 +8,13 @@ import os
 import random #TEMP
 import sets
 
-import Config
+import common.Config as Config
 from   gettext import gettext as _
 
 from sugar.graphics.palette import Palette, WidgetInvoker
 
-from Util import ControlStream
-from Util import InstrumentDB
+from common.Util import ControlStream
+from common.Util import InstrumentDB
 
 from Jam import Block
 
diff --git a/TamTamJam.activity/Jam/Popup.py b/TamTamJam.activity/Jam/Popup.py
index 9af550c..1e57293 100644
--- a/TamTamJam.activity/Jam/Popup.py
+++ b/TamTamJam.activity/Jam/Popup.py
@@ -3,7 +3,7 @@ import pygtk
 pygtk.require( '2.0' )
 import gtk
 
-import Config
+import common.Config as Config
 
 from gettext import gettext as _
 from sugar.graphics import style
@@ -11,12 +11,12 @@ from sugar.graphics.palette import Palette, Invoker, _palette_observer
 import gobject
 
 import Jam.Block as Block
-from Util.NoteDB import PARAMETER
-from Util.CSoundNote import CSoundNote
-from Util.CSoundClient import new_csound_client
+from common.Util.NoteDB import PARAMETER
+from common.Util.CSoundNote import CSoundNote
+from common.Util.CSoundClient import new_csound_client
 from Jam.Parasite import LoopParasite
 
-from Generation.Generator import generator1, GenerationParameters
+from common.Generation.Generator import generator1, GenerationParameters
 
 class SELECTNOTES:
     ALL = -1
diff --git a/TamTamJam.activity/Jam/RythmGenerator.py b/TamTamJam.activity/Jam/RythmGenerator.py
index 4740160..537f598 100644
--- a/TamTamJam.activity/Jam/RythmGenerator.py
+++ b/TamTamJam.activity/Jam/RythmGenerator.py
@@ -1,8 +1,8 @@
 import random
 
-import Config
-from Util.CSoundNote import CSoundNote
-from Generation.GenerationConstants import GenerationConstants
+import common.Config as Config
+from common.Util.CSoundNote import CSoundNote
+from common.Generation.GenerationConstants import GenerationConstants
 from GenRythm import GenRythm
 
 def generator( instrument, nbeats, density, regularity, reverbSend ):
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py
index 8a45c01..30001ef 100644
--- a/TamTamJam.activity/Jam/Toolbars.py
+++ b/TamTamJam.activity/Jam/Toolbars.py
@@ -8,7 +8,7 @@ from gettext import gettext as _
 from sugar.graphics.palette import Palette, WidgetInvoker
 from sugar.graphics.radiotoolbutton import RadioToolButton
 
-import Config
+import common.Config as Config
 
 
 class JamToolbar( gtk.Toolbar ):