diff options
433 files changed, 699 insertions, 256 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index 102205b..6921d30 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -111,7 +111,7 @@ class MainWindow( gtk.EventBox ): self.GUI["2main"] = gtk.VBox() def draw_inst_icons(): - instrumentNames = [ k for k in Config.INSTRUMENTS.keys() if (k[0:4] != 'drum' and k[0:4] != 'guid') or Config.INSTRUMENTS[k].category == "kit" ] + instrumentNames = [ k for k in Config.INSTRUMENTS.keys() if (k[0:4] != 'drum' and k[0:4] != 'guid') or Config.INSTRUMENTS[k].kit ] self.GUI["2instrumentIcons"] = {} for instrument in instrumentNames: try: @@ -470,7 +470,7 @@ class MainWindow( gtk.EventBox ): stringsPickup.append(name) elif Config.INSTRUMENTS[name].category == 'winds' and Config.INSTRUMENTS[name].name != 'didjeridu': windsPickup.append(name) - elif Config.INSTRUMENTS[name].category == 'keyboard' or Config.INSTRUMENTS[name].category == 'percussions': + elif Config.INSTRUMENTS[name].category == 'keyboard' or Config.INSTRUMENTS[name].category == 'percussions' and not name.startswith('drum'): if Config.INSTRUMENTS[name].name != 'zap' and Config.INSTRUMENTS[name].name != 'cling': keyboardPickup.append(name) return [ @@ -2112,12 +2112,12 @@ class instrumentPalette( Popup ): self.volumeSlider.set_inverted(False) self.volumeSlider.set_draw_value(False) - self.categories = Config.CATEGORIES + self.categories = [cat.capitalize() for cat in Config.CATEGORIES] self.instruments = self.getInstruments() self.categoryBox = BigComboBox() for category in self.categories: - image = Config.IMAGE_ROOT + category + '.png' + image = Config.IMAGE_ROOT + category.lower() + '.png' if not os.path.isfile(image): image = Config.IMAGE_ROOT + 'generic.png' self.categoryBox.append_item(category, category, icon_name = image, size = instrumentPalette.ICON_SIZE) @@ -2145,7 +2145,7 @@ class instrumentPalette( Popup ): self.popdown(True) def handleCategoryChange(self, widget): - category = widget.props.value + category = widget.props.value.lower() instruments = self.getInstruments(category) self.loadInstrumentMenu(instruments) self.skip = True @@ -2153,7 +2153,7 @@ class instrumentPalette( Popup ): self.skip = False def setCategory(self, category): - self.categoryBox.set_active(self.categories.index(category)) + self.categoryBox.set_active(self.categories.index(category.capitalize())) def setInstrument(self, instrument): self.skip = True @@ -2244,6 +2244,6 @@ class drumPalette( Popup ): self.drumBox.append_item(instrument, text = None, icon_name = image, size = instrumentPalette.ICON_SIZE) def getDrums(self): - return sorted([instrument for instrument in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[instrument].category == 'kit']) + return sorted([instrument for instrument in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[instrument].kit]) diff --git a/TamTamEdit.activity/MANIFEST b/TamTamEdit.activity/MANIFEST index 9387625..84eba6f 100644 --- a/TamTamEdit.activity/MANIFEST +++ b/TamTamEdit.activity/MANIFEST @@ -98,23 +98,421 @@ common/Resources/crop.csd common/Resources/tamtamorc.csd common/Resources/tooltips_en.py common/Resources/tooltips_fr.py -common/Resources/Desktops/desktop0 -common/Resources/Desktops/desktop1 -common/Resources/Desktops/desktop2 -common/Resources/Desktops/desktop3 -common/Resources/Desktops/desktop4 -common/Resources/Desktops/desktop5 -common/Resources/Desktops/desktop6 -common/Resources/Desktops/desktop7 -common/Resources/Desktops/desktop8 -common/Resources/Desktops/desktop9 -common/Resources/SynthFiles/synthFile1 -common/Resources/SynthFiles/synthFile2 -common/Resources/SynthFiles/synthFile3 -common/Resources/SynthFiles/synthFile4 -common/Resources/SynthFiles/synthFile5 -common/Resources/SynthFiles/synthFile6 -common/Resources/SynthFiles/synthFile7 -common/Resources/SynthFiles/synthFile8 -common/Resources/SynthFiles/synthFile9 -common/Resources/SynthFiles/synthFile10
\ No newline at end of file +common/Resources/Sounds/acguit +common/Resources/Sounds/alarm +common/Resources/Sounds/banjo +common/Resources/Sounds/basse +common/Resources/Sounds/bird +common/Resources/Sounds/bottle +common/Resources/Sounds/bubbles +common/Resources/Sounds/byke +common/Resources/Sounds/camera +common/Resources/Sounds/car +common/Resources/Sounds/cat +common/Resources/Sounds/cello +common/Resources/Sounds/chimes +common/Resources/Sounds/clang +common/Resources/Sounds/clarinette +common/Resources/Sounds/cling +common/Resources/Sounds/crash +common/Resources/Sounds/diceinst +common/Resources/Sounds/didjeridu +common/Resources/Sounds/dog +common/Resources/Sounds/door +common/Resources/Sounds/drum1chine +common/Resources/Sounds/drum1crash +common/Resources/Sounds/drum1floortom +common/Resources/Sounds/drum1hardride +common/Resources/Sounds/drum1hatpedal +common/Resources/Sounds/drum1hatshoulder +common/Resources/Sounds/drum1kick +common/Resources/Sounds/drum1ridebell +common/Resources/Sounds/drum1snare +common/Resources/Sounds/drum1snaresidestick +common/Resources/Sounds/drum1splash +common/Resources/Sounds/drum1tom +common/Resources/Sounds/drum2darbukadoom +common/Resources/Sounds/drum2darbukafinger +common/Resources/Sounds/drum2darbukapied +common/Resources/Sounds/drum2darbukapiedsoft +common/Resources/Sounds/drum2darbukaroll +common/Resources/Sounds/drum2darbukaslap +common/Resources/Sounds/drum2darbukatak +common/Resources/Sounds/drum2hatflanger +common/Resources/Sounds/drum2hatpied +common/Resources/Sounds/drum2hatpied2 +common/Resources/Sounds/drum2tambourinepied +common/Resources/Sounds/drum2tambourinepiedsoft +common/Resources/Sounds/drum3cowbell +common/Resources/Sounds/drum3cowbelltip +common/Resources/Sounds/drum3cup +common/Resources/Sounds/drum3djembelow +common/Resources/Sounds/drum3djembemid +common/Resources/Sounds/drum3djembesidestick +common/Resources/Sounds/drum3djembeslap +common/Resources/Sounds/drum3djembestickmid +common/Resources/Sounds/drum3metalstand +common/Resources/Sounds/drum3pedalperc +common/Resources/Sounds/drum3rainstick +common/Resources/Sounds/drum3tambourinehigh +common/Resources/Sounds/drum3tambourinelow +common/Resources/Sounds/drum4afrofeet +common/Resources/Sounds/drum4fingersn +common/Resources/Sounds/drum4mutecuic +common/Resources/Sounds/drum4stompbass +common/Resources/Sounds/drum4tambouri +common/Resources/Sounds/drum4tr707clap +common/Resources/Sounds/drum4tr707open +common/Resources/Sounds/drum4tr808closed +common/Resources/Sounds/drum4tr808sn +common/Resources/Sounds/drum4tr909bass +common/Resources/Sounds/drum4tr909kick +common/Resources/Sounds/drum4tr909sn +common/Resources/Sounds/drum5agogoaigu +common/Resources/Sounds/drum5agogograve +common/Resources/Sounds/drum5bongoaiguouvert +common/Resources/Sounds/drum5bongograveouvert +common/Resources/Sounds/drum5congaaiguouvert +common/Resources/Sounds/drum5congagraveferme +common/Resources/Sounds/drum5congagraveouvert +common/Resources/Sounds/drum5guiroretour +common/Resources/Sounds/drum5quicaaigu +common/Resources/Sounds/drum5quicamedium +common/Resources/Sounds/drum5timablesaiguslap +common/Resources/Sounds/drum5timablesslap +common/Resources/Sounds/drum5vibraslap +common/Resources/Sounds/duck +common/Resources/Sounds/duck2 +common/Resources/Sounds/flute +common/Resources/Sounds/gam +common/Resources/Sounds/guidice1 +common/Resources/Sounds/guidice10 +common/Resources/Sounds/guidice2 +common/Resources/Sounds/guidice3 +common/Resources/Sounds/guidice4 +common/Resources/Sounds/guidice5 +common/Resources/Sounds/guidice6 +common/Resources/Sounds/guidice7 +common/Resources/Sounds/guidice8 +common/Resources/Sounds/guidice9 +common/Resources/Sounds/guit +common/Resources/Sounds/guit2 +common/Resources/Sounds/harmonica +common/Resources/Sounds/harmonium +common/Resources/Sounds/horse +common/Resources/Sounds/kalimba +common/Resources/Sounds/koto +common/Resources/Sounds/lab1 +common/Resources/Sounds/lab2 +common/Resources/Sounds/lab3 +common/Resources/Sounds/lab4 +common/Resources/Sounds/lab5 +common/Resources/Sounds/lab6 +common/Resources/Sounds/laugh +common/Resources/Sounds/mando +common/Resources/Sounds/marimba +common/Resources/Sounds/mic1 +common/Resources/Sounds/mic2 +common/Resources/Sounds/mic3 +common/Resources/Sounds/mic4 +common/Resources/Sounds/ocarina +common/Resources/Sounds/ounk +common/Resources/Sounds/ow +common/Resources/Sounds/piano +common/Resources/Sounds/plane +common/Resources/Sounds/rhodes +common/Resources/Sounds/saxo +common/Resources/Sounds/sheep +common/Resources/Sounds/shenai +common/Resources/Sounds/sitar +common/Resources/Sounds/slap +common/Resources/Sounds/triangle +common/Resources/Sounds/trumpet +common/Resources/Sounds/tuba +common/Resources/Sounds/violin +common/Resources/Sounds/voix +common/Resources/Sounds/water +common/Resources/Sounds/zap +common/Resources/Images/TamTam.png +common/Resources/Images/acguit.png +common/Resources/Images/acguitsel.png +common/Resources/Images/alarm.png +common/Resources/Images/alarmsel.png +common/Resources/Images/all.png +common/Resources/Images/allsel.png +common/Resources/Images/animals.png +common/Resources/Images/animalssel.png +common/Resources/Images/arrowEditDown.png +common/Resources/Images/arrowEditDownDown.png +common/Resources/Images/arrowEditDownOver.png +common/Resources/Images/arrowEditLeft.png +common/Resources/Images/arrowEditLeftDown.png +common/Resources/Images/arrowEditLeftOver.png +common/Resources/Images/arrowEditRight.png +common/Resources/Images/arrowEditRightDown.png +common/Resources/Images/arrowEditRightOver.png +common/Resources/Images/arrowEditUp.png +common/Resources/Images/arrowEditUpDown.png +common/Resources/Images/arrowEditUpOver.png +common/Resources/Images/basse.png +common/Resources/Images/bassesel.png +common/Resources/Images/beat1.png +common/Resources/Images/beat10.png +common/Resources/Images/beat11.png +common/Resources/Images/beat2.png +common/Resources/Images/beat3.png +common/Resources/Images/beat4.png +common/Resources/Images/beat5.png +common/Resources/Images/beat6.png +common/Resources/Images/beat7.png +common/Resources/Images/beat8.png +common/Resources/Images/beat9.png +common/Resources/Images/bird.png +common/Resources/Images/birdsel.png +common/Resources/Images/bottle.png +common/Resources/Images/bottlesel.png +common/Resources/Images/bubbles.png +common/Resources/Images/bubblessel.png +common/Resources/Images/byke.png +common/Resources/Images/bykesel.png +common/Resources/Images/camera.png +common/Resources/Images/camerasel.png +common/Resources/Images/car.png +common/Resources/Images/carsel.png +common/Resources/Images/cat.png +common/Resources/Images/catsel.png +common/Resources/Images/cello.png +common/Resources/Images/cellosel.png +common/Resources/Images/check.png +common/Resources/Images/checkOff.svg +common/Resources/Images/checkOn.svg +common/Resources/Images/chimes.png +common/Resources/Images/chimessel.png +common/Resources/Images/clang.png +common/Resources/Images/clangsel.png +common/Resources/Images/clarinette.png +common/Resources/Images/clarinettesel.png +common/Resources/Images/cling.png +common/Resources/Images/clingsel.png +common/Resources/Images/complex1.png +common/Resources/Images/complex2.png +common/Resources/Images/complex3.png +common/Resources/Images/complex4.png +common/Resources/Images/complex5.png +common/Resources/Images/complex6.png +common/Resources/Images/complex7.png +common/Resources/Images/complex8.png +common/Resources/Images/concret.png +common/Resources/Images/concretsel.png +common/Resources/Images/crash.png +common/Resources/Images/crashsel.png +common/Resources/Images/dice.png +common/Resources/Images/diceProp.png +common/Resources/Images/dicePropSel.png +common/Resources/Images/diceblur.png +common/Resources/Images/diceinst.png +common/Resources/Images/diceinstsel.png +common/Resources/Images/didjeridu.png +common/Resources/Images/didjeridusel.png +common/Resources/Images/dog.png +common/Resources/Images/dogsel.png +common/Resources/Images/door.png +common/Resources/Images/doorsel.png +common/Resources/Images/dru0.png +common/Resources/Images/dru1.png +common/Resources/Images/dru2.png +common/Resources/Images/dru3.png +common/Resources/Images/dru4.png +common/Resources/Images/drum1kit.png +common/Resources/Images/drum1kitsel.png +common/Resources/Images/drum1kitselgen.png +common/Resources/Images/drum2kit.png +common/Resources/Images/drum2kitsel.png +common/Resources/Images/drum2kitselgen.png +common/Resources/Images/drum3kit.png +common/Resources/Images/drum3kitsel.png +common/Resources/Images/drum3kitselgen.png +common/Resources/Images/drum4kit.png +common/Resources/Images/drum4kitsel.png +common/Resources/Images/drum4kitselgen.png +common/Resources/Images/drum5kit.png +common/Resources/Images/drum5kitsel.png +common/Resources/Images/drum5kitselgen.png +common/Resources/Images/duck.png +common/Resources/Images/duck2.png +common/Resources/Images/duck2sel.png +common/Resources/Images/ducksel.png +common/Resources/Images/editTam.png +common/Resources/Images/editTamDown.png +common/Resources/Images/editTamOver.png +common/Resources/Images/electronic.png +common/Resources/Images/electronicsel.png +common/Resources/Images/flute.png +common/Resources/Images/flutesel.png +common/Resources/Images/gam.png +common/Resources/Images/gamsel.png +common/Resources/Images/generic.png +common/Resources/Images/genericsel.png +common/Resources/Images/guit.png +common/Resources/Images/guit2.png +common/Resources/Images/guit2sel.png +common/Resources/Images/guitsel.png +common/Resources/Images/harmonica.png +common/Resources/Images/harmonicasel.png +common/Resources/Images/harmonium.png +common/Resources/Images/harmoniumsel.png +common/Resources/Images/helpShow1.jpg +common/Resources/Images/helpShow2.jpg +common/Resources/Images/helpShow3.jpg +common/Resources/Images/helpShow4.jpg +common/Resources/Images/helpShow5.jpg +common/Resources/Images/helpShow6.jpg +common/Resources/Images/helpShow7.jpg +common/Resources/Images/helpShow8.jpg +common/Resources/Images/helpShow9.jpg +common/Resources/Images/helpTam.png +common/Resources/Images/helpTamDown.png +common/Resources/Images/helpTamOver.png +common/Resources/Images/hit.png +common/Resources/Images/hitSelected.png +common/Resources/Images/horse.png +common/Resources/Images/horsesel.png +common/Resources/Images/instr0.png +common/Resources/Images/instr1.png +common/Resources/Images/instr2.png +common/Resources/Images/instr3.png +common/Resources/Images/instr4.png +common/Resources/Images/jam-blockMask.png +common/Resources/Images/kalimba.png +common/Resources/Images/kalimbasel.png +common/Resources/Images/keyboard.png +common/Resources/Images/keyboardsel.png +common/Resources/Images/koto.png +common/Resources/Images/kotosel.png +common/Resources/Images/laugh.png +common/Resources/Images/laughsel.png +common/Resources/Images/mando.png +common/Resources/Images/mandosel.png +common/Resources/Images/marimba.png +common/Resources/Images/marimbasel.png +common/Resources/Images/marquis.png +common/Resources/Images/mic1.png +common/Resources/Images/mic1sel.png +common/Resources/Images/mic2.png +common/Resources/Images/mic2sel.png +common/Resources/Images/mic3.png +common/Resources/Images/mic3sel.png +common/Resources/Images/mic4.png +common/Resources/Images/mic4sel.png +common/Resources/Images/miniTam.png +common/Resources/Images/miniTamDown.png +common/Resources/Images/miniTamOver.png +common/Resources/Images/miniplay.png +common/Resources/Images/mysounds.png +common/Resources/Images/mysoundssel.png +common/Resources/Images/note.png +common/Resources/Images/noteSelected.png +common/Resources/Images/ocarina.png +common/Resources/Images/ocarinasel.png +common/Resources/Images/ounk.png +common/Resources/Images/ounksel.png +common/Resources/Images/ow.png +common/Resources/Images/owsel.png +common/Resources/Images/pageThumbnailBG.png +common/Resources/Images/pageThumbnailBG0.png +common/Resources/Images/pageThumbnailBG1.png +common/Resources/Images/pageThumbnailBG2.png +common/Resources/Images/pageThumbnailBG3.png +common/Resources/Images/pageThumbnailBut0.png +common/Resources/Images/pageThumbnailBut0Down.png +common/Resources/Images/pageThumbnailBut1.png +common/Resources/Images/pageThumbnailBut1Down.png +common/Resources/Images/pageThumbnailBut2.png +common/Resources/Images/pageThumbnailBut2Down.png +common/Resources/Images/pageThumbnailBut3.png +common/Resources/Images/pageThumbnailBut3Down.png +common/Resources/Images/pageThumbnailMask.png +common/Resources/Images/people.png +common/Resources/Images/peoplesel.png +common/Resources/Images/percussions.png +common/Resources/Images/percussionssel.png +common/Resources/Images/piano.png +common/Resources/Images/pianosel.png +common/Resources/Images/plane.png +common/Resources/Images/planesel.png +common/Resources/Images/reverb0.png +common/Resources/Images/reverb1.png +common/Resources/Images/reverb2.png +common/Resources/Images/reverb3.png +common/Resources/Images/reverb4.png +common/Resources/Images/reverb5.png +common/Resources/Images/rhodes.png +common/Resources/Images/rhodessel.png +common/Resources/Images/sampleBG.png +common/Resources/Images/sampleNoteMask.png +common/Resources/Images/saxo.png +common/Resources/Images/saxosel.png +common/Resources/Images/scrollBar.png +common/Resources/Images/sheep.png +common/Resources/Images/sheepsel.png +common/Resources/Images/shenai.png +common/Resources/Images/shenaisel.png +common/Resources/Images/sitar.png +common/Resources/Images/sitarsel.png +common/Resources/Images/slap.png +common/Resources/Images/slapsel.png +common/Resources/Images/sliderDrum.png +common/Resources/Images/sliderEditTempo.png +common/Resources/Images/sliderEditVolume.png +common/Resources/Images/sliderInst1.png +common/Resources/Images/sliderInst2.png +common/Resources/Images/sliderInst3.png +common/Resources/Images/sliderInst4.png +common/Resources/Images/sliderbutbleu.png +common/Resources/Images/sliderbutjaune.png +common/Resources/Images/sliderbutred.png +common/Resources/Images/sliderbutvert.png +common/Resources/Images/sliderbutviolet.png +common/Resources/Images/sliderlong.png +common/Resources/Images/slidershort.png +common/Resources/Images/stop.png +common/Resources/Images/strings.png +common/Resources/Images/stringssel.png +common/Resources/Images/synthTam.png +common/Resources/Images/synthTamDown.png +common/Resources/Images/synthTamOver.png +common/Resources/Images/synthlabMask.png +common/Resources/Images/tchiwo.png +common/Resources/Images/tchiwosel.png +common/Resources/Images/tempo1.png +common/Resources/Images/tempo2.png +common/Resources/Images/tempo3.png +common/Resources/Images/tempo4.png +common/Resources/Images/tempo5.png +common/Resources/Images/tempo6.png +common/Resources/Images/tempo7.png +common/Resources/Images/tempo8.png +common/Resources/Images/trackBG.png +common/Resources/Images/trackBGDrum.png +common/Resources/Images/trackBGDrumSelected.png +common/Resources/Images/trackBGSelected.png +common/Resources/Images/triangle.png +common/Resources/Images/trianglesel.png +common/Resources/Images/trumpet.png +common/Resources/Images/trumpetsel.png +common/Resources/Images/tuba.png +common/Resources/Images/tubasel.png +common/Resources/Images/violin.png +common/Resources/Images/violinsel.png +common/Resources/Images/voix.png +common/Resources/Images/voixsel.png +common/Resources/Images/volume0.png +common/Resources/Images/volume1.png +common/Resources/Images/volume2.png +common/Resources/Images/volume3.png +common/Resources/Images/water.png +common/Resources/Images/watersel.png +common/Resources/Images/winds.png +common/Resources/Images/windssel.png +common/Resources/Images/zap.png +common/Resources/Images/zapsel.png diff --git a/TamTamEdit.activity/setup.py b/TamTamEdit.activity/setup.py index b31f0b1..cfed2e4 100644 --- a/TamTamEdit.activity/setup.py +++ b/TamTamEdit.activity/setup.py @@ -24,7 +24,11 @@ import os os.system('unlink common')
shutil.copytree('../common', 'common')
-bundlebuilder.start('TamTamEdit')
+try:
+ bundlebuilder.start('TamTamEdit')
+except:
+ os.system('rm -rf common')
+ os.system('ln -s ../common common')
#Restore the symlink
os.system('rm -rf common')
os.system('ln -s ../common common')
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py index 6e074e2..b9641b4 100644 --- a/TamTamJam.activity/Jam/JamMain.py +++ b/TamTamJam.activity/Jam/JamMain.py @@ -15,7 +15,7 @@ import Jam.Picker as Picker import common.Util.Block as Block from Jam.Toolbars import JamToolbar, DesktopToolbar - + from common.Util.CSoundNote import CSoundNote from common.Util.CSoundClient import new_csound_client import common.Util.InstrumentDB as InstrumentDB @@ -38,7 +38,7 @@ from sugar.graphics.xocolor import XoColor from math import sqrt class JamMain(gtk.EventBox): - + def __init__(self, activity): gtk.EventBox.__init__(self) @@ -52,7 +52,7 @@ class JamMain(gtk.EventBox): self.beatDuration = 60.0/self.tempo self.ticksPerSecond = Config.TICKS_PER_BEAT*self.tempo/60.0 self.volume = 0.5 - + self.csnd = new_csound_client() for i in range(0,9): self.csnd.setTrackVolume( 100, i ) @@ -63,7 +63,7 @@ class JamMain(gtk.EventBox): presenceService = presenceservice.get_instance() self.xoOwner = presenceService.get_owner() - + #-- Drawing ------------------------------------------- def darken( colormap, hex ): hexToDec = { "0":0, "1":1, "2":2, "3":3, "4":4, "5":5, "6":6, "7":7, "8":8, "9":9, "A":10, "B":11, "C":12, "D":13, "E":14, "F":15, "a":10, "b":11, "c":12, "d":13, "e":14, "f":15 } @@ -86,17 +86,17 @@ class JamMain(gtk.EventBox): win = gtk.gdk.get_default_root_window() self.gc = gtk.gdk.GC( win ) colormap = gtk.gdk.colormap_get_system() - self.colors = { "bg": colormap.alloc_color( Config.PANEL_BCK_COLOR ), - "black": colormap.alloc_color( style.COLOR_BLACK.get_html() ), - #"Picker_Bg": colormap.alloc_color( "#404040" ), - #"Picker_Bg_Inactive": colormap.alloc_color( "#808080" ), - "Picker_Bg": colormap.alloc_color( style.COLOR_TOOLBAR_GREY.get_html() ), - "Picker_Bg_Inactive": colormap.alloc_color( style.COLOR_BUTTON_GREY.get_html() ), - "Picker_Fg": colormap.alloc_color( style.COLOR_WHITE.get_html() ), - "Border_Active": colormap.alloc_color( xoColor.get_stroke_color() ), #colormap.alloc_color( "#590000" ), - "Border_Inactive": colormap.alloc_color( "#8D8D8D" ), - "Border_Highlight": colormap.alloc_color( "#FFFFFF" ), - "Bg_Active": colormap.alloc_color( xoColor.get_fill_color() ), #colormap.alloc_color( "#FFDDEA" ), + self.colors = { "bg": colormap.alloc_color( Config.PANEL_BCK_COLOR ), + "black": colormap.alloc_color( style.COLOR_BLACK.get_html() ), + #"Picker_Bg": colormap.alloc_color( "#404040" ), + #"Picker_Bg_Inactive": colormap.alloc_color( "#808080" ), + "Picker_Bg": colormap.alloc_color( style.COLOR_TOOLBAR_GREY.get_html() ), + "Picker_Bg_Inactive": colormap.alloc_color( style.COLOR_BUTTON_GREY.get_html() ), + "Picker_Fg": colormap.alloc_color( style.COLOR_WHITE.get_html() ), + "Border_Active": colormap.alloc_color( xoColor.get_stroke_color() ), #colormap.alloc_color( "#590000" ), + "Border_Inactive": colormap.alloc_color( "#8D8D8D" ), + "Border_Highlight": colormap.alloc_color( "#FFFFFF" ), + "Bg_Active": colormap.alloc_color( xoColor.get_fill_color() ), #colormap.alloc_color( "#FFDDEA" ), "Bg_Inactive": colormap.alloc_color( "#DBDBDB" ), "Preview_Note_Fill": colormap.alloc_color( Config.BG_COLOR ), "Preview_Note_Border": colormap.alloc_color( Config.FG_COLOR ), @@ -176,7 +176,7 @@ class JamMain(gtk.EventBox): self.prepareInstrumentImage( inst.id, inst.img ) #-- Loop Images --------------------------------------- - self.loopImage = {} # get filled in through updateLoopImage + self.loopImage = {} # get filled in through updateLoopImage self.loopImageActive = {} # #-- Key Images ---------------------------------------- @@ -203,7 +203,7 @@ class JamMain(gtk.EventBox): #-- GUI ----------------------------------------------- if True: # GUI self.modify_bg( gtk.STATE_NORMAL, self.colors["bg"] ) # window bg - + self.GUI = {} self.GUI["mainVBox"] = gtk.VBox() self.add( self.GUI["mainVBox"] ) @@ -231,12 +231,12 @@ class JamMain(gtk.EventBox): self.pickers[type] = type( self ) def prepareLabel( name ): - label = gtk.Label( _(name) ) + label = gtk.Label( _(name.capitalize()) ) label.set_alignment( 0.0, 0.5 ) label.modify_fg( gtk.STATE_NORMAL, self.colors["Picker_Fg"] ) label.modify_fg( gtk.STATE_ACTIVE, self.colors["Picker_Fg"] ) return label - + self.GUI["notebook"].append_page( self.pickers[Picker.Drum], prepareLabel("Drum Kits") ) self.GUI["notebook"].append_page( self.pickers[Picker.Loop], prepareLabel("Loops") ) @@ -279,7 +279,7 @@ class JamMain(gtk.EventBox): path = Config.TAM_TAM_ROOT+"/common/Resources/Desktops/" filelist = os.listdir( path ) for file in filelist: - shutil.copyfile( path+file, Config.SCRATCH_DIR+file ) + shutil.copyfile( path+file, Config.SCRATCH_DIR+file ) #-- Network ------------------------------------------- self.network = Net.Network() @@ -318,28 +318,28 @@ class JamMain(gtk.EventBox): #========================================================== - + def onActivate( self, arg ): pass def onDeactivate( self ): pass - def 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: - os.remove( path+file ) + os.remove( path+file ) #========================================================== - # Playback + # Playback def onKeyPress( self, widget, event ): key = event.hardware_keycode if key in self.keyMap.keys(): - activate = True + activate = True for block in self.keyMap[key]: if block.isActive(): activate = False @@ -366,44 +366,44 @@ class JamMain(gtk.EventBox): if inst.kit: # drum kit if pitch in GenerationConstants.DRUMPITCH: pitch = GenerationConstants.DRUMPITCH[pitch] - csnote = self._playNote( key, - 36, + csnote = self._playNote( key, + 36, self.instrument["amplitude"]*0.5, # trackVol*noteVol - self.instrument["pan"], - 100, + self.instrument["pan"], + 100, inst.kit[pitch].instrumentId, - self.instrument["reverb"] ) + self.instrument["reverb"] ) else: if event.state == gtk.gdk.MOD1_MASK: pitch += 5 - + if inst.csoundInstrumentId == Config.INST_PERC: #Percussions resonance - duration = 60 + duration = 60 else: duration = -1 - csnote = self._playNote( key, + csnote = self._playNote( key, pitch, self.instrument["amplitude"]*0.5, # trackVol*noteVol - self.instrument["pan"], + self.instrument["pan"], duration, - self.instrument["id"], - self.instrument["reverb"] ) + self.instrument["id"], + self.instrument["reverb"] ) if self.keyboardListener: self.keyboardListener.recordNote( csnote.pitch ) self.recordingNote = True - + def onKeyRelease( self, widget, event ): key = event.hardware_keycode - if self.key_dict.has_key( key ): + if self.key_dict.has_key( key ): self._stopNote( key ) if self.recordingNote: if self.keyboardListener: self.keyboardListener.finishNote() - self.recordingNote = False + self.recordingNote = False def _playNote( self, key, pitch, amplitude, pan, duration, instrumentId, reverb ): self.key_dict[key] = CSoundNote( 0, # onset @@ -431,8 +431,8 @@ class JamMain(gtk.EventBox): csnote.tied = False self.csnd.play(csnote, 0.3) del self.key_dict[key] - - def _updateInstrument( self, id, volume, pan = 0, reverb = 0 ): + + def _updateInstrument( self, id, volume, pan = 0, reverb = 0 ): self.instrument = { "id": id, "amplitude": volume, "pan": pan, @@ -476,7 +476,7 @@ class JamMain(gtk.EventBox): self.csnd.loopSetNumTicks( ticks, loopId ) self.drumFillin.setLoopId( loopId ) - self.drumFillin.setProperties( self.tempo, Config.INSTRUMENTSID[id].name, volume, beats, reverb ) + self.drumFillin.setProperties( self.tempo, Config.INSTRUMENTSID[id].name, volume, beats, reverb ) self.drumFillin.unavailable( noteOnsets, notePitchs ) self.drumFillin.play() @@ -499,7 +499,7 @@ class JamMain(gtk.EventBox): startTick = (int(startTick)//Config.TICKS_PER_BEAT)*Config.TICKS_PER_BEAT + self.csnd.loopGetTick( self.heartbeatLoop ) else: startTick = (-1 + int(startTick)//Config.TICKS_PER_BEAT)*Config.TICKS_PER_BEAT + self.csnd.loopGetTick( self.heartbeatLoop ) - + if startTick >= ticks: startTick -= ticks elif startTick < 0: @@ -524,9 +524,9 @@ class JamMain(gtk.EventBox): startTick = self.csnd.loopGetTick( loopId ) self.csnd.loopDestroy( loopId ) firstTime = False - + loopId = self.csnd.loopCreate() - + # TODO update track volume inst = Config.INSTRUMENTSID[id] @@ -547,7 +547,7 @@ class JamMain(gtk.EventBox): offset += self.noteDB.getPage(page).ticks self.csnd.loopSetNumTicks( offset, loopId ) - + # sync to heartbeat #if False: # firstTime: # always force first note to play rather than snaping to nearest beat.. good idea? # startTick = offset - Config.TICKS_PER_BEAT + self.csnd.loopGetTick( self.heartbeatLoop ) @@ -566,12 +566,11 @@ class JamMain(gtk.EventBox): startTick = (int(startTick)//Config.TICKS_PER_BEAT)*Config.TICKS_PER_BEAT + self.csnd.loopGetTick( self.heartbeatLoop ) else: startTick = (-1 + int(startTick)//Config.TICKS_PER_BEAT)*Config.TICKS_PER_BEAT + self.csnd.loopGetTick( self.heartbeatLoop ) - + if startTick >= offset: startTick -= offset elif startTick < 0: startTick += offset - self.csnd.loopSetTick( startTick, loopId ) if not self.paused or force: @@ -665,9 +664,9 @@ class JamMain(gtk.EventBox): pageId = self.noteDB.addPage( -1, page ) else: self.noteDB.deleteNotesByTrack( [ pageId ], [ 0 ] ) - + if len(notes): - self.noteDB.addNotes( [ pageId, 0, len(notes) ] + notes + [-1] ) + self.noteDB.addNotes( [ pageId, 0, len(notes) ] + notes + [-1] ) return pageId @@ -683,8 +682,8 @@ class JamMain(gtk.EventBox): beatsOfPages, [ track ], [ page ], - dict, - 4) + dict, + 4) # filter & fix input ...WTF!? for track in dict: @@ -704,14 +703,14 @@ class JamMain(gtk.EventBox): # delete the notes and add the new self.noteDB.deleteNotesByTrack( [ page ], [ track ] ) - self.noteDB.addNotes( + self.noteDB.addNotes( [ page, track, len(dict[track][page]) ] + dict[track][page] + [ -1 ] ) #========================================================== - # Get/Set + # Get/Set def getVolume( self ): return self.volume @@ -772,7 +771,7 @@ class JamMain(gtk.EventBox): self._clearDesktop() self.curDesktop = desktop - + TTTable = ControlStream.TamTamTable( self.noteDB, jam = self ) filename = self.getDesktopScratchFile( self.curDesktop ) @@ -781,11 +780,11 @@ class JamMain(gtk.EventBox): TTTable.parseFile( stream ) stream.close() except IOError, (errno, strerror): - if Config.DEBUG > 3: print "IOError:: _setDesktop:", errno, strerror + if Config.DEBUG > 3: print "IOError:: _setDesktop:", errno, strerror def getInstrumentImage( self, id, active = False ): if active: return self.instrumentImageActive[id] - else: return self.instrumentImage[id] + else: return self.instrumentImage[id] def getKeyImage( self, key, active = False ): if active: return self.keyImageActive[key] @@ -826,7 +825,7 @@ class JamMain(gtk.EventBox): self.keyMap[key].append( block ) #========================================================== - # Pixmaps + # Pixmaps def prepareInstrumentImage( self, id, img_path ): win = gtk.gdk.get_default_root_window() @@ -847,14 +846,14 @@ class JamMain(gtk.EventBox): img.draw_rectangle( self.gc, True, 0, 0, Block.Block.WIDTH, Block.Block.HEIGHT ) img.draw_pixbuf( self.gc, pix, 0, 0, x, y, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) self.instrumentImageActive[id] = img - + def _drawNotes( self, pixmap, beats, notes, active ): self.gc.set_clip_mask( self.sampleNoteMask ) for note in notes: # draw N notes x = self.ticksToPixels( note.cs.onset ) endX = self.ticksToPixels( note.cs.onset + note.cs.duration ) - 3 # include end cap offset width = endX - x - if width < 5: + if width < 5: width = 5 endX = x + width y = self.pitchToPixels( note.cs.pitch ) @@ -870,7 +869,7 @@ class JamMain(gtk.EventBox): pixmap.draw_rectangle( self.gc, True, x, y, width, self.sampleNoteHeight ) self.gc.set_clip_origin( endX-self.sampleNoteMask.endOffset, y ) pixmap.draw_rectangle( self.gc, True, endX, y, 3, self.sampleNoteHeight ) - + def prepareKeyImage( self, key ): win = gtk.gdk.get_default_root_window() pangolayout = self.create_pango_layout( _(self.valid_shortcuts[key]) ) @@ -923,15 +922,15 @@ class JamMain(gtk.EventBox): return self.loopPitchOffset + int(round( ( Config.MAXIMUM_PITCH - pitch ) * self.pixelsPerPitch )) #========================================================== - # Load/Save - + # Load/Save + def _saveDesktop( self ): if self.curDesktop == None: return filename = self.getDesktopScratchFile( self.curDesktop ) if os.path.isfile( filename ): - os.remove( filename ) + os.remove( filename ) try: scratch = open( filename, "w" ) @@ -942,7 +941,7 @@ class JamMain(gtk.EventBox): scratch.close() except IOError, (errno, strerror): - if Config.DEBUG > 3: print "IOError:: _saveDesktop:", errno, strerror + if Config.DEBUG > 3: print "IOError:: _saveDesktop:", errno, strerror def getDesktopScratchFile( self, i ): return Config.SCRATCH_DIR+"desktop%d" % i @@ -962,19 +961,19 @@ class JamMain(gtk.EventBox): self.setTempo( TTTable.tempo ) except IOError, (errno, strerror): - if Config.DEBUG > 3: print "IOError:: handleJournalLoad:", errno, strerror + if Config.DEBUG > 3: print "IOError:: handleJournalLoad:", errno, strerror def handleJournalSave( self, filepath ): - + self._saveDesktop() try: streamF = open( filepath, "w" ) stream = ControlStream.TamTamOStream( streamF ) - + for i in range(10): desktop_file = self.getDesktopScratchFile( i ) - stream.desktop_store( desktop_file, i ) + stream.desktop_store( desktop_file, i ) stream.desktop_set( self.curDesktop ) @@ -984,7 +983,7 @@ class JamMain(gtk.EventBox): streamF.close() except IOError, (errno, strerror): - if Config.DEBUG > 3: print "IOError:: handleJournalSave:", errno, strerror + if Config.DEBUG > 3: print "IOError:: handleJournalSave:", errno, strerror #========================================================== # Network @@ -1000,7 +999,7 @@ class JamMain(gtk.EventBox): self.syncTimeout = gobject.timeout_add( 1000, self.updateSync ) def joined( self, activity ): - if Config.DEBUG: + if Config.DEBUG: print "miniTamTam:: joined activity!!" for buddy in self.activity._shared_activity.get_joined_buddies(): print buddy.props.ip4_address @@ -1150,5 +1149,3 @@ class JamMain(gtk.EventBox): #print "correct:: %f ticks, %f ticks in, %f expected, %f err, correct %f" % (curTick, curTicksIn, ticksIn, err, correct) if abs(err) > 0.25: self.csnd.adjustTick(-err) - - diff --git a/TamTamJam.activity/Jam/Picker.py b/TamTamJam.activity/Jam/Picker.py index 33cdb86..167904c 100644 --- a/TamTamJam.activity/Jam/Picker.py +++ b/TamTamJam.activity/Jam/Picker.py @@ -227,8 +227,9 @@ class Drum( Picker ): self.instrumentDB = InstrumentDB.getRef() - for inst in self.instrumentDB.getSet( "kit" ): - self.addBlock( inst.id ) + for inst in self.instrumentDB.getSet( "percussions" ): + if Config.INSTRUMENTS[inst.name].kit: + self.addBlock( inst.id ) def addBlock( self, id ): # match data structure of Block.Drum diff --git a/TamTamJam.activity/MANIFEST b/TamTamJam.activity/MANIFEST index 43ca61f..fed7653 100644 --- a/TamTamJam.activity/MANIFEST +++ b/TamTamJam.activity/MANIFEST @@ -116,46 +116,46 @@ common/Resources/Loops/loop12_1.ttl common/Resources/Loops/loop12_2.ttl common/Resources/Loops/loop12_3.ttl common/Resources/Loops/loop12_4.ttl -common/Resources/Loops/loop2_0.ttl -common/Resources/Loops/loop2_1.ttl -common/Resources/Loops/loop2_2.ttl -common/Resources/Loops/loop2_3.ttl -common/Resources/Loops/loop2_4.ttl -common/Resources/Loops/loop3_0.ttl -common/Resources/Loops/loop3_1.ttl -common/Resources/Loops/loop3_2.ttl -common/Resources/Loops/loop3_3.ttl -common/Resources/Loops/loop3_4.ttl -common/Resources/Loops/loop4_0.ttl -common/Resources/Loops/loop4_1.ttl -common/Resources/Loops/loop4_2.ttl -common/Resources/Loops/loop4_3.ttl -common/Resources/Loops/loop4_4.ttl -common/Resources/Loops/loop5_0.ttl -common/Resources/Loops/loop5_1.ttl -common/Resources/Loops/loop5_2.ttl -common/Resources/Loops/loop5_3.ttl -common/Resources/Loops/loop5_4.ttl -common/Resources/Loops/loop6_0.ttl -common/Resources/Loops/loop6_1.ttl -common/Resources/Loops/loop6_2.ttl -common/Resources/Loops/loop6_3.ttl -common/Resources/Loops/loop6_4.ttl -common/Resources/Loops/loop7_0.ttl -common/Resources/Loops/loop7_1.ttl -common/Resources/Loops/loop7_2.ttl -common/Resources/Loops/loop7_3.ttl -common/Resources/Loops/loop7_4.ttl -common/Resources/Loops/loop8_0.ttl -common/Resources/Loops/loop8_1.ttl -common/Resources/Loops/loop8_2.ttl -common/Resources/Loops/loop8_3.ttl -common/Resources/Loops/loop8_4.ttl -common/Resources/Loops/loop9_0.ttl -common/Resources/Loops/loop9_1.ttl -common/Resources/Loops/loop9_2.ttl -common/Resources/Loops/loop9_3.ttl -common/Resources/Loops/loop9_4.ttl +common/Resources/Loops/loop02_0.ttl +common/Resources/Loops/loop02_1.ttl +common/Resources/Loops/loop02_2.ttl +common/Resources/Loops/loop02_3.ttl +common/Resources/Loops/loop02_4.ttl +common/Resources/Loops/loop03_0.ttl +common/Resources/Loops/loop03_1.ttl +common/Resources/Loops/loop03_2.ttl +common/Resources/Loops/loop03_3.ttl +common/Resources/Loops/loop03_4.ttl +common/Resources/Loops/loop04_0.ttl +common/Resources/Loops/loop04_1.ttl +common/Resources/Loops/loop04_2.ttl +common/Resources/Loops/loop04_3.ttl +common/Resources/Loops/loop04_4.ttl +common/Resources/Loops/loop05_0.ttl +common/Resources/Loops/loop05_1.ttl +common/Resources/Loops/loop05_2.ttl +common/Resources/Loops/loop05_3.ttl +common/Resources/Loops/loop05_4.ttl +common/Resources/Loops/loop06_0.ttl +common/Resources/Loops/loop06_1.ttl +common/Resources/Loops/loop06_2.ttl +common/Resources/Loops/loop06_3.ttl +common/Resources/Loops/loop06_4.ttl +common/Resources/Loops/loop07_0.ttl +common/Resources/Loops/loop07_1.ttl +common/Resources/Loops/loop07_2.ttl +common/Resources/Loops/loop07_3.ttl +common/Resources/Loops/loop07_4.ttl +common/Resources/Loops/loop08_0.ttl +common/Resources/Loops/loop08_1.ttl +common/Resources/Loops/loop08_2.ttl +common/Resources/Loops/loop08_3.ttl +common/Resources/Loops/loop08_4.ttl +common/Resources/Loops/loop09_0.ttl +common/Resources/Loops/loop09_1.ttl +common/Resources/Loops/loop09_2.ttl +common/Resources/Loops/loop09_3.ttl +common/Resources/Loops/loop09_4.ttl common/Resources/SynthFiles/synthFile1 common/Resources/SynthFiles/synthFile2 common/Resources/SynthFiles/synthFile3 diff --git a/TamTamJam.activity/setup.py b/TamTamJam.activity/setup.py index 1f73587..f4fcf58 100644 --- a/TamTamJam.activity/setup.py +++ b/TamTamJam.activity/setup.py @@ -24,7 +24,11 @@ import os os.system('unlink common')
shutil.copytree('../common', 'common')
-bundlebuilder.start('TamTamJam')
+try:
+ bundlebuilder.start('TamTamJam')
+except:
+ os.system('rm -rf common')
+ os.system('ln -s ../common common')
#Restore the symlink
os.system('rm -rf common')
os.system('ln -s ../common common')
diff --git a/TamTamMini.activity/Config.py b/TamTamMini.activity/Config.py index 1ddfd6e..62aab60 100644 --- a/TamTamMini.activity/Config.py +++ b/TamTamMini.activity/Config.py @@ -24,7 +24,12 @@ print 'INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT #PATHS -SOUNDS_DIR = "/usr/share/tamtam/Sounds" +if os.path.isdir("/usr/share/tamtam/Sounds"): + SOUNDS_DIR = "/usr/share/tamtam/Sounds" + LIB_DIR = "/usr/share/tamtam" +else: + SOUNDS_DIR = "/usr/share/activities/TamTamEdit.activity/common/Resources/Sounds" + LIB_DIR = "/usr/share/activities/TamTamEdit.activity/common/Resources" FILES_DIR = TAM_TAM_ROOT + "/common/Resources" TUNE_DIR='/' SYNTH_DIR='/' @@ -166,7 +171,7 @@ _addInstrument( "drum3rainstick", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) _addInstrument( "drum3tambourinehigh", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) _addInstrument( "drum3tambourinelow", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) _addInstrument( "harmonica", INST_TIED, MID, 'melo', 'winds', .1531, .19188, .01792 ) -_addInstrument( "alarm", INST_TIED, MID, 'melo', 'concret', .02, .19133, .01 ) +_addInstrument( "alarm", INST_TIED, MID, 'melo', 'concret', 1.37555859375, 2.0286015625, .0675 ) _addInstrument( "bird", INST_TIED, MID, 'melo', 'animals', .1, 1, .05 ) _addInstrument( "cat", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) _addInstrument( "duck2", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) @@ -186,7 +191,7 @@ _addInstrument( "cling", INST_TIED, MID, 'melo', 'keyboard', .09096, .7878, .180 _addInstrument( "byke", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "door", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "basse", INST_TIED, MID, 'melo', 'strings', 0.50470875, 0.833315, 0.09375 ) -_addInstrument( "acguit", INST_TIED, MID, 'melo', 'strings', 0.5123225, 0.7491675, 0.08475 ) +_addInstrument( "acguit", INST_TIED, MID, 'melo', 'strings', 1.4037, 1.84235625, 0.2 ) _addInstrument( "diceinst", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "didjeridu", INST_TIED, LOW, 'melo', 'winds', .55669, 1.73704, .09178 ) _addInstrument( "harmonium", INST_TIED, MID, 'melo', 'keyboard', .04674, .41073, .18384 ) @@ -237,7 +242,7 @@ _addInstrument( "drum5agogoaigu", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) _addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) _addInstrument( "camera", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "car", INST_TIED, MID, 'melo', 'concret', .67, 1.05761, .01 ) -#_addInstrument( "cello", INST_TIED, MID, 'melo', 'strings', .194, .7211, .017 ) +_addInstrument( "cello", INST_TIED, MID, 'melo', 'strings', 0.4761, 0.92244375, 0.19125 ) _addInstrument( "chimes", INST_TIED, MID, 'melo', 'percussions', .09, 2.97633, .01 ) _addInstrument( "crash", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guit2", INST_TIED, MID, 'melo', 'strings', .33, 1.1583, .02 ) @@ -377,7 +382,10 @@ UNLOAD_TABLES_COMMAND = \ ################# LANGUAGE = 'En' -IMAGE_ROOT = "/usr/share/tamtam/Images/" +if os.path.isdir("/usr/share/tamtam/Images"): + IMAGE_ROOT = '/usr/share/tamtam/Images/' +else: + IMAGE_ROOT = "/usr/share/activities/TamTamEdit.activity/common/Resources/Images/" MAIN_WINDOW_PADDING = 5 BG_COLOR = '#404040' diff --git a/TamTamMini.activity/setup.py b/TamTamMini.activity/setup.py index 87a6a08..99b805d 100644 --- a/TamTamMini.activity/setup.py +++ b/TamTamMini.activity/setup.py @@ -24,7 +24,11 @@ import os os.system('unlink common')
shutil.copytree('../common', 'common')
-bundlebuilder.start('TamTamMini')
+try:
+ bundlebuilder.start('TamTamMini')
+except:
+ os.system('rm -rf common')
+ os.system('ln -s ../common common')
#Restore the symlink
os.system('rm -rf common')
os.system('ln -s ../common common')
diff --git a/TamTamSynthLab.activity/MANIFEST b/TamTamSynthLab.activity/MANIFEST index a757536..37a2ede 100644 --- a/TamTamSynthLab.activity/MANIFEST +++ b/TamTamSynthLab.activity/MANIFEST @@ -126,16 +126,6 @@ common/Resources/crop.csd common/Resources/tamtamorc.csd common/Resources/tooltips_en.py common/Resources/tooltips_fr.py -common/Resources/Desktops/desktop0 -common/Resources/Desktops/desktop1 -common/Resources/Desktops/desktop2 -common/Resources/Desktops/desktop3 -common/Resources/Desktops/desktop4 -common/Resources/Desktops/desktop5 -common/Resources/Desktops/desktop6 -common/Resources/Desktops/desktop7 -common/Resources/Desktops/desktop8 -common/Resources/Desktops/desktop9 common/Resources/SynthFiles/synthFile1 common/Resources/SynthFiles/synthFile2 common/Resources/SynthFiles/synthFile3 diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py index a16ffe3..5778375 100755 --- a/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py +++ b/TamTamSynthLab.activity/SynthLab/SynthLabConstants.py @@ -180,7 +180,7 @@ class SynthLabConstants: VCO_WAVEFORMS = [_('Sawtooth'), _('Square'), _('Triangle')] FSLOPE = FSLOPE GAIN = GAIN - VCO_INFO = _('') + VCO_INFO = _('A voltage-controlled oscillator or VCO is an electronic oscillator designed to be controlled in oscillation frequency by a voltage input. What is used here is a digital simulation of this analog concept.') VCO_PARA1 = _('') VCO_PARA2 = _('') VCO_PARA3 = _('') @@ -191,7 +191,7 @@ class SynthLabConstants: LFILTER = _('Lowpass Filter') VIBRATO = _('Vibrato') GAIN = GAIN - PLUCK_INFO = _('') + PLUCK_INFO = _('An emulation of a method of playing musical instruments called Pizzicato. One plucks a stringed instrument with the finger to make a sound distinct from strumming or bowing.') PLUCK_PARA1 = _('') PLUCK_PARA2 = _('') PLUCK_PARA3 = _('') @@ -203,7 +203,7 @@ class SynthLabConstants: FREQ = FREQ BANDWITH = _('Bandwith') GAIN = GAIN - NOISE_INFO = _('') + NOISE_INFO = _('White noise is an audio signal with equal energy per cycle (hertz). Pink noise is flat in logarithmic space; it has equal power in bands that are proportionally wide. The gaussian curve is used to shape the signal in a bell-like manner placing the percieved energy of the signal within a more confined range.') NOISE_PARA1 = _('') NOISE_PARA2 = _('') NOISE_PARA3 = _('') @@ -215,7 +215,7 @@ class SynthLabConstants: SAMPLE_NAMES = _('Sample name') LFILTER = LFILTER GAIN = GAIN - SAMPLE_INFO = _('') + SAMPLE_INFO = _('In music, sampling is the act of taking a portion, or sample, of a sound recording and reusing it as an instrument or element of a new recording.') SAMPLE_PARA1 = _('') SAMPLE_PARA2 = _('') SAMPLE_PARA3 = _('') @@ -249,7 +249,7 @@ class SynthLabConstants: SPREAD = _('Spread') WAVE = _('Waveform') GAIN = GAIN - ADDSYNTH_INFO = _('') + ADDSYNTH_INFO = _('Additive synthesis is a technique of audio synthesis which creates musical timbre by combining numerous waveforms pitched to different harmonics, with a different amplitude envelope on each, along with inharmonic artefacts.') ADDSYNTH_PARA1 = _('') ADDSYNTH_PARA2 = _('') ADDSYNTH_PARA3 = _('') @@ -261,7 +261,7 @@ class SynthLabConstants: LFILTER = LFILTER FEEDBACK = _('Feedback') GAIN = GAIN - DELAY_INFO = _('') + DELAY_INFO = _('Delay is an audio effect which records an input signal and then plays it back after a period of time.') DELAY_PARA1 = _('') DELAY_PARA2 = _('') DELAY_PARA3 = _('') @@ -270,9 +270,9 @@ class SynthLabConstants: DIST = _('Distortion') FREQ = FREQ RESON = _('Resonance') - DISTL = _('Distotion Level') + DISTL = _('Distortion Level') GAIN = GAIN - DIST_INFO = _('') + DIST_INFO = _("Distortion is the deformation of a waveform when compared to it's shape at the input") DIST_PARA1 = _('') DIST_PARA2 = _('') DIST_PARA3 = _('') @@ -284,7 +284,7 @@ class SynthLabConstants: FTYPE = _('Type') FILTER_TYPES = [_('Lowpass'), _('Highpass'), _('Bandpass')] GAIN = GAIN - FILTER_INFO = _('') + FILTER_INFO = _('An audio filter is designed to pass some frequency regions through unattenuated while significantly attenuating others.') FILTER_PARA1 = _('') FILTER_PARA2 = _('') FILTER_PARA3 = _('') @@ -296,7 +296,7 @@ class SynthLabConstants: WAVEFORM = WAVEFORM LFO_WAVEFORMS = LFO_WAVEFORMS GAIN = GAIN - RINGMOD_INFO = _('') + RINGMOD_INFO = _('Ring modulation is an audio effect performed by multiplying two audio signals. It produces a signal rich in overtones, suitable for producing bell-like or otherwise metallic sounds.') RINGMOD_PARA1 = _('') RINGMOD_PARA2 = _('') RINGMOD_PARA3 = _('') @@ -307,7 +307,7 @@ class SynthLabConstants: REVERBF = _('Lowpass Filter') REVERBL = _('Reverb Level') GAIN = GAIN - REVERB_INFO = _('Reverberation is the persistence od sound in a particular space after the original sound is removed.') + REVERB_INFO = _('Reverberation is the persistence of sound in a particular space after the original sound is removed.') REVERB_PARA1 = _('') REVERB_PARA2 = _('') REVERB_PARA3 = _('') diff --git a/TamTamSynthLab.activity/setup.py b/TamTamSynthLab.activity/setup.py index c58f78c..65c27a0 100644 --- a/TamTamSynthLab.activity/setup.py +++ b/TamTamSynthLab.activity/setup.py @@ -24,7 +24,11 @@ import os os.system('unlink common')
shutil.copytree('../common', 'common')
-bundlebuilder.start('TamTamSynthLab')
+try:
+ bundlebuilder.start('TamTamSynthLab')
+except:
+ os.system('rm -rf common')
+ os.system('ln -s ../common common')
#Restore the symlink
os.system('rm -rf common')
os.system('ln -s ../common common')
diff --git a/common/Config.py b/common/Config.py index 62bd1f6..1ee8998 100644 --- a/common/Config.py +++ b/common/Config.py @@ -24,9 +24,13 @@ print 'INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT #PATHS -SOUNDS_DIR = "/usr/share/tamtam/Sounds" +if os.path.isdir("/usr/share/tamtam/Sounds"): + SOUNDS_DIR = "/usr/share/tamtam/Sounds" + LIB_DIR = "/usr/share/tamtam" +else: + SOUNDS_DIR = "/usr/share/activities/TamTamEdit.activity/common/Resources/Sounds" + LIB_DIR = "/usr/share/activities/TamTamEdit.activity/common/Resources" FILES_DIR = TAM_TAM_ROOT + "/common/Resources" -LIB_DIR = "/usr/share/tamtam" TUNE_DIR='/' SYNTH_DIR='/' if SugarMode == True: @@ -110,64 +114,64 @@ def _addInstrument( name, csoundInstrumentId, instrumentRegister, soundClass, ca _nextInstrumentId[0] += 1 -_addInstrument( "mic1", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 ) -_addInstrument( "mic2", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 ) -_addInstrument( "mic3", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 ) -_addInstrument( "mic4", INST_TIED, MID, 'melo', 'mic', .01, 1.99, .01 ) -_addInstrument( "lab1", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) -_addInstrument( "lab2", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) -_addInstrument( "lab3", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) -_addInstrument( "lab4", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) -_addInstrument( "lab5", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) -_addInstrument( "lab6", INST_SIMP, MID, 'melo', 'lab', 0, 0, 0 ) +_addInstrument( "mic1", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "mic2", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "mic3", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "mic4", INST_TIED, MID, 'melo', 'mysounds', .01, 1.99, .01 ) +_addInstrument( "lab1", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab2", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab3", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab4", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab5", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) +_addInstrument( "lab6", INST_SIMP, MID, 'melo', 'mysounds', 0, 0, 0 ) _addInstrument( "ounk", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) _addInstrument( "gam", INST_TIED, HIGH, 'melo', 'percussions', .69388, .7536, .02922 ) _addInstrument( "guit", INST_TIED, MID, 'melo', 'strings', .08592, .75126, .33571 ) _addInstrument( "koto", INST_TIED, HIGH, 'melo', 'strings', .56523, .70075, .05954 ) _addInstrument( "clarinette", INST_TIED, MID, 'melo', 'winds', .57905, .73319, .04934 ) _addInstrument( "flute", INST_TIED, MID, 'melo', 'winds', .47169, .53693, .02481 ) -_addInstrument( "drum1hatpedal", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1hatshoulder", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1hardride", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1ridebell", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1snare", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1snaresidestick", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1crash", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1splash", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1tom", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1floortom", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0) -_addInstrument( "drum1chine", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum1kick", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) +_addInstrument( "drum1hatpedal", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1hatshoulder", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1hardride", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1ridebell", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1snare", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1snaresidestick", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1crash", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1splash", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1tom", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1floortom", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0) +_addInstrument( "drum1chine", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum1kick", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) _addInstrument( "piano", INST_TIED, MID, 'melo', 'keyboard', 0.8883, 1.420524, .13575 ) _addInstrument( "dog", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) _addInstrument( "duck", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) -_addInstrument( "drum2darbukadoom", INST_SIMP, LOW, 'drum', 'drum', 0, 0 ,0 ) -_addInstrument( "drum2darbukapied", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukapiedsoft", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2hatflanger", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukatak", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukafinger", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukaroll", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2darbukaslap", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2hatpied", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2tambourinepied", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2hatpied2", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum2tambourinepiedsoft", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3cowbell", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3cowbelltip", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0) -_addInstrument( "drum3cup", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembelow", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembemid", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembesidestick", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembeslap", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3djembestickmid", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3metalstand", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3pedalperc", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3rainstick", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3tambourinehigh", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum3tambourinelow", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) +_addInstrument( "drum2darbukadoom", INST_SIMP, LOW, 'drum', 'percussions', 0, 0 ,0 ) +_addInstrument( "drum2darbukapied", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukapiedsoft", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2hatflanger", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukatak", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukafinger", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukaroll", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2darbukaslap", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2hatpied", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2tambourinepied", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2hatpied2", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum2tambourinepiedsoft", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3cowbell", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3cowbelltip", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0) +_addInstrument( "drum3cup", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembelow", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembemid", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembesidestick", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembeslap", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3djembestickmid", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3metalstand", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3pedalperc", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3rainstick", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3tambourinehigh", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum3tambourinelow", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) _addInstrument( "harmonica", INST_TIED, MID, 'melo', 'winds', .1531, .19188, .01792 ) -_addInstrument( "alarm", INST_TIED, MID, 'melo', 'concret', .02, .19133, .01 ) +_addInstrument( "alarm", INST_TIED, MID, 'melo', 'concret', 1.37555859375, 2.0286015625, .0675 ) _addInstrument( "bird", INST_TIED, MID, 'melo', 'animals', .1, 1, .05 ) _addInstrument( "cat", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) _addInstrument( "duck2", INST_SIMP, MID, 'melo', 'animals', 0, 0, 0 ) @@ -187,7 +191,7 @@ _addInstrument( "cling", INST_TIED, MID, 'melo', 'keyboard', .09096, .7878, .180 _addInstrument( "byke", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "door", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "basse", INST_TIED, MID, 'melo', 'strings', 0.50470875, 0.833315, 0.09375 ) -_addInstrument( "acguit", INST_TIED, MID, 'melo', 'strings', 0.5123225, 0.7491675, 0.08475 ) +_addInstrument( "acguit", INST_TIED, MID, 'melo', 'strings', 1.4037, 1.84235625, 0.2 ) _addInstrument( "diceinst", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "didjeridu", INST_TIED, LOW, 'melo', 'winds', .55669, 1.73704, .09178 ) _addInstrument( "harmonium", INST_TIED, MID, 'melo', 'keyboard', .04674, .41073, .18384 ) @@ -211,34 +215,34 @@ _addInstrument( "guidice7", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guidice8", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guidice9", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guidice10", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) -_addInstrument( "drum4afrofeet", INST_SIMP, LOW, 'drum', 'drum', 0, 0 ,0 ) -_addInstrument( "drum4fingersn", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4mutecuic", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4stompbass", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tambouri", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr707clap", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr707open", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr808closed", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr808sn", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr909bass", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr909kick", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum4tr909sn", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5timablesslap", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5congagraveouvert", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5timablesaiguslap", INST_SIMP, LOW, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5congagraveferme", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5guiroretour", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5vibraslap", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5congaaiguouvert", INST_SIMP, MID, 'drum', 'drum', 0, 0 ,0 ) -_addInstrument( "drum5quicamedium", INST_SIMP, PUNCH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5quicaaigu", INST_SIMP, MID, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5agogograve", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5bongoaiguouvert", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5agogoaigu", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) -_addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'drum', 'drum', 0, 0, 0 ) +_addInstrument( "drum4afrofeet", INST_SIMP, LOW, 'drum', 'percussions', 0, 0 ,0 ) +_addInstrument( "drum4fingersn", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4mutecuic", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4stompbass", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tambouri", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr707clap", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr707open", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr808closed", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr808sn", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr909bass", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr909kick", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum4tr909sn", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5timablesslap", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5congagraveouvert", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5timablesaiguslap", INST_SIMP, LOW, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5congagraveferme", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5guiroretour", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5vibraslap", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5congaaiguouvert", INST_SIMP, MID, 'drum', 'percussions', 0, 0 ,0 ) +_addInstrument( "drum5quicamedium", INST_SIMP, PUNCH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5quicaaigu", INST_SIMP, MID, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5agogograve", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5bongoaiguouvert", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5agogoaigu", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) +_addInstrument( "drum5bongograveouvert", INST_SIMP, HIGH, 'drum', 'percussions', 0, 0, 0 ) _addInstrument( "camera", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "car", INST_TIED, MID, 'melo', 'concret', .67, 1.05761, .01 ) -#_addInstrument( "cello", INST_TIED, MID, 'melo', 'strings', .194, .7211, .017 ) +_addInstrument( "cello", INST_TIED, MID, 'melo', 'strings', 0.4761, 0.92244375, 0.19125 ) _addInstrument( "chimes", INST_TIED, MID, 'melo', 'percussions', .09, 2.97633, .01 ) _addInstrument( "crash", INST_SIMP, MID, 'melo', 'concret', 0, 0, 0 ) _addInstrument( "guit2", INST_TIED, MID, 'melo', 'strings', .33, 1.1583, .02 ) @@ -324,11 +328,11 @@ DRUM5KIT = { 24 : INSTRUMENTS["drum5timablesslap"], 46 : INSTRUMENTS["drum5agogograve"], 48 : INSTRUMENTS["drum5bongoaiguouvert"] } -_addInstrument( "drum1kit", 0, 0, 0, "kit", 0, 0, 0, DRUM1KIT ) -_addInstrument( "drum2kit", 0, 0, 0, "kit", 0, 0, 0, DRUM2KIT ) -_addInstrument( "drum3kit", 0, 0, 0, "kit", 0, 0, 0, DRUM3KIT ) -_addInstrument( "drum4kit", 0, 0, 0, "kit", 0, 0, 0, DRUM4KIT ) -_addInstrument( "drum5kit", 0, 0, 0, "kit", 0, 0, 0, DRUM5KIT ) +_addInstrument( "drum1kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM1KIT ) +_addInstrument( "drum2kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM2KIT ) +_addInstrument( "drum3kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM3KIT ) +_addInstrument( "drum4kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM4KIT ) +_addInstrument( "drum5kit", 0, 0, 0, "percussions", 0, 0, 0, DRUM5KIT ) INSTRUMENTSID = {} for i in INSTRUMENTS: @@ -378,7 +382,10 @@ UNLOAD_TABLES_COMMAND = \ ################# LANGUAGE = 'En' -IMAGE_ROOT = '/usr/share/tamtam/Images/' +if os.path.isdir("/usr/share/tamtam/Images"): + IMAGE_ROOT = '/usr/share/tamtam/Images/' +else: + IMAGE_ROOT = "/usr/share/activities/TamTamEdit.activity/common/Resources/Images/" MAIN_WINDOW_PADDING = 5 BG_COLOR = '#404040' diff --git a/common/Resources/Images/TamTam.png b/common/Resources/Images/TamTam.png Binary files differnew file mode 100644 index 0000000..1e1f6de --- /dev/null +++ b/common/Resources/Images/TamTam.png diff --git a/common/Resources/Images/acguit.png b/common/Resources/Images/acguit.png Binary files differnew file mode 100644 index 0000000..ed0e1ff --- /dev/null +++ b/common/Resources/Images/acguit.png diff --git a/common/Resources/Images/acguitsel.png b/common/Resources/Images/acguitsel.png Binary files differnew file mode 100644 index 0000000..cc692ef --- /dev/null +++ b/common/Resources/Images/acguitsel.png diff --git a/common/Resources/Images/alarm.png b/common/Resources/Images/alarm.png Binary files differnew file mode 100755 index 0000000..817f23c --- /dev/null +++ b/common/Resources/Images/alarm.png diff --git a/common/Resources/Images/alarmsel.png b/common/Resources/Images/alarmsel.png Binary files differnew file mode 100755 index 0000000..cbf2f79 --- /dev/null +++ b/common/Resources/Images/alarmsel.png diff --git a/common/Resources/Images/all.png b/common/Resources/Images/all.png Binary files differnew file mode 100644 index 0000000..ee3534b --- /dev/null +++ b/common/Resources/Images/all.png diff --git a/common/Resources/Images/allsel.png b/common/Resources/Images/allsel.png Binary files differnew file mode 100644 index 0000000..98ff02b --- /dev/null +++ b/common/Resources/Images/allsel.png diff --git a/common/Resources/Images/animals.png b/common/Resources/Images/animals.png Binary files differnew file mode 100644 index 0000000..95c802f --- /dev/null +++ b/common/Resources/Images/animals.png diff --git a/common/Resources/Images/animalssel.png b/common/Resources/Images/animalssel.png Binary files differnew file mode 100644 index 0000000..f2369fb --- /dev/null +++ b/common/Resources/Images/animalssel.png diff --git a/common/Resources/Images/arrowEditDown.png b/common/Resources/Images/arrowEditDown.png Binary files differnew file mode 100755 index 0000000..99888f7 --- /dev/null +++ b/common/Resources/Images/arrowEditDown.png diff --git a/common/Resources/Images/arrowEditDownDown.png b/common/Resources/Images/arrowEditDownDown.png Binary files differnew file mode 100755 index 0000000..20f783f --- /dev/null +++ b/common/Resources/Images/arrowEditDownDown.png diff --git a/common/Resources/Images/arrowEditDownOver.png b/common/Resources/Images/arrowEditDownOver.png Binary files differnew file mode 100755 index 0000000..3fb3d28 --- /dev/null +++ b/common/Resources/Images/arrowEditDownOver.png diff --git a/common/Resources/Images/arrowEditLeft.png b/common/Resources/Images/arrowEditLeft.png Binary files differnew file mode 100644 index 0000000..2850e64 --- /dev/null +++ b/common/Resources/Images/arrowEditLeft.png diff --git a/common/Resources/Images/arrowEditLeftDown.png b/common/Resources/Images/arrowEditLeftDown.png Binary files differnew file mode 100755 index 0000000..49ccb5f --- /dev/null +++ b/common/Resources/Images/arrowEditLeftDown.png diff --git a/common/Resources/Images/arrowEditLeftOver.png b/common/Resources/Images/arrowEditLeftOver.png Binary files differnew file mode 100755 index 0000000..8dcf71d --- /dev/null +++ b/common/Resources/Images/arrowEditLeftOver.png diff --git a/common/Resources/Images/arrowEditRight.png b/common/Resources/Images/arrowEditRight.png Binary files differnew file mode 100644 index 0000000..4046205 --- /dev/null +++ b/common/Resources/Images/arrowEditRight.png diff --git a/common/Resources/Images/arrowEditRightDown.png b/common/Resources/Images/arrowEditRightDown.png Binary files differnew file mode 100755 index 0000000..b38037d --- /dev/null +++ b/common/Resources/Images/arrowEditRightDown.png diff --git a/common/Resources/Images/arrowEditRightOver.png b/common/Resources/Images/arrowEditRightOver.png Binary files differnew file mode 100755 index 0000000..3f4502a --- /dev/null +++ b/common/Resources/Images/arrowEditRightOver.png diff --git a/common/Resources/Images/arrowEditUp.png b/common/Resources/Images/arrowEditUp.png Binary files differnew file mode 100755 index 0000000..8ad3a2f --- /dev/null +++ b/common/Resources/Images/arrowEditUp.png diff --git a/common/Resources/Images/arrowEditUpDown.png b/common/Resources/Images/arrowEditUpDown.png Binary files differnew file mode 100755 index 0000000..5ca1742 --- /dev/null +++ b/common/Resources/Images/arrowEditUpDown.png diff --git a/common/Resources/Images/arrowEditUpOver.png b/common/Resources/Images/arrowEditUpOver.png Binary files differnew file mode 100755 index 0000000..5b76e31 --- /dev/null +++ b/common/Resources/Images/arrowEditUpOver.png diff --git a/common/Resources/Images/basse.png b/common/Resources/Images/basse.png Binary files differnew file mode 100644 index 0000000..93d9a13 --- /dev/null +++ b/common/Resources/Images/basse.png diff --git a/common/Resources/Images/bassesel.png b/common/Resources/Images/bassesel.png Binary files differnew file mode 100644 index 0000000..ea8b65c --- /dev/null +++ b/common/Resources/Images/bassesel.png diff --git a/common/Resources/Images/beat1.png b/common/Resources/Images/beat1.png Binary files differnew file mode 100644 index 0000000..104be63 --- /dev/null +++ b/common/Resources/Images/beat1.png diff --git a/common/Resources/Images/beat10.png b/common/Resources/Images/beat10.png Binary files differnew file mode 100644 index 0000000..f584b30 --- /dev/null +++ b/common/Resources/Images/beat10.png diff --git a/common/Resources/Images/beat11.png b/common/Resources/Images/beat11.png Binary files differnew file mode 100644 index 0000000..3b977ad --- /dev/null +++ b/common/Resources/Images/beat11.png diff --git a/common/Resources/Images/beat2.png b/common/Resources/Images/beat2.png Binary files differnew file mode 100644 index 0000000..b3b19d3 --- /dev/null +++ b/common/Resources/Images/beat2.png diff --git a/common/Resources/Images/beat3.png b/common/Resources/Images/beat3.png Binary files differnew file mode 100644 index 0000000..4e5c73a --- /dev/null +++ b/common/Resources/Images/beat3.png diff --git a/common/Resources/Images/beat4.png b/common/Resources/Images/beat4.png Binary files differnew file mode 100644 index 0000000..e3c3aea --- /dev/null +++ b/common/Resources/Images/beat4.png diff --git a/common/Resources/Images/beat5.png b/common/Resources/Images/beat5.png Binary files differnew file mode 100644 index 0000000..54846dd --- /dev/null +++ b/common/Resources/Images/beat5.png diff --git a/common/Resources/Images/beat6.png b/common/Resources/Images/beat6.png Binary files differnew file mode 100644 index 0000000..9f9664f --- /dev/null +++ b/common/Resources/Images/beat6.png diff --git a/common/Resources/Images/beat7.png b/common/Resources/Images/beat7.png Binary files differnew file mode 100644 index 0000000..cec399d --- /dev/null +++ b/common/Resources/Images/beat7.png diff --git a/common/Resources/Images/beat8.png b/common/Resources/Images/beat8.png Binary files differnew file mode 100644 index 0000000..7f4d7e5 --- /dev/null +++ b/common/Resources/Images/beat8.png diff --git a/common/Resources/Images/beat9.png b/common/Resources/Images/beat9.png Binary files differnew file mode 100644 index 0000000..1b18084 --- /dev/null +++ b/common/Resources/Images/beat9.png diff --git a/common/Resources/Images/bird.png b/common/Resources/Images/bird.png Binary files differnew file mode 100644 index 0000000..a0c0fb1 --- /dev/null +++ b/common/Resources/Images/bird.png diff --git a/common/Resources/Images/birdsel.png b/common/Resources/Images/birdsel.png Binary files differnew file mode 100644 index 0000000..60f75b8 --- /dev/null +++ b/common/Resources/Images/birdsel.png diff --git a/common/Resources/Images/bottle.png b/common/Resources/Images/bottle.png Binary files differnew file mode 100644 index 0000000..634fcca --- /dev/null +++ b/common/Resources/Images/bottle.png diff --git a/common/Resources/Images/bottlesel.png b/common/Resources/Images/bottlesel.png Binary files differnew file mode 100644 index 0000000..f93d01b --- /dev/null +++ b/common/Resources/Images/bottlesel.png diff --git a/common/Resources/Images/bubbles.png b/common/Resources/Images/bubbles.png Binary files differnew file mode 100755 index 0000000..ba52212 --- /dev/null +++ b/common/Resources/Images/bubbles.png diff --git a/common/Resources/Images/bubblessel.png b/common/Resources/Images/bubblessel.png Binary files differnew file mode 100755 index 0000000..6aea349 --- /dev/null +++ b/common/Resources/Images/bubblessel.png diff --git a/common/Resources/Images/byke.png b/common/Resources/Images/byke.png Binary files differnew file mode 100755 index 0000000..5b4796c --- /dev/null +++ b/common/Resources/Images/byke.png diff --git a/common/Resources/Images/bykesel.png b/common/Resources/Images/bykesel.png Binary files differnew file mode 100755 index 0000000..a6b0943 --- /dev/null +++ b/common/Resources/Images/bykesel.png diff --git a/common/Resources/Images/camera.png b/common/Resources/Images/camera.png Binary files differnew file mode 100755 index 0000000..b5c460d --- /dev/null +++ b/common/Resources/Images/camera.png diff --git a/common/Resources/Images/camerasel.png b/common/Resources/Images/camerasel.png Binary files differnew file mode 100755 index 0000000..feb84bc --- /dev/null +++ b/common/Resources/Images/camerasel.png diff --git a/common/Resources/Images/car.png b/common/Resources/Images/car.png Binary files differnew file mode 100755 index 0000000..1f8ad8d --- /dev/null +++ b/common/Resources/Images/car.png diff --git a/common/Resources/Images/carsel.png b/common/Resources/Images/carsel.png Binary files differnew file mode 100755 index 0000000..76287a7 --- /dev/null +++ b/common/Resources/Images/carsel.png diff --git a/common/Resources/Images/cat.png b/common/Resources/Images/cat.png Binary files differnew file mode 100644 index 0000000..28151c3 --- /dev/null +++ b/common/Resources/Images/cat.png diff --git a/common/Resources/Images/catsel.png b/common/Resources/Images/catsel.png Binary files differnew file mode 100644 index 0000000..2ca1472 --- /dev/null +++ b/common/Resources/Images/catsel.png diff --git a/common/Resources/Images/cello.png b/common/Resources/Images/cello.png Binary files differnew file mode 100755 index 0000000..750a0bc --- /dev/null +++ b/common/Resources/Images/cello.png diff --git a/common/Resources/Images/cellosel.png b/common/Resources/Images/cellosel.png Binary files differnew file mode 100755 index 0000000..dc3ac53 --- /dev/null +++ b/common/Resources/Images/cellosel.png diff --git a/common/Resources/Images/check.png b/common/Resources/Images/check.png Binary files differnew file mode 100644 index 0000000..187546b --- /dev/null +++ b/common/Resources/Images/check.png diff --git a/common/Resources/Images/checkOff.svg b/common/Resources/Images/checkOff.svg new file mode 100644 index 0000000..9357b87 --- /dev/null +++ b/common/Resources/Images/checkOff.svg @@ -0,0 +1,7 @@ +<?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="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
+<rect x="1" y="1" fill="#FFFFFF" stroke="#000000" stroke-width="2" width="20" height="20"/>
+</svg>
diff --git a/common/Resources/Images/checkOn.svg b/common/Resources/Images/checkOn.svg new file mode 100644 index 0000000..5b91ddf --- /dev/null +++ b/common/Resources/Images/checkOn.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="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
+<rect x="1" y="1" fill="#FFFFFF" stroke="#000000" stroke-width="2" width="20" height="20"/>
+<g>
+ <path d="M17.021,6.637c0.312,0,0.624,0.048,0.96,0.143c0.144,0.048,0.264,0.12,0.264,0.191c0,0.071-0.048,0.119-0.192,0.143
+ c-0.288,0.024-0.695,0.215-0.912,0.358c-1.68,1.002-6.192,4.701-9.264,7.947c-0.288,0.286-0.625,0.215-0.576,0.047
+ c0.168-0.501,0.312-2.911,0.096-4.009c-0.048-0.286-0.216-0.597-0.672-0.549c-0.144,0.024-0.288,0.024-0.288-0.072
+ c0-0.071,0.12-0.143,0.264-0.191c0.312-0.119,0.744-0.167,0.96-0.167c0.528,0,1.056,0.143,1.176,0.668
+ c0.192,0.788-0.024,2.171-1.008,4.033c2.472-3.604,4.896-6.3,6.528-7.469C15.028,7.234,16.156,6.637,17.021,6.637z"/>
+</g>
+</svg>
diff --git a/common/Resources/Images/chimes.png b/common/Resources/Images/chimes.png Binary files differnew file mode 100755 index 0000000..5c0873a --- /dev/null +++ b/common/Resources/Images/chimes.png diff --git a/common/Resources/Images/chimessel.png b/common/Resources/Images/chimessel.png Binary files differnew file mode 100755 index 0000000..a700720 --- /dev/null +++ b/common/Resources/Images/chimessel.png diff --git a/common/Resources/Images/clang.png b/common/Resources/Images/clang.png Binary files differnew file mode 100644 index 0000000..f6586fb --- /dev/null +++ b/common/Resources/Images/clang.png diff --git a/common/Resources/Images/clangsel.png b/common/Resources/Images/clangsel.png Binary files differnew file mode 100644 index 0000000..9f5a289 --- /dev/null +++ b/common/Resources/Images/clangsel.png diff --git a/common/Resources/Images/clarinette.png b/common/Resources/Images/clarinette.png Binary files differnew file mode 100644 index 0000000..a3729df --- /dev/null +++ b/common/Resources/Images/clarinette.png diff --git a/common/Resources/Images/clarinettesel.png b/common/Resources/Images/clarinettesel.png Binary files differnew file mode 100644 index 0000000..119ec6d --- /dev/null +++ b/common/Resources/Images/clarinettesel.png diff --git a/common/Resources/Images/cling.png b/common/Resources/Images/cling.png Binary files differnew file mode 100644 index 0000000..ff35a7e --- /dev/null +++ b/common/Resources/Images/cling.png diff --git a/common/Resources/Images/clingsel.png b/common/Resources/Images/clingsel.png Binary files differnew file mode 100644 index 0000000..0b69cd2 --- /dev/null +++ b/common/Resources/Images/clingsel.png diff --git a/common/Resources/Images/complex1.png b/common/Resources/Images/complex1.png Binary files differnew file mode 100644 index 0000000..5e9fd06 --- /dev/null +++ b/common/Resources/Images/complex1.png diff --git a/common/Resources/Images/complex2.png b/common/Resources/Images/complex2.png Binary files differnew file mode 100644 index 0000000..3a52d54 --- /dev/null +++ b/common/Resources/Images/complex2.png diff --git a/common/Resources/Images/complex3.png b/common/Resources/Images/complex3.png Binary files differnew file mode 100644 index 0000000..94d2c7e --- /dev/null +++ b/common/Resources/Images/complex3.png diff --git a/common/Resources/Images/complex4.png b/common/Resources/Images/complex4.png Binary files differnew file mode 100644 index 0000000..65ccce0 --- /dev/null +++ b/common/Resources/Images/complex4.png diff --git a/common/Resources/Images/complex5.png b/common/Resources/Images/complex5.png Binary files differnew file mode 100644 index 0000000..598b14d --- /dev/null +++ b/common/Resources/Images/complex5.png diff --git a/common/Resources/Images/complex6.png b/common/Resources/Images/complex6.png Binary files differnew file mode 100644 index 0000000..d8a030a --- /dev/null +++ b/common/Resources/Images/complex6.png diff --git a/common/Resources/Images/complex7.png b/common/Resources/Images/complex7.png Binary files differnew file mode 100644 index 0000000..f3d50fb --- /dev/null +++ b/common/Resources/Images/complex7.png diff --git a/common/Resources/Images/complex8.png b/common/Resources/Images/complex8.png Binary files differnew file mode 100644 index 0000000..5e9a0a4 --- /dev/null +++ b/common/Resources/Images/complex8.png diff --git a/common/Resources/Images/concret.png b/common/Resources/Images/concret.png Binary files differnew file mode 100644 index 0000000..038dbb4 --- /dev/null +++ b/common/Resources/Images/concret.png diff --git a/common/Resources/Images/concretsel.png b/common/Resources/Images/concretsel.png Binary files differnew file mode 100644 index 0000000..b78687c --- /dev/null +++ b/common/Resources/Images/concretsel.png diff --git a/common/Resources/Images/crash.png b/common/Resources/Images/crash.png Binary files differnew file mode 100755 index 0000000..23db01f --- /dev/null +++ b/common/Resources/Images/crash.png diff --git a/common/Resources/Images/crashsel.png b/common/Resources/Images/crashsel.png Binary files differnew file mode 100755 index 0000000..38dba22 --- /dev/null +++ b/common/Resources/Images/crashsel.png diff --git a/common/Resources/Images/dice.png b/common/Resources/Images/dice.png Binary files differnew file mode 100644 index 0000000..47441b7 --- /dev/null +++ b/common/Resources/Images/dice.png diff --git a/common/Resources/Images/diceProp.png b/common/Resources/Images/diceProp.png Binary files differnew file mode 100644 index 0000000..887a6fb --- /dev/null +++ b/common/Resources/Images/diceProp.png diff --git a/common/Resources/Images/dicePropSel.png b/common/Resources/Images/dicePropSel.png Binary files differnew file mode 100644 index 0000000..13c5779 --- /dev/null +++ b/common/Resources/Images/dicePropSel.png diff --git a/common/Resources/Images/diceblur.png b/common/Resources/Images/diceblur.png Binary files differnew file mode 100644 index 0000000..f275422 --- /dev/null +++ b/common/Resources/Images/diceblur.png diff --git a/common/Resources/Images/diceinst.png b/common/Resources/Images/diceinst.png Binary files differnew file mode 100644 index 0000000..9fda10f --- /dev/null +++ b/common/Resources/Images/diceinst.png diff --git a/common/Resources/Images/diceinstsel.png b/common/Resources/Images/diceinstsel.png Binary files differnew file mode 100644 index 0000000..782b100 --- /dev/null +++ b/common/Resources/Images/diceinstsel.png diff --git a/common/Resources/Images/didjeridu.png b/common/Resources/Images/didjeridu.png Binary files differnew file mode 100644 index 0000000..a14b863 --- /dev/null +++ b/common/Resources/Images/didjeridu.png diff --git a/common/Resources/Images/didjeridusel.png b/common/Resources/Images/didjeridusel.png Binary files differnew file mode 100644 index 0000000..a836b71 --- /dev/null +++ b/common/Resources/Images/didjeridusel.png diff --git a/common/Resources/Images/dog.png b/common/Resources/Images/dog.png Binary files differnew file mode 100644 index 0000000..942e5aa --- /dev/null +++ b/common/Resources/Images/dog.png diff --git a/common/Resources/Images/dogsel.png b/common/Resources/Images/dogsel.png Binary files differnew file mode 100644 index 0000000..f5458a3 --- /dev/null +++ b/common/Resources/Images/dogsel.png diff --git a/common/Resources/Images/door.png b/common/Resources/Images/door.png Binary files differnew file mode 100644 index 0000000..15c95b2 --- /dev/null +++ b/common/Resources/Images/door.png diff --git a/common/Resources/Images/doorsel.png b/common/Resources/Images/doorsel.png Binary files differnew file mode 100644 index 0000000..a95f616 --- /dev/null +++ b/common/Resources/Images/doorsel.png diff --git a/common/Resources/Images/dru0.png b/common/Resources/Images/dru0.png Binary files differnew file mode 100755 index 0000000..eb8227c --- /dev/null +++ b/common/Resources/Images/dru0.png diff --git a/common/Resources/Images/dru1.png b/common/Resources/Images/dru1.png Binary files differnew file mode 100755 index 0000000..e5c8698 --- /dev/null +++ b/common/Resources/Images/dru1.png diff --git a/common/Resources/Images/dru2.png b/common/Resources/Images/dru2.png Binary files differnew file mode 100755 index 0000000..7f5dba0 --- /dev/null +++ b/common/Resources/Images/dru2.png diff --git a/common/Resources/Images/dru3.png b/common/Resources/Images/dru3.png Binary files differnew file mode 100755 index 0000000..dcfd922 --- /dev/null +++ b/common/Resources/Images/dru3.png diff --git a/common/Resources/Images/dru4.png b/common/Resources/Images/dru4.png Binary files differnew file mode 100755 index 0000000..7718e36 --- /dev/null +++ b/common/Resources/Images/dru4.png diff --git a/common/Resources/Images/drum1kit.png b/common/Resources/Images/drum1kit.png Binary files differnew file mode 100644 index 0000000..e98ec33 --- /dev/null +++ b/common/Resources/Images/drum1kit.png diff --git a/common/Resources/Images/drum1kitsel.png b/common/Resources/Images/drum1kitsel.png Binary files differnew file mode 100644 index 0000000..aa9a1e0 --- /dev/null +++ b/common/Resources/Images/drum1kitsel.png diff --git a/common/Resources/Images/drum1kitselgen.png b/common/Resources/Images/drum1kitselgen.png Binary files differnew file mode 100644 index 0000000..f78a18e --- /dev/null +++ b/common/Resources/Images/drum1kitselgen.png diff --git a/common/Resources/Images/drum2kit.png b/common/Resources/Images/drum2kit.png Binary files differnew file mode 100644 index 0000000..76d12d7 --- /dev/null +++ b/common/Resources/Images/drum2kit.png diff --git a/common/Resources/Images/drum2kitsel.png b/common/Resources/Images/drum2kitsel.png Binary files differnew file mode 100644 index 0000000..1101b8a --- /dev/null +++ b/common/Resources/Images/drum2kitsel.png diff --git a/common/Resources/Images/drum2kitselgen.png b/common/Resources/Images/drum2kitselgen.png Binary files differnew file mode 100644 index 0000000..6027918 --- /dev/null +++ b/common/Resources/Images/drum2kitselgen.png diff --git a/common/Resources/Images/drum3kit.png b/common/Resources/Images/drum3kit.png Binary files differnew file mode 100644 index 0000000..38975a2 --- /dev/null +++ b/common/Resources/Images/drum3kit.png diff --git a/common/Resources/Images/drum3kitsel.png b/common/Resources/Images/drum3kitsel.png Binary files differnew file mode 100644 index 0000000..7200e89 --- /dev/null +++ b/common/Resources/Images/drum3kitsel.png diff --git a/common/Resources/Images/drum3kitselgen.png b/common/Resources/Images/drum3kitselgen.png Binary files differnew file mode 100644 index 0000000..ecfb61b --- /dev/null +++ b/common/Resources/Images/drum3kitselgen.png diff --git a/common/Resources/Images/drum4kit.png b/common/Resources/Images/drum4kit.png Binary files differnew file mode 100644 index 0000000..a928080 --- /dev/null +++ b/common/Resources/Images/drum4kit.png diff --git a/common/Resources/Images/drum4kitsel.png b/common/Resources/Images/drum4kitsel.png Binary files differnew file mode 100644 index 0000000..8d012df --- /dev/null +++ b/common/Resources/Images/drum4kitsel.png diff --git a/common/Resources/Images/drum4kitselgen.png b/common/Resources/Images/drum4kitselgen.png Binary files differnew file mode 100644 index 0000000..02a62c6 --- /dev/null +++ b/common/Resources/Images/drum4kitselgen.png diff --git a/common/Resources/Images/drum5kit.png b/common/Resources/Images/drum5kit.png Binary files differnew file mode 100644 index 0000000..6213770 --- /dev/null +++ b/common/Resources/Images/drum5kit.png diff --git a/common/Resources/Images/drum5kitsel.png b/common/Resources/Images/drum5kitsel.png Binary files differnew file mode 100644 index 0000000..eec29b5 --- /dev/null +++ b/common/Resources/Images/drum5kitsel.png diff --git a/common/Resources/Images/drum5kitselgen.png b/common/Resources/Images/drum5kitselgen.png Binary files differnew file mode 100644 index 0000000..2208d55 --- /dev/null +++ b/common/Resources/Images/drum5kitselgen.png diff --git a/common/Resources/Images/duck.png b/common/Resources/Images/duck.png Binary files differnew file mode 100644 index 0000000..9c75bd8 --- /dev/null +++ b/common/Resources/Images/duck.png diff --git a/common/Resources/Images/duck2.png b/common/Resources/Images/duck2.png Binary files differnew file mode 100644 index 0000000..4ef2f28 --- /dev/null +++ b/common/Resources/Images/duck2.png diff --git a/common/Resources/Images/duck2sel.png b/common/Resources/Images/duck2sel.png Binary files differnew file mode 100644 index 0000000..b3f5c5f --- /dev/null +++ b/common/Resources/Images/duck2sel.png diff --git a/common/Resources/Images/ducksel.png b/common/Resources/Images/ducksel.png Binary files differnew file mode 100644 index 0000000..0bc3243 --- /dev/null +++ b/common/Resources/Images/ducksel.png diff --git a/common/Resources/Images/editTam.png b/common/Resources/Images/editTam.png Binary files differnew file mode 100644 index 0000000..b27e33e --- /dev/null +++ b/common/Resources/Images/editTam.png diff --git a/common/Resources/Images/editTamDown.png b/common/Resources/Images/editTamDown.png Binary files differnew file mode 100644 index 0000000..b7ad8b3 --- /dev/null +++ b/common/Resources/Images/editTamDown.png diff --git a/common/Resources/Images/editTamOver.png b/common/Resources/Images/editTamOver.png Binary files differnew file mode 100644 index 0000000..233624d --- /dev/null +++ b/common/Resources/Images/editTamOver.png diff --git a/common/Resources/Images/electronic.png b/common/Resources/Images/electronic.png Binary files differnew file mode 100644 index 0000000..37a7e6f --- /dev/null +++ b/common/Resources/Images/electronic.png diff --git a/common/Resources/Images/electronicsel.png b/common/Resources/Images/electronicsel.png Binary files differnew file mode 100644 index 0000000..bd6fceb --- /dev/null +++ b/common/Resources/Images/electronicsel.png diff --git a/common/Resources/Images/flute.png b/common/Resources/Images/flute.png Binary files differnew file mode 100644 index 0000000..43e128b --- /dev/null +++ b/common/Resources/Images/flute.png diff --git a/common/Resources/Images/flutesel.png b/common/Resources/Images/flutesel.png Binary files differnew file mode 100644 index 0000000..9b72cf7 --- /dev/null +++ b/common/Resources/Images/flutesel.png diff --git a/common/Resources/Images/gam.png b/common/Resources/Images/gam.png Binary files differnew file mode 100644 index 0000000..02f8719 --- /dev/null +++ b/common/Resources/Images/gam.png diff --git a/common/Resources/Images/gamsel.png b/common/Resources/Images/gamsel.png Binary files differnew file mode 100644 index 0000000..ac6594f --- /dev/null +++ b/common/Resources/Images/gamsel.png diff --git a/common/Resources/Images/generic.png b/common/Resources/Images/generic.png Binary files differnew file mode 100755 index 0000000..c42119b --- /dev/null +++ b/common/Resources/Images/generic.png diff --git a/common/Resources/Images/genericsel.png b/common/Resources/Images/genericsel.png Binary files differnew file mode 100755 index 0000000..2cbdb81 --- /dev/null +++ b/common/Resources/Images/genericsel.png diff --git a/common/Resources/Images/guit.png b/common/Resources/Images/guit.png Binary files differnew file mode 100644 index 0000000..0c2f667 --- /dev/null +++ b/common/Resources/Images/guit.png diff --git a/common/Resources/Images/guit2.png b/common/Resources/Images/guit2.png Binary files differnew file mode 100755 index 0000000..183d754 --- /dev/null +++ b/common/Resources/Images/guit2.png diff --git a/common/Resources/Images/guit2sel.png b/common/Resources/Images/guit2sel.png Binary files differnew file mode 100755 index 0000000..60641bd --- /dev/null +++ b/common/Resources/Images/guit2sel.png diff --git a/common/Resources/Images/guitsel.png b/common/Resources/Images/guitsel.png Binary files differnew file mode 100644 index 0000000..890fcb7 --- /dev/null +++ b/common/Resources/Images/guitsel.png diff --git a/common/Resources/Images/harmonica.png b/common/Resources/Images/harmonica.png Binary files differnew file mode 100644 index 0000000..d8dd849 --- /dev/null +++ b/common/Resources/Images/harmonica.png diff --git a/common/Resources/Images/harmonicasel.png b/common/Resources/Images/harmonicasel.png Binary files differnew file mode 100644 index 0000000..0814bd9 --- /dev/null +++ b/common/Resources/Images/harmonicasel.png diff --git a/common/Resources/Images/harmonium.png b/common/Resources/Images/harmonium.png Binary files differnew file mode 100644 index 0000000..3d4a605 --- /dev/null +++ b/common/Resources/Images/harmonium.png diff --git a/common/Resources/Images/harmoniumsel.png b/common/Resources/Images/harmoniumsel.png Binary files differnew file mode 100644 index 0000000..80eb2c8 --- /dev/null +++ b/common/Resources/Images/harmoniumsel.png diff --git a/common/Resources/Images/helpShow1.jpg b/common/Resources/Images/helpShow1.jpg Binary files differnew file mode 100755 index 0000000..885db27 --- /dev/null +++ b/common/Resources/Images/helpShow1.jpg diff --git a/common/Resources/Images/helpShow2.jpg b/common/Resources/Images/helpShow2.jpg Binary files differnew file mode 100755 index 0000000..009e58e --- /dev/null +++ b/common/Resources/Images/helpShow2.jpg diff --git a/common/Resources/Images/helpShow3.jpg b/common/Resources/Images/helpShow3.jpg Binary files differnew file mode 100755 index 0000000..b3858aa --- /dev/null +++ b/common/Resources/Images/helpShow3.jpg diff --git a/common/Resources/Images/helpShow4.jpg b/common/Resources/Images/helpShow4.jpg Binary files differnew file mode 100755 index 0000000..f5ef420 --- /dev/null +++ b/common/Resources/Images/helpShow4.jpg diff --git a/common/Resources/Images/helpShow5.jpg b/common/Resources/Images/helpShow5.jpg Binary files differnew file mode 100755 index 0000000..f7d47d6 --- /dev/null +++ b/common/Resources/Images/helpShow5.jpg diff --git a/common/Resources/Images/helpShow6.jpg b/common/Resources/Images/helpShow6.jpg Binary files differnew file mode 100755 index 0000000..8b548e3 --- /dev/null +++ b/common/Resources/Images/helpShow6.jpg diff --git a/common/Resources/Images/helpShow7.jpg b/common/Resources/Images/helpShow7.jpg Binary files differnew file mode 100755 index 0000000..58f6f1a --- /dev/null +++ b/common/Resources/Images/helpShow7.jpg diff --git a/common/Resources/Images/helpShow8.jpg b/common/Resources/Images/helpShow8.jpg Binary files differnew file mode 100755 index 0000000..c135fa8 --- /dev/null +++ b/common/Resources/Images/helpShow8.jpg diff --git a/common/Resources/Images/helpShow9.jpg b/common/Resources/Images/helpShow9.jpg Binary files differnew file mode 100755 index 0000000..6a1e01a --- /dev/null +++ b/common/Resources/Images/helpShow9.jpg diff --git a/common/Resources/Images/helpTam.png b/common/Resources/Images/helpTam.png Binary files differnew file mode 100644 index 0000000..b7ad8b3 --- /dev/null +++ b/common/Resources/Images/helpTam.png diff --git a/common/Resources/Images/helpTamDown.png b/common/Resources/Images/helpTamDown.png Binary files differnew file mode 100644 index 0000000..b27e33e --- /dev/null +++ b/common/Resources/Images/helpTamDown.png diff --git a/common/Resources/Images/helpTamOver.png b/common/Resources/Images/helpTamOver.png Binary files differnew file mode 100644 index 0000000..233624d --- /dev/null +++ b/common/Resources/Images/helpTamOver.png diff --git a/common/Resources/Images/hit.png b/common/Resources/Images/hit.png Binary files differnew file mode 100644 index 0000000..d81489e --- /dev/null +++ b/common/Resources/Images/hit.png diff --git a/common/Resources/Images/hitSelected.png b/common/Resources/Images/hitSelected.png Binary files differnew file mode 100644 index 0000000..20473b8 --- /dev/null +++ b/common/Resources/Images/hitSelected.png diff --git a/common/Resources/Images/horse.png b/common/Resources/Images/horse.png Binary files differnew file mode 100644 index 0000000..2c4c528 --- /dev/null +++ b/common/Resources/Images/horse.png diff --git a/common/Resources/Images/horsesel.png b/common/Resources/Images/horsesel.png Binary files differnew file mode 100644 index 0000000..c599ebe --- /dev/null +++ b/common/Resources/Images/horsesel.png diff --git a/common/Resources/Images/instr0.png b/common/Resources/Images/instr0.png Binary files differnew file mode 100755 index 0000000..8e11498 --- /dev/null +++ b/common/Resources/Images/instr0.png diff --git a/common/Resources/Images/instr1.png b/common/Resources/Images/instr1.png Binary files differnew file mode 100755 index 0000000..548870d --- /dev/null +++ b/common/Resources/Images/instr1.png diff --git a/common/Resources/Images/instr2.png b/common/Resources/Images/instr2.png Binary files differnew file mode 100755 index 0000000..ca720b3 --- /dev/null +++ b/common/Resources/Images/instr2.png diff --git a/common/Resources/Images/instr3.png b/common/Resources/Images/instr3.png Binary files differnew file mode 100755 index 0000000..8c6dc63 --- /dev/null +++ b/common/Resources/Images/instr3.png diff --git a/common/Resources/Images/instr4.png b/common/Resources/Images/instr4.png Binary files differnew file mode 100755 index 0000000..05e16ec --- /dev/null +++ b/common/Resources/Images/instr4.png diff --git a/common/Resources/Images/jam-blockMask.png b/common/Resources/Images/jam-blockMask.png Binary files differnew file mode 100644 index 0000000..dc3911f --- /dev/null +++ b/common/Resources/Images/jam-blockMask.png diff --git a/common/Resources/Images/kalimba.png b/common/Resources/Images/kalimba.png Binary files differnew file mode 100644 index 0000000..b763869 --- /dev/null +++ b/common/Resources/Images/kalimba.png diff --git a/common/Resources/Images/kalimbasel.png b/common/Resources/Images/kalimbasel.png Binary files differnew file mode 100644 index 0000000..3e55881 --- /dev/null +++ b/common/Resources/Images/kalimbasel.png diff --git a/common/Resources/Images/keyboard.png b/common/Resources/Images/keyboard.png Binary files differnew file mode 100644 index 0000000..db31de3 --- /dev/null +++ b/common/Resources/Images/keyboard.png diff --git a/common/Resources/Images/keyboardsel.png b/common/Resources/Images/keyboardsel.png Binary files differnew file mode 100644 index 0000000..c665ef1 --- /dev/null +++ b/common/Resources/Images/keyboardsel.png diff --git a/common/Resources/Images/koto.png b/common/Resources/Images/koto.png Binary files differnew file mode 100644 index 0000000..716747d --- /dev/null +++ b/common/Resources/Images/koto.png diff --git a/common/Resources/Images/kotosel.png b/common/Resources/Images/kotosel.png Binary files differnew file mode 100644 index 0000000..a560ea7 --- /dev/null +++ b/common/Resources/Images/kotosel.png diff --git a/common/Resources/Images/laugh.png b/common/Resources/Images/laugh.png Binary files differnew file mode 100644 index 0000000..493711e --- /dev/null +++ b/common/Resources/Images/laugh.png diff --git a/common/Resources/Images/laughsel.png b/common/Resources/Images/laughsel.png Binary files differnew file mode 100644 index 0000000..28a1980 --- /dev/null +++ b/common/Resources/Images/laughsel.png diff --git a/common/Resources/Images/mando.png b/common/Resources/Images/mando.png Binary files differnew file mode 100644 index 0000000..d97a2e1 --- /dev/null +++ b/common/Resources/Images/mando.png diff --git a/common/Resources/Images/mandosel.png b/common/Resources/Images/mandosel.png Binary files differnew file mode 100644 index 0000000..d8d5ad6 --- /dev/null +++ b/common/Resources/Images/mandosel.png diff --git a/common/Resources/Images/marimba.png b/common/Resources/Images/marimba.png Binary files differnew file mode 100644 index 0000000..f5eb4ac --- /dev/null +++ b/common/Resources/Images/marimba.png diff --git a/common/Resources/Images/marimbasel.png b/common/Resources/Images/marimbasel.png Binary files differnew file mode 100644 index 0000000..3231271 --- /dev/null +++ b/common/Resources/Images/marimbasel.png diff --git a/common/Resources/Images/marquis.png b/common/Resources/Images/marquis.png Binary files differnew file mode 100644 index 0000000..e14917a --- /dev/null +++ b/common/Resources/Images/marquis.png diff --git a/common/Resources/Images/mic1.png b/common/Resources/Images/mic1.png Binary files differnew file mode 100644 index 0000000..c6c991b --- /dev/null +++ b/common/Resources/Images/mic1.png diff --git a/common/Resources/Images/mic1sel.png b/common/Resources/Images/mic1sel.png Binary files differnew file mode 100644 index 0000000..577ffcf --- /dev/null +++ b/common/Resources/Images/mic1sel.png diff --git a/common/Resources/Images/mic2.png b/common/Resources/Images/mic2.png Binary files differnew file mode 100644 index 0000000..c827229 --- /dev/null +++ b/common/Resources/Images/mic2.png diff --git a/common/Resources/Images/mic2sel.png b/common/Resources/Images/mic2sel.png Binary files differnew file mode 100644 index 0000000..4f2b800 --- /dev/null +++ b/common/Resources/Images/mic2sel.png diff --git a/common/Resources/Images/mic3.png b/common/Resources/Images/mic3.png Binary files differnew file mode 100644 index 0000000..a3cb9c2 --- /dev/null +++ b/common/Resources/Images/mic3.png diff --git a/common/Resources/Images/mic3sel.png b/common/Resources/Images/mic3sel.png Binary files differnew file mode 100644 index 0000000..82fcbf9 --- /dev/null +++ b/common/Resources/Images/mic3sel.png diff --git a/common/Resources/Images/mic4.png b/common/Resources/Images/mic4.png Binary files differnew file mode 100644 index 0000000..2109c6d --- /dev/null +++ b/common/Resources/Images/mic4.png diff --git a/common/Resources/Images/mic4sel.png b/common/Resources/Images/mic4sel.png Binary files differnew file mode 100644 index 0000000..4d63e90 --- /dev/null +++ b/common/Resources/Images/mic4sel.png diff --git a/common/Resources/Images/miniTam.png b/common/Resources/Images/miniTam.png Binary files differnew file mode 100644 index 0000000..0fc0fc3 --- /dev/null +++ b/common/Resources/Images/miniTam.png diff --git a/common/Resources/Images/miniTamDown.png b/common/Resources/Images/miniTamDown.png Binary files differnew file mode 100644 index 0000000..ea6395f --- /dev/null +++ b/common/Resources/Images/miniTamDown.png diff --git a/common/Resources/Images/miniTamOver.png b/common/Resources/Images/miniTamOver.png Binary files differnew file mode 100644 index 0000000..a9d1478 --- /dev/null +++ b/common/Resources/Images/miniTamOver.png diff --git a/common/Resources/Images/miniplay.png b/common/Resources/Images/miniplay.png Binary files differnew file mode 100644 index 0000000..674303b --- /dev/null +++ b/common/Resources/Images/miniplay.png diff --git a/common/Resources/Images/mysounds.png b/common/Resources/Images/mysounds.png Binary files differnew file mode 100644 index 0000000..88791b6 --- /dev/null +++ b/common/Resources/Images/mysounds.png diff --git a/common/Resources/Images/mysoundssel.png b/common/Resources/Images/mysoundssel.png Binary files differnew file mode 100644 index 0000000..8aa802c --- /dev/null +++ b/common/Resources/Images/mysoundssel.png diff --git a/common/Resources/Images/note.png b/common/Resources/Images/note.png Binary files differnew file mode 100644 index 0000000..98731c0 --- /dev/null +++ b/common/Resources/Images/note.png diff --git a/common/Resources/Images/noteSelected.png b/common/Resources/Images/noteSelected.png Binary files differnew file mode 100644 index 0000000..b887bb9 --- /dev/null +++ b/common/Resources/Images/noteSelected.png diff --git a/common/Resources/Images/ocarina.png b/common/Resources/Images/ocarina.png Binary files differnew file mode 100644 index 0000000..3c8f794 --- /dev/null +++ b/common/Resources/Images/ocarina.png diff --git a/common/Resources/Images/ocarinasel.png b/common/Resources/Images/ocarinasel.png Binary files differnew file mode 100644 index 0000000..00d519b --- /dev/null +++ b/common/Resources/Images/ocarinasel.png diff --git a/common/Resources/Images/ounk.png b/common/Resources/Images/ounk.png Binary files differnew file mode 100644 index 0000000..4949262 --- /dev/null +++ b/common/Resources/Images/ounk.png diff --git a/common/Resources/Images/ounksel.png b/common/Resources/Images/ounksel.png Binary files differnew file mode 100644 index 0000000..f70aea7 --- /dev/null +++ b/common/Resources/Images/ounksel.png diff --git a/common/Resources/Images/ow.png b/common/Resources/Images/ow.png Binary files differnew file mode 100644 index 0000000..0d8d57d --- /dev/null +++ b/common/Resources/Images/ow.png diff --git a/common/Resources/Images/owsel.png b/common/Resources/Images/owsel.png Binary files differnew file mode 100644 index 0000000..dd5e814 --- /dev/null +++ b/common/Resources/Images/owsel.png diff --git a/common/Resources/Images/pageThumbnailBG.png b/common/Resources/Images/pageThumbnailBG.png Binary files differnew file mode 100644 index 0000000..2c11493 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBG.png diff --git a/common/Resources/Images/pageThumbnailBG0.png b/common/Resources/Images/pageThumbnailBG0.png Binary files differnew file mode 100644 index 0000000..db2c684 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBG0.png diff --git a/common/Resources/Images/pageThumbnailBG1.png b/common/Resources/Images/pageThumbnailBG1.png Binary files differnew file mode 100644 index 0000000..f0c14ce --- /dev/null +++ b/common/Resources/Images/pageThumbnailBG1.png diff --git a/common/Resources/Images/pageThumbnailBG2.png b/common/Resources/Images/pageThumbnailBG2.png Binary files differnew file mode 100644 index 0000000..4969241 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBG2.png diff --git a/common/Resources/Images/pageThumbnailBG3.png b/common/Resources/Images/pageThumbnailBG3.png Binary files differnew file mode 100644 index 0000000..839b741 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBG3.png diff --git a/common/Resources/Images/pageThumbnailBut0.png b/common/Resources/Images/pageThumbnailBut0.png Binary files differnew file mode 100755 index 0000000..e70e75c --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut0.png diff --git a/common/Resources/Images/pageThumbnailBut0Down.png b/common/Resources/Images/pageThumbnailBut0Down.png Binary files differnew file mode 100755 index 0000000..0266d10 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut0Down.png diff --git a/common/Resources/Images/pageThumbnailBut1.png b/common/Resources/Images/pageThumbnailBut1.png Binary files differnew file mode 100755 index 0000000..e74600c --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut1.png diff --git a/common/Resources/Images/pageThumbnailBut1Down.png b/common/Resources/Images/pageThumbnailBut1Down.png Binary files differnew file mode 100755 index 0000000..cfa3f69 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut1Down.png diff --git a/common/Resources/Images/pageThumbnailBut2.png b/common/Resources/Images/pageThumbnailBut2.png Binary files differnew file mode 100755 index 0000000..7f16f50 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut2.png diff --git a/common/Resources/Images/pageThumbnailBut2Down.png b/common/Resources/Images/pageThumbnailBut2Down.png Binary files differnew file mode 100755 index 0000000..9e7d79a --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut2Down.png diff --git a/common/Resources/Images/pageThumbnailBut3.png b/common/Resources/Images/pageThumbnailBut3.png Binary files differnew file mode 100755 index 0000000..8f7be4d --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut3.png diff --git a/common/Resources/Images/pageThumbnailBut3Down.png b/common/Resources/Images/pageThumbnailBut3Down.png Binary files differnew file mode 100755 index 0000000..90b6b92 --- /dev/null +++ b/common/Resources/Images/pageThumbnailBut3Down.png diff --git a/common/Resources/Images/pageThumbnailMask.png b/common/Resources/Images/pageThumbnailMask.png Binary files differnew file mode 100644 index 0000000..2a1d416 --- /dev/null +++ b/common/Resources/Images/pageThumbnailMask.png diff --git a/common/Resources/Images/people.png b/common/Resources/Images/people.png Binary files differnew file mode 100644 index 0000000..3bc11b7 --- /dev/null +++ b/common/Resources/Images/people.png diff --git a/common/Resources/Images/peoplesel.png b/common/Resources/Images/peoplesel.png Binary files differnew file mode 100644 index 0000000..0893c2e --- /dev/null +++ b/common/Resources/Images/peoplesel.png diff --git a/common/Resources/Images/percussions.png b/common/Resources/Images/percussions.png Binary files differnew file mode 100644 index 0000000..e39e3ef --- /dev/null +++ b/common/Resources/Images/percussions.png diff --git a/common/Resources/Images/percussionssel.png b/common/Resources/Images/percussionssel.png Binary files differnew file mode 100644 index 0000000..9d8fadd --- /dev/null +++ b/common/Resources/Images/percussionssel.png diff --git a/common/Resources/Images/piano.png b/common/Resources/Images/piano.png Binary files differnew file mode 100644 index 0000000..dbd8e21 --- /dev/null +++ b/common/Resources/Images/piano.png diff --git a/common/Resources/Images/pianosel.png b/common/Resources/Images/pianosel.png Binary files differnew file mode 100644 index 0000000..9c1923a --- /dev/null +++ b/common/Resources/Images/pianosel.png diff --git a/common/Resources/Images/plane.png b/common/Resources/Images/plane.png Binary files differnew file mode 100755 index 0000000..ccb8607 --- /dev/null +++ b/common/Resources/Images/plane.png diff --git a/common/Resources/Images/planesel.png b/common/Resources/Images/planesel.png Binary files differnew file mode 100755 index 0000000..1120b67 --- /dev/null +++ b/common/Resources/Images/planesel.png diff --git a/common/Resources/Images/reverb0.png b/common/Resources/Images/reverb0.png Binary files differnew file mode 100644 index 0000000..234bef6 --- /dev/null +++ b/common/Resources/Images/reverb0.png diff --git a/common/Resources/Images/reverb1.png b/common/Resources/Images/reverb1.png Binary files differnew file mode 100644 index 0000000..d05da05 --- /dev/null +++ b/common/Resources/Images/reverb1.png diff --git a/common/Resources/Images/reverb2.png b/common/Resources/Images/reverb2.png Binary files differnew file mode 100644 index 0000000..91942d5 --- /dev/null +++ b/common/Resources/Images/reverb2.png diff --git a/common/Resources/Images/reverb3.png b/common/Resources/Images/reverb3.png Binary files differnew file mode 100644 index 0000000..f503f7d --- /dev/null +++ b/common/Resources/Images/reverb3.png diff --git a/common/Resources/Images/reverb4.png b/common/Resources/Images/reverb4.png Binary files differnew file mode 100644 index 0000000..1588275 --- /dev/null +++ b/common/Resources/Images/reverb4.png diff --git a/common/Resources/Images/reverb5.png b/common/Resources/Images/reverb5.png Binary files differnew file mode 100644 index 0000000..a67d360 --- /dev/null +++ b/common/Resources/Images/reverb5.png diff --git a/common/Resources/Images/rhodes.png b/common/Resources/Images/rhodes.png Binary files differnew file mode 100644 index 0000000..658991d --- /dev/null +++ b/common/Resources/Images/rhodes.png diff --git a/common/Resources/Images/rhodessel.png b/common/Resources/Images/rhodessel.png Binary files differnew file mode 100644 index 0000000..95a920f --- /dev/null +++ b/common/Resources/Images/rhodessel.png diff --git a/common/Resources/Images/sampleBG.png b/common/Resources/Images/sampleBG.png Binary files differnew file mode 100644 index 0000000..359244e --- /dev/null +++ b/common/Resources/Images/sampleBG.png diff --git a/common/Resources/Images/sampleNoteMask.png b/common/Resources/Images/sampleNoteMask.png Binary files differnew file mode 100644 index 0000000..cc9448f --- /dev/null +++ b/common/Resources/Images/sampleNoteMask.png diff --git a/common/Resources/Images/saxo.png b/common/Resources/Images/saxo.png Binary files differnew file mode 100644 index 0000000..cadf6fe --- /dev/null +++ b/common/Resources/Images/saxo.png diff --git a/common/Resources/Images/saxosel.png b/common/Resources/Images/saxosel.png Binary files differnew file mode 100644 index 0000000..838d552 --- /dev/null +++ b/common/Resources/Images/saxosel.png diff --git a/common/Resources/Images/scrollBar.png b/common/Resources/Images/scrollBar.png Binary files differnew file mode 100644 index 0000000..b8fb3cb --- /dev/null +++ b/common/Resources/Images/scrollBar.png diff --git a/common/Resources/Images/sheep.png b/common/Resources/Images/sheep.png Binary files differnew file mode 100644 index 0000000..3c46699 --- /dev/null +++ b/common/Resources/Images/sheep.png diff --git a/common/Resources/Images/sheepsel.png b/common/Resources/Images/sheepsel.png Binary files differnew file mode 100644 index 0000000..42548a0 --- /dev/null +++ b/common/Resources/Images/sheepsel.png diff --git a/common/Resources/Images/shenai.png b/common/Resources/Images/shenai.png Binary files differnew file mode 100644 index 0000000..99eb91d --- /dev/null +++ b/common/Resources/Images/shenai.png diff --git a/common/Resources/Images/shenaisel.png b/common/Resources/Images/shenaisel.png Binary files differnew file mode 100644 index 0000000..bde3c4f --- /dev/null +++ b/common/Resources/Images/shenaisel.png diff --git a/common/Resources/Images/sitar.png b/common/Resources/Images/sitar.png Binary files differnew file mode 100644 index 0000000..0a61628 --- /dev/null +++ b/common/Resources/Images/sitar.png diff --git a/common/Resources/Images/sitarsel.png b/common/Resources/Images/sitarsel.png Binary files differnew file mode 100644 index 0000000..512726e --- /dev/null +++ b/common/Resources/Images/sitarsel.png diff --git a/common/Resources/Images/slap.png b/common/Resources/Images/slap.png Binary files differnew file mode 100755 index 0000000..cafbe5e --- /dev/null +++ b/common/Resources/Images/slap.png diff --git a/common/Resources/Images/slapsel.png b/common/Resources/Images/slapsel.png Binary files differnew file mode 100755 index 0000000..85bd6b4 --- /dev/null +++ b/common/Resources/Images/slapsel.png diff --git a/common/Resources/Images/sliderDrum.png b/common/Resources/Images/sliderDrum.png Binary files differnew file mode 100644 index 0000000..dd65e6d --- /dev/null +++ b/common/Resources/Images/sliderDrum.png diff --git a/common/Resources/Images/sliderEditTempo.png b/common/Resources/Images/sliderEditTempo.png Binary files differnew file mode 100644 index 0000000..0ec252d --- /dev/null +++ b/common/Resources/Images/sliderEditTempo.png diff --git a/common/Resources/Images/sliderEditVolume.png b/common/Resources/Images/sliderEditVolume.png Binary files differnew file mode 100644 index 0000000..5f4daca --- /dev/null +++ b/common/Resources/Images/sliderEditVolume.png diff --git a/common/Resources/Images/sliderInst1.png b/common/Resources/Images/sliderInst1.png Binary files differnew file mode 100644 index 0000000..fc48d15 --- /dev/null +++ b/common/Resources/Images/sliderInst1.png diff --git a/common/Resources/Images/sliderInst2.png b/common/Resources/Images/sliderInst2.png Binary files differnew file mode 100644 index 0000000..4f256eb --- /dev/null +++ b/common/Resources/Images/sliderInst2.png diff --git a/common/Resources/Images/sliderInst3.png b/common/Resources/Images/sliderInst3.png Binary files differnew file mode 100644 index 0000000..e86b71e --- /dev/null +++ b/common/Resources/Images/sliderInst3.png diff --git a/common/Resources/Images/sliderInst4.png b/common/Resources/Images/sliderInst4.png Binary files differnew file mode 100644 index 0000000..e812bd4 --- /dev/null +++ b/common/Resources/Images/sliderInst4.png diff --git a/common/Resources/Images/sliderbutbleu.png b/common/Resources/Images/sliderbutbleu.png Binary files differnew file mode 100644 index 0000000..6c34a77 --- /dev/null +++ b/common/Resources/Images/sliderbutbleu.png diff --git a/common/Resources/Images/sliderbutjaune.png b/common/Resources/Images/sliderbutjaune.png Binary files differnew file mode 100644 index 0000000..6f0fe9d --- /dev/null +++ b/common/Resources/Images/sliderbutjaune.png diff --git a/common/Resources/Images/sliderbutred.png b/common/Resources/Images/sliderbutred.png Binary files differnew file mode 100644 index 0000000..2e44538 --- /dev/null +++ b/common/Resources/Images/sliderbutred.png diff --git a/common/Resources/Images/sliderbutvert.png b/common/Resources/Images/sliderbutvert.png Binary files differnew file mode 100644 index 0000000..bbe53e8 --- /dev/null +++ b/common/Resources/Images/sliderbutvert.png diff --git a/common/Resources/Images/sliderbutviolet.png b/common/Resources/Images/sliderbutviolet.png Binary files differnew file mode 100644 index 0000000..a2b2a54 --- /dev/null +++ b/common/Resources/Images/sliderbutviolet.png diff --git a/common/Resources/Images/sliderlong.png b/common/Resources/Images/sliderlong.png Binary files differnew file mode 100644 index 0000000..f6e05e4 --- /dev/null +++ b/common/Resources/Images/sliderlong.png diff --git a/common/Resources/Images/slidershort.png b/common/Resources/Images/slidershort.png Binary files differnew file mode 100644 index 0000000..aff8bb1 --- /dev/null +++ b/common/Resources/Images/slidershort.png diff --git a/common/Resources/Images/stop.png b/common/Resources/Images/stop.png Binary files differnew file mode 100644 index 0000000..cd55af1 --- /dev/null +++ b/common/Resources/Images/stop.png diff --git a/common/Resources/Images/strings.png b/common/Resources/Images/strings.png Binary files differnew file mode 100644 index 0000000..38de9ca --- /dev/null +++ b/common/Resources/Images/strings.png diff --git a/common/Resources/Images/stringssel.png b/common/Resources/Images/stringssel.png Binary files differnew file mode 100644 index 0000000..08f8997 --- /dev/null +++ b/common/Resources/Images/stringssel.png diff --git a/common/Resources/Images/synthTam.png b/common/Resources/Images/synthTam.png Binary files differnew file mode 100644 index 0000000..e0837d2 --- /dev/null +++ b/common/Resources/Images/synthTam.png diff --git a/common/Resources/Images/synthTamDown.png b/common/Resources/Images/synthTamDown.png Binary files differnew file mode 100644 index 0000000..eef7fcb --- /dev/null +++ b/common/Resources/Images/synthTamDown.png diff --git a/common/Resources/Images/synthTamOver.png b/common/Resources/Images/synthTamOver.png Binary files differnew file mode 100644 index 0000000..6f203e8 --- /dev/null +++ b/common/Resources/Images/synthTamOver.png diff --git a/common/Resources/Images/synthlabMask.png b/common/Resources/Images/synthlabMask.png Binary files differnew file mode 100644 index 0000000..b41d467 --- /dev/null +++ b/common/Resources/Images/synthlabMask.png diff --git a/common/Resources/Images/tchiwo.png b/common/Resources/Images/tchiwo.png Binary files differnew file mode 100644 index 0000000..666f004 --- /dev/null +++ b/common/Resources/Images/tchiwo.png diff --git a/common/Resources/Images/tchiwosel.png b/common/Resources/Images/tchiwosel.png Binary files differnew file mode 100644 index 0000000..9878149 --- /dev/null +++ b/common/Resources/Images/tchiwosel.png diff --git a/common/Resources/Images/tempo1.png b/common/Resources/Images/tempo1.png Binary files differnew file mode 100644 index 0000000..71f741c --- /dev/null +++ b/common/Resources/Images/tempo1.png diff --git a/common/Resources/Images/tempo2.png b/common/Resources/Images/tempo2.png Binary files differnew file mode 100644 index 0000000..2c69512 --- /dev/null +++ b/common/Resources/Images/tempo2.png diff --git a/common/Resources/Images/tempo3.png b/common/Resources/Images/tempo3.png Binary files differnew file mode 100644 index 0000000..a7905d1 --- /dev/null +++ b/common/Resources/Images/tempo3.png diff --git a/common/Resources/Images/tempo4.png b/common/Resources/Images/tempo4.png Binary files differnew file mode 100644 index 0000000..c264a47 --- /dev/null +++ b/common/Resources/Images/tempo4.png diff --git a/common/Resources/Images/tempo5.png b/common/Resources/Images/tempo5.png Binary files differnew file mode 100644 index 0000000..1c89411 --- /dev/null +++ b/common/Resources/Images/tempo5.png diff --git a/common/Resources/Images/tempo6.png b/common/Resources/Images/tempo6.png Binary files differnew file mode 100644 index 0000000..68deca9 --- /dev/null +++ b/common/Resources/Images/tempo6.png diff --git a/common/Resources/Images/tempo7.png b/common/Resources/Images/tempo7.png Binary files differnew file mode 100644 index 0000000..81ffb5a --- /dev/null +++ b/common/Resources/Images/tempo7.png diff --git a/common/Resources/Images/tempo8.png b/common/Resources/Images/tempo8.png Binary files differnew file mode 100644 index 0000000..751e68a --- /dev/null +++ b/common/Resources/Images/tempo8.png diff --git a/common/Resources/Images/trackBG.png b/common/Resources/Images/trackBG.png Binary files differnew file mode 100644 index 0000000..6fdf29c --- /dev/null +++ b/common/Resources/Images/trackBG.png diff --git a/common/Resources/Images/trackBGDrum.png b/common/Resources/Images/trackBGDrum.png Binary files differnew file mode 100644 index 0000000..1a53271 --- /dev/null +++ b/common/Resources/Images/trackBGDrum.png diff --git a/common/Resources/Images/trackBGDrumSelected.png b/common/Resources/Images/trackBGDrumSelected.png Binary files differnew file mode 100644 index 0000000..54f765e --- /dev/null +++ b/common/Resources/Images/trackBGDrumSelected.png diff --git a/common/Resources/Images/trackBGSelected.png b/common/Resources/Images/trackBGSelected.png Binary files differnew file mode 100644 index 0000000..c800112 --- /dev/null +++ b/common/Resources/Images/trackBGSelected.png diff --git a/common/Resources/Images/triangle.png b/common/Resources/Images/triangle.png Binary files differnew file mode 100644 index 0000000..2a74f17 --- /dev/null +++ b/common/Resources/Images/triangle.png diff --git a/common/Resources/Images/trianglesel.png b/common/Resources/Images/trianglesel.png Binary files differnew file mode 100644 index 0000000..70d6e58 --- /dev/null +++ b/common/Resources/Images/trianglesel.png diff --git a/common/Resources/Images/trumpet.png b/common/Resources/Images/trumpet.png Binary files differnew file mode 100644 index 0000000..6876a92 --- /dev/null +++ b/common/Resources/Images/trumpet.png diff --git a/common/Resources/Images/trumpetsel.png b/common/Resources/Images/trumpetsel.png Binary files differnew file mode 100644 index 0000000..d77a8e4 --- /dev/null +++ b/common/Resources/Images/trumpetsel.png diff --git a/common/Resources/Images/tuba.png b/common/Resources/Images/tuba.png Binary files differnew file mode 100644 index 0000000..5cdf2f1 --- /dev/null +++ b/common/Resources/Images/tuba.png diff --git a/common/Resources/Images/tubasel.png b/common/Resources/Images/tubasel.png Binary files differnew file mode 100644 index 0000000..d194d91 --- /dev/null +++ b/common/Resources/Images/tubasel.png diff --git a/common/Resources/Images/violin.png b/common/Resources/Images/violin.png Binary files differnew file mode 100644 index 0000000..f13988f --- /dev/null +++ b/common/Resources/Images/violin.png diff --git a/common/Resources/Images/violinsel.png b/common/Resources/Images/violinsel.png Binary files differnew file mode 100644 index 0000000..36f8b02 --- /dev/null +++ b/common/Resources/Images/violinsel.png diff --git a/common/Resources/Images/voix.png b/common/Resources/Images/voix.png Binary files differnew file mode 100644 index 0000000..0c1fc68 --- /dev/null +++ b/common/Resources/Images/voix.png diff --git a/common/Resources/Images/voixsel.png b/common/Resources/Images/voixsel.png Binary files differnew file mode 100644 index 0000000..8dc5a37 --- /dev/null +++ b/common/Resources/Images/voixsel.png diff --git a/common/Resources/Images/volume0.png b/common/Resources/Images/volume0.png Binary files differnew file mode 100644 index 0000000..f2af58b --- /dev/null +++ b/common/Resources/Images/volume0.png diff --git a/common/Resources/Images/volume1.png b/common/Resources/Images/volume1.png Binary files differnew file mode 100644 index 0000000..67bd806 --- /dev/null +++ b/common/Resources/Images/volume1.png diff --git a/common/Resources/Images/volume2.png b/common/Resources/Images/volume2.png Binary files differnew file mode 100644 index 0000000..74511e9 --- /dev/null +++ b/common/Resources/Images/volume2.png diff --git a/common/Resources/Images/volume3.png b/common/Resources/Images/volume3.png Binary files differnew file mode 100644 index 0000000..fc0f894 --- /dev/null +++ b/common/Resources/Images/volume3.png diff --git a/common/Resources/Images/water.png b/common/Resources/Images/water.png Binary files differnew file mode 100644 index 0000000..c199fff --- /dev/null +++ b/common/Resources/Images/water.png diff --git a/common/Resources/Images/watersel.png b/common/Resources/Images/watersel.png Binary files differnew file mode 100644 index 0000000..c685fe6 --- /dev/null +++ b/common/Resources/Images/watersel.png diff --git a/common/Resources/Images/winds.png b/common/Resources/Images/winds.png Binary files differnew file mode 100644 index 0000000..bfb9e26 --- /dev/null +++ b/common/Resources/Images/winds.png diff --git a/common/Resources/Images/windssel.png b/common/Resources/Images/windssel.png Binary files differnew file mode 100644 index 0000000..fee7452 --- /dev/null +++ b/common/Resources/Images/windssel.png diff --git a/common/Resources/Images/zap.png b/common/Resources/Images/zap.png Binary files differnew file mode 100644 index 0000000..6599e0f --- /dev/null +++ b/common/Resources/Images/zap.png diff --git a/common/Resources/Images/zapsel.png b/common/Resources/Images/zapsel.png Binary files differnew file mode 100644 index 0000000..0f2b324 --- /dev/null +++ b/common/Resources/Images/zapsel.png diff --git a/common/Resources/Sounds/acguit b/common/Resources/Sounds/acguit Binary files differnew file mode 100755 index 0000000..ae37d90 --- /dev/null +++ b/common/Resources/Sounds/acguit diff --git a/common/Resources/Sounds/alarm b/common/Resources/Sounds/alarm Binary files differnew file mode 100755 index 0000000..73b7628 --- /dev/null +++ b/common/Resources/Sounds/alarm diff --git a/common/Resources/Sounds/banjo b/common/Resources/Sounds/banjo Binary files differnew file mode 100755 index 0000000..ec431e8 --- /dev/null +++ b/common/Resources/Sounds/banjo diff --git a/common/Resources/Sounds/basse b/common/Resources/Sounds/basse Binary files differnew file mode 100755 index 0000000..2bc1571 --- /dev/null +++ b/common/Resources/Sounds/basse diff --git a/common/Resources/Sounds/bird b/common/Resources/Sounds/bird Binary files differnew file mode 100755 index 0000000..fbe8a29 --- /dev/null +++ b/common/Resources/Sounds/bird diff --git a/common/Resources/Sounds/bottle b/common/Resources/Sounds/bottle Binary files differnew file mode 100755 index 0000000..8f3d680 --- /dev/null +++ b/common/Resources/Sounds/bottle diff --git a/common/Resources/Sounds/bubbles b/common/Resources/Sounds/bubbles Binary files differnew file mode 100755 index 0000000..849ff02 --- /dev/null +++ b/common/Resources/Sounds/bubbles diff --git a/common/Resources/Sounds/byke b/common/Resources/Sounds/byke Binary files differnew file mode 100755 index 0000000..6f428b8 --- /dev/null +++ b/common/Resources/Sounds/byke diff --git a/common/Resources/Sounds/camera b/common/Resources/Sounds/camera Binary files differnew file mode 100755 index 0000000..8eaa5b5 --- /dev/null +++ b/common/Resources/Sounds/camera diff --git a/common/Resources/Sounds/car b/common/Resources/Sounds/car Binary files differnew file mode 100755 index 0000000..66e42ae --- /dev/null +++ b/common/Resources/Sounds/car diff --git a/common/Resources/Sounds/cat b/common/Resources/Sounds/cat Binary files differnew file mode 100755 index 0000000..845ee8e --- /dev/null +++ b/common/Resources/Sounds/cat diff --git a/common/Resources/Sounds/cello b/common/Resources/Sounds/cello Binary files differnew file mode 100755 index 0000000..31720df --- /dev/null +++ b/common/Resources/Sounds/cello diff --git a/common/Resources/Sounds/chimes b/common/Resources/Sounds/chimes Binary files differnew file mode 100755 index 0000000..f83e23c --- /dev/null +++ b/common/Resources/Sounds/chimes diff --git a/common/Resources/Sounds/clang b/common/Resources/Sounds/clang Binary files differnew file mode 100755 index 0000000..01476fc --- /dev/null +++ b/common/Resources/Sounds/clang diff --git a/common/Resources/Sounds/clarinette b/common/Resources/Sounds/clarinette Binary files differnew file mode 100755 index 0000000..329974e --- /dev/null +++ b/common/Resources/Sounds/clarinette diff --git a/common/Resources/Sounds/cling b/common/Resources/Sounds/cling Binary files differnew file mode 100755 index 0000000..db3525f --- /dev/null +++ b/common/Resources/Sounds/cling diff --git a/common/Resources/Sounds/crash b/common/Resources/Sounds/crash Binary files differnew file mode 100755 index 0000000..8408175 --- /dev/null +++ b/common/Resources/Sounds/crash diff --git a/common/Resources/Sounds/diceinst b/common/Resources/Sounds/diceinst Binary files differnew file mode 100755 index 0000000..5a41341 --- /dev/null +++ b/common/Resources/Sounds/diceinst diff --git a/common/Resources/Sounds/didjeridu b/common/Resources/Sounds/didjeridu Binary files differnew file mode 100755 index 0000000..d7556e7 --- /dev/null +++ b/common/Resources/Sounds/didjeridu diff --git a/common/Resources/Sounds/dog b/common/Resources/Sounds/dog Binary files differnew file mode 100755 index 0000000..c1e8e22 --- /dev/null +++ b/common/Resources/Sounds/dog diff --git a/common/Resources/Sounds/door b/common/Resources/Sounds/door Binary files differnew file mode 100755 index 0000000..2b3b21a --- /dev/null +++ b/common/Resources/Sounds/door diff --git a/common/Resources/Sounds/drum1chine b/common/Resources/Sounds/drum1chine Binary files differnew file mode 100755 index 0000000..bb29f18 --- /dev/null +++ b/common/Resources/Sounds/drum1chine diff --git a/common/Resources/Sounds/drum1crash b/common/Resources/Sounds/drum1crash Binary files differnew file mode 100755 index 0000000..5f520c2 --- /dev/null +++ b/common/Resources/Sounds/drum1crash diff --git a/common/Resources/Sounds/drum1floortom b/common/Resources/Sounds/drum1floortom Binary files differnew file mode 100755 index 0000000..f43cb2b --- /dev/null +++ b/common/Resources/Sounds/drum1floortom diff --git a/common/Resources/Sounds/drum1hardride b/common/Resources/Sounds/drum1hardride Binary files differnew file mode 100755 index 0000000..94f052f --- /dev/null +++ b/common/Resources/Sounds/drum1hardride diff --git a/common/Resources/Sounds/drum1hatpedal b/common/Resources/Sounds/drum1hatpedal Binary files differnew file mode 100755 index 0000000..0c0afe6 --- /dev/null +++ b/common/Resources/Sounds/drum1hatpedal diff --git a/common/Resources/Sounds/drum1hatshoulder b/common/Resources/Sounds/drum1hatshoulder Binary files differnew file mode 100755 index 0000000..395ef0b --- /dev/null +++ b/common/Resources/Sounds/drum1hatshoulder diff --git a/common/Resources/Sounds/drum1kick b/common/Resources/Sounds/drum1kick Binary files differnew file mode 100755 index 0000000..0acfb56 --- /dev/null +++ b/common/Resources/Sounds/drum1kick diff --git a/common/Resources/Sounds/drum1ridebell b/common/Resources/Sounds/drum1ridebell Binary files differnew file mode 100755 index 0000000..6f6b6ce --- /dev/null +++ b/common/Resources/Sounds/drum1ridebell diff --git a/common/Resources/Sounds/drum1snare b/common/Resources/Sounds/drum1snare Binary files differnew file mode 100755 index 0000000..54a6372 --- /dev/null +++ b/common/Resources/Sounds/drum1snare diff --git a/common/Resources/Sounds/drum1snaresidestick b/common/Resources/Sounds/drum1snaresidestick Binary files differnew file mode 100755 index 0000000..a99e846 --- /dev/null +++ b/common/Resources/Sounds/drum1snaresidestick diff --git a/common/Resources/Sounds/drum1splash b/common/Resources/Sounds/drum1splash Binary files differnew file mode 100755 index 0000000..49a334e --- /dev/null +++ b/common/Resources/Sounds/drum1splash diff --git a/common/Resources/Sounds/drum1tom b/common/Resources/Sounds/drum1tom Binary files differnew file mode 100755 index 0000000..ed1464c --- /dev/null +++ b/common/Resources/Sounds/drum1tom diff --git a/common/Resources/Sounds/drum2darbukadoom b/common/Resources/Sounds/drum2darbukadoom Binary files differnew file mode 100755 index 0000000..5a90725 --- /dev/null +++ b/common/Resources/Sounds/drum2darbukadoom diff --git a/common/Resources/Sounds/drum2darbukafinger b/common/Resources/Sounds/drum2darbukafinger Binary files differnew file mode 100755 index 0000000..163aa3c --- /dev/null +++ b/common/Resources/Sounds/drum2darbukafinger diff --git a/common/Resources/Sounds/drum2darbukapied b/common/Resources/Sounds/drum2darbukapied Binary files differnew file mode 100755 index 0000000..006586a --- /dev/null +++ b/common/Resources/Sounds/drum2darbukapied diff --git a/common/Resources/Sounds/drum2darbukapiedsoft b/common/Resources/Sounds/drum2darbukapiedsoft Binary files differnew file mode 100755 index 0000000..cf2aaa8 --- /dev/null +++ b/common/Resources/Sounds/drum2darbukapiedsoft diff --git a/common/Resources/Sounds/drum2darbukaroll b/common/Resources/Sounds/drum2darbukaroll Binary files differnew file mode 100755 index 0000000..ded7a31 --- /dev/null +++ b/common/Resources/Sounds/drum2darbukaroll diff --git a/common/Resources/Sounds/drum2darbukaslap b/common/Resources/Sounds/drum2darbukaslap Binary files differnew file mode 100755 index 0000000..fd70b88 --- /dev/null +++ b/common/Resources/Sounds/drum2darbukaslap diff --git a/common/Resources/Sounds/drum2darbukatak b/common/Resources/Sounds/drum2darbukatak Binary files differnew file mode 100755 index 0000000..329f619 --- /dev/null +++ b/common/Resources/Sounds/drum2darbukatak diff --git a/common/Resources/Sounds/drum2hatflanger b/common/Resources/Sounds/drum2hatflanger Binary files differnew file mode 100755 index 0000000..9dd9389 --- /dev/null +++ b/common/Resources/Sounds/drum2hatflanger diff --git a/common/Resources/Sounds/drum2hatpied b/common/Resources/Sounds/drum2hatpied Binary files differnew file mode 100755 index 0000000..84e774e --- /dev/null +++ b/common/Resources/Sounds/drum2hatpied diff --git a/common/Resources/Sounds/drum2hatpied2 b/common/Resources/Sounds/drum2hatpied2 Binary files differnew file mode 100755 index 0000000..cd21b17 --- /dev/null +++ b/common/Resources/Sounds/drum2hatpied2 diff --git a/common/Resources/Sounds/drum2tambourinepied b/common/Resources/Sounds/drum2tambourinepied Binary files differnew file mode 100755 index 0000000..d6b566a --- /dev/null +++ b/common/Resources/Sounds/drum2tambourinepied diff --git a/common/Resources/Sounds/drum2tambourinepiedsoft b/common/Resources/Sounds/drum2tambourinepiedsoft Binary files differnew file mode 100755 index 0000000..4da2ea6 --- /dev/null +++ b/common/Resources/Sounds/drum2tambourinepiedsoft diff --git a/common/Resources/Sounds/drum3cowbell b/common/Resources/Sounds/drum3cowbell Binary files differnew file mode 100755 index 0000000..3c52687 --- /dev/null +++ b/common/Resources/Sounds/drum3cowbell diff --git a/common/Resources/Sounds/drum3cowbelltip b/common/Resources/Sounds/drum3cowbelltip Binary files differnew file mode 100755 index 0000000..7b79fe2 --- /dev/null +++ b/common/Resources/Sounds/drum3cowbelltip diff --git a/common/Resources/Sounds/drum3cup b/common/Resources/Sounds/drum3cup Binary files differnew file mode 100755 index 0000000..6cf6da2 --- /dev/null +++ b/common/Resources/Sounds/drum3cup diff --git a/common/Resources/Sounds/drum3djembelow b/common/Resources/Sounds/drum3djembelow Binary files differnew file mode 100755 index 0000000..ad5fd0a --- /dev/null +++ b/common/Resources/Sounds/drum3djembelow diff --git a/common/Resources/Sounds/drum3djembemid b/common/Resources/Sounds/drum3djembemid Binary files differnew file mode 100755 index 0000000..55b6d9f --- /dev/null +++ b/common/Resources/Sounds/drum3djembemid diff --git a/common/Resources/Sounds/drum3djembesidestick b/common/Resources/Sounds/drum3djembesidestick Binary files differnew file mode 100755 index 0000000..94c29e6 --- /dev/null +++ b/common/Resources/Sounds/drum3djembesidestick diff --git a/common/Resources/Sounds/drum3djembeslap b/common/Resources/Sounds/drum3djembeslap Binary files differnew file mode 100755 index 0000000..d201e52 --- /dev/null +++ b/common/Resources/Sounds/drum3djembeslap diff --git a/common/Resources/Sounds/drum3djembestickmid b/common/Resources/Sounds/drum3djembestickmid Binary files differnew file mode 100755 index 0000000..9da83ba --- /dev/null +++ b/common/Resources/Sounds/drum3djembestickmid diff --git a/common/Resources/Sounds/drum3metalstand b/common/Resources/Sounds/drum3metalstand Binary files differnew file mode 100755 index 0000000..059efcc --- /dev/null +++ b/common/Resources/Sounds/drum3metalstand diff --git a/common/Resources/Sounds/drum3pedalperc b/common/Resources/Sounds/drum3pedalperc Binary files differnew file mode 100755 index 0000000..c271d66 --- /dev/null +++ b/common/Resources/Sounds/drum3pedalperc diff --git a/common/Resources/Sounds/drum3rainstick b/common/Resources/Sounds/drum3rainstick Binary files differnew file mode 100755 index 0000000..561d0d9 --- /dev/null +++ b/common/Resources/Sounds/drum3rainstick diff --git a/common/Resources/Sounds/drum3tambourinehigh b/common/Resources/Sounds/drum3tambourinehigh Binary files differnew file mode 100755 index 0000000..cf2c61e --- /dev/null +++ b/common/Resources/Sounds/drum3tambourinehigh diff --git a/common/Resources/Sounds/drum3tambourinelow b/common/Resources/Sounds/drum3tambourinelow Binary files differnew file mode 100755 index 0000000..ff8e278 --- /dev/null +++ b/common/Resources/Sounds/drum3tambourinelow diff --git a/common/Resources/Sounds/drum4afrofeet b/common/Resources/Sounds/drum4afrofeet Binary files differnew file mode 100644 index 0000000..b2044da --- /dev/null +++ b/common/Resources/Sounds/drum4afrofeet diff --git a/common/Resources/Sounds/drum4fingersn b/common/Resources/Sounds/drum4fingersn Binary files differnew file mode 100644 index 0000000..e6b60a5 --- /dev/null +++ b/common/Resources/Sounds/drum4fingersn diff --git a/common/Resources/Sounds/drum4mutecuic b/common/Resources/Sounds/drum4mutecuic Binary files differnew file mode 100644 index 0000000..ef0c0c0 --- /dev/null +++ b/common/Resources/Sounds/drum4mutecuic diff --git a/common/Resources/Sounds/drum4stompbass b/common/Resources/Sounds/drum4stompbass Binary files differnew file mode 100644 index 0000000..68dd316 --- /dev/null +++ b/common/Resources/Sounds/drum4stompbass diff --git a/common/Resources/Sounds/drum4tambouri b/common/Resources/Sounds/drum4tambouri Binary files differnew file mode 100644 index 0000000..5b32be2 --- /dev/null +++ b/common/Resources/Sounds/drum4tambouri diff --git a/common/Resources/Sounds/drum4tr707clap b/common/Resources/Sounds/drum4tr707clap Binary files differnew file mode 100644 index 0000000..f9ea03e --- /dev/null +++ b/common/Resources/Sounds/drum4tr707clap diff --git a/common/Resources/Sounds/drum4tr707open b/common/Resources/Sounds/drum4tr707open Binary files differnew file mode 100644 index 0000000..f7d54bf --- /dev/null +++ b/common/Resources/Sounds/drum4tr707open diff --git a/common/Resources/Sounds/drum4tr808closed b/common/Resources/Sounds/drum4tr808closed Binary files differnew file mode 100644 index 0000000..8995edd --- /dev/null +++ b/common/Resources/Sounds/drum4tr808closed diff --git a/common/Resources/Sounds/drum4tr808sn b/common/Resources/Sounds/drum4tr808sn Binary files differnew file mode 100644 index 0000000..adde850 --- /dev/null +++ b/common/Resources/Sounds/drum4tr808sn diff --git a/common/Resources/Sounds/drum4tr909bass b/common/Resources/Sounds/drum4tr909bass Binary files differnew file mode 100644 index 0000000..6420213 --- /dev/null +++ b/common/Resources/Sounds/drum4tr909bass diff --git a/common/Resources/Sounds/drum4tr909kick b/common/Resources/Sounds/drum4tr909kick Binary files differnew file mode 100644 index 0000000..6e33dd3 --- /dev/null +++ b/common/Resources/Sounds/drum4tr909kick diff --git a/common/Resources/Sounds/drum4tr909sn b/common/Resources/Sounds/drum4tr909sn Binary files differnew file mode 100644 index 0000000..486ed42 --- /dev/null +++ b/common/Resources/Sounds/drum4tr909sn diff --git a/common/Resources/Sounds/drum5agogoaigu b/common/Resources/Sounds/drum5agogoaigu Binary files differnew file mode 100755 index 0000000..3889332 --- /dev/null +++ b/common/Resources/Sounds/drum5agogoaigu diff --git a/common/Resources/Sounds/drum5agogograve b/common/Resources/Sounds/drum5agogograve Binary files differnew file mode 100755 index 0000000..5717751 --- /dev/null +++ b/common/Resources/Sounds/drum5agogograve diff --git a/common/Resources/Sounds/drum5bongoaiguouvert b/common/Resources/Sounds/drum5bongoaiguouvert Binary files differnew file mode 100755 index 0000000..95aba33 --- /dev/null +++ b/common/Resources/Sounds/drum5bongoaiguouvert diff --git a/common/Resources/Sounds/drum5bongograveouvert b/common/Resources/Sounds/drum5bongograveouvert Binary files differnew file mode 100755 index 0000000..d7d1e58 --- /dev/null +++ b/common/Resources/Sounds/drum5bongograveouvert diff --git a/common/Resources/Sounds/drum5congaaiguouvert b/common/Resources/Sounds/drum5congaaiguouvert Binary files differnew file mode 100755 index 0000000..a59ce75 --- /dev/null +++ b/common/Resources/Sounds/drum5congaaiguouvert diff --git a/common/Resources/Sounds/drum5congagraveferme b/common/Resources/Sounds/drum5congagraveferme Binary files differnew file mode 100755 index 0000000..a49c459 --- /dev/null +++ b/common/Resources/Sounds/drum5congagraveferme diff --git a/common/Resources/Sounds/drum5congagraveouvert b/common/Resources/Sounds/drum5congagraveouvert Binary files differnew file mode 100755 index 0000000..3b9503c --- /dev/null +++ b/common/Resources/Sounds/drum5congagraveouvert diff --git a/common/Resources/Sounds/drum5guiroretour b/common/Resources/Sounds/drum5guiroretour Binary files differnew file mode 100755 index 0000000..025ebfb --- /dev/null +++ b/common/Resources/Sounds/drum5guiroretour diff --git a/common/Resources/Sounds/drum5quicaaigu b/common/Resources/Sounds/drum5quicaaigu Binary files differnew file mode 100755 index 0000000..d952c8c --- /dev/null +++ b/common/Resources/Sounds/drum5quicaaigu diff --git a/common/Resources/Sounds/drum5quicamedium b/common/Resources/Sounds/drum5quicamedium Binary files differnew file mode 100755 index 0000000..57e92e6 --- /dev/null +++ b/common/Resources/Sounds/drum5quicamedium diff --git a/common/Resources/Sounds/drum5timablesaiguslap b/common/Resources/Sounds/drum5timablesaiguslap Binary files differnew file mode 100755 index 0000000..1b531b0 --- /dev/null +++ b/common/Resources/Sounds/drum5timablesaiguslap diff --git a/common/Resources/Sounds/drum5timablesslap b/common/Resources/Sounds/drum5timablesslap Binary files differnew file mode 100755 index 0000000..1e5ec3e --- /dev/null +++ b/common/Resources/Sounds/drum5timablesslap diff --git a/common/Resources/Sounds/drum5vibraslap b/common/Resources/Sounds/drum5vibraslap Binary files differnew file mode 100755 index 0000000..e539891 --- /dev/null +++ b/common/Resources/Sounds/drum5vibraslap diff --git a/common/Resources/Sounds/duck b/common/Resources/Sounds/duck Binary files differnew file mode 100755 index 0000000..37b5f85 --- /dev/null +++ b/common/Resources/Sounds/duck diff --git a/common/Resources/Sounds/duck2 b/common/Resources/Sounds/duck2 Binary files differnew file mode 100755 index 0000000..1c62622 --- /dev/null +++ b/common/Resources/Sounds/duck2 diff --git a/common/Resources/Sounds/flute b/common/Resources/Sounds/flute Binary files differnew file mode 100755 index 0000000..68a2580 --- /dev/null +++ b/common/Resources/Sounds/flute diff --git a/common/Resources/Sounds/gam b/common/Resources/Sounds/gam Binary files differnew file mode 100755 index 0000000..dca077b --- /dev/null +++ b/common/Resources/Sounds/gam diff --git a/common/Resources/Sounds/guidice1 b/common/Resources/Sounds/guidice1 Binary files differnew file mode 100755 index 0000000..9e48310 --- /dev/null +++ b/common/Resources/Sounds/guidice1 diff --git a/common/Resources/Sounds/guidice10 b/common/Resources/Sounds/guidice10 Binary files differnew file mode 100755 index 0000000..8da4267 --- /dev/null +++ b/common/Resources/Sounds/guidice10 diff --git a/common/Resources/Sounds/guidice2 b/common/Resources/Sounds/guidice2 Binary files differnew file mode 100755 index 0000000..7b12043 --- /dev/null +++ b/common/Resources/Sounds/guidice2 diff --git a/common/Resources/Sounds/guidice3 b/common/Resources/Sounds/guidice3 Binary files differnew file mode 100755 index 0000000..68d1f45 --- /dev/null +++ b/common/Resources/Sounds/guidice3 diff --git a/common/Resources/Sounds/guidice4 b/common/Resources/Sounds/guidice4 Binary files differnew file mode 100755 index 0000000..3d72119 --- /dev/null +++ b/common/Resources/Sounds/guidice4 diff --git a/common/Resources/Sounds/guidice5 b/common/Resources/Sounds/guidice5 Binary files differnew file mode 100755 index 0000000..79cc786 --- /dev/null +++ b/common/Resources/Sounds/guidice5 diff --git a/common/Resources/Sounds/guidice6 b/common/Resources/Sounds/guidice6 Binary files differnew file mode 100755 index 0000000..dc2f756 --- /dev/null +++ b/common/Resources/Sounds/guidice6 diff --git a/common/Resources/Sounds/guidice7 b/common/Resources/Sounds/guidice7 Binary files differnew file mode 100755 index 0000000..af341b7 --- /dev/null +++ b/common/Resources/Sounds/guidice7 diff --git a/common/Resources/Sounds/guidice8 b/common/Resources/Sounds/guidice8 Binary files differnew file mode 100755 index 0000000..9901020 --- /dev/null +++ b/common/Resources/Sounds/guidice8 diff --git a/common/Resources/Sounds/guidice9 b/common/Resources/Sounds/guidice9 Binary files differnew file mode 100755 index 0000000..8798781 --- /dev/null +++ b/common/Resources/Sounds/guidice9 diff --git a/common/Resources/Sounds/guit b/common/Resources/Sounds/guit Binary files differnew file mode 100755 index 0000000..dfb1866 --- /dev/null +++ b/common/Resources/Sounds/guit diff --git a/common/Resources/Sounds/guit2 b/common/Resources/Sounds/guit2 Binary files differnew file mode 100755 index 0000000..1495832 --- /dev/null +++ b/common/Resources/Sounds/guit2 diff --git a/common/Resources/Sounds/harmonica b/common/Resources/Sounds/harmonica Binary files differnew file mode 100755 index 0000000..7b0af9f --- /dev/null +++ b/common/Resources/Sounds/harmonica diff --git a/common/Resources/Sounds/harmonium b/common/Resources/Sounds/harmonium Binary files differnew file mode 100755 index 0000000..90a5630 --- /dev/null +++ b/common/Resources/Sounds/harmonium diff --git a/common/Resources/Sounds/horse b/common/Resources/Sounds/horse Binary files differnew file mode 100755 index 0000000..b7756a3 --- /dev/null +++ b/common/Resources/Sounds/horse diff --git a/common/Resources/Sounds/kalimba b/common/Resources/Sounds/kalimba Binary files differnew file mode 100755 index 0000000..2e02b48 --- /dev/null +++ b/common/Resources/Sounds/kalimba diff --git a/common/Resources/Sounds/koto b/common/Resources/Sounds/koto Binary files differnew file mode 100755 index 0000000..9279a7f --- /dev/null +++ b/common/Resources/Sounds/koto diff --git a/common/Resources/Sounds/lab1 b/common/Resources/Sounds/lab1 Binary files differnew file mode 100644 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/lab1 diff --git a/common/Resources/Sounds/lab2 b/common/Resources/Sounds/lab2 Binary files differnew file mode 100644 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/lab2 diff --git a/common/Resources/Sounds/lab3 b/common/Resources/Sounds/lab3 Binary files differnew file mode 100644 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/lab3 diff --git a/common/Resources/Sounds/lab4 b/common/Resources/Sounds/lab4 Binary files differnew file mode 100644 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/lab4 diff --git a/common/Resources/Sounds/lab5 b/common/Resources/Sounds/lab5 Binary files differnew file mode 100644 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/lab5 diff --git a/common/Resources/Sounds/lab6 b/common/Resources/Sounds/lab6 Binary files differnew file mode 100644 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/lab6 diff --git a/common/Resources/Sounds/laugh b/common/Resources/Sounds/laugh Binary files differnew file mode 100755 index 0000000..05483ce --- /dev/null +++ b/common/Resources/Sounds/laugh diff --git a/common/Resources/Sounds/mando b/common/Resources/Sounds/mando Binary files differnew file mode 100755 index 0000000..88c8484 --- /dev/null +++ b/common/Resources/Sounds/mando diff --git a/common/Resources/Sounds/marimba b/common/Resources/Sounds/marimba Binary files differnew file mode 100755 index 0000000..331b1db --- /dev/null +++ b/common/Resources/Sounds/marimba diff --git a/common/Resources/Sounds/mic1 b/common/Resources/Sounds/mic1 Binary files differnew file mode 100755 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/mic1 diff --git a/common/Resources/Sounds/mic2 b/common/Resources/Sounds/mic2 Binary files differnew file mode 100755 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/mic2 diff --git a/common/Resources/Sounds/mic3 b/common/Resources/Sounds/mic3 Binary files differnew file mode 100755 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/mic3 diff --git a/common/Resources/Sounds/mic4 b/common/Resources/Sounds/mic4 Binary files differnew file mode 100755 index 0000000..d26b87b --- /dev/null +++ b/common/Resources/Sounds/mic4 diff --git a/common/Resources/Sounds/ocarina b/common/Resources/Sounds/ocarina Binary files differnew file mode 100755 index 0000000..d3a8c06 --- /dev/null +++ b/common/Resources/Sounds/ocarina diff --git a/common/Resources/Sounds/ounk b/common/Resources/Sounds/ounk Binary files differnew file mode 100755 index 0000000..1272c5f --- /dev/null +++ b/common/Resources/Sounds/ounk diff --git a/common/Resources/Sounds/ow b/common/Resources/Sounds/ow Binary files differnew file mode 100755 index 0000000..8270199 --- /dev/null +++ b/common/Resources/Sounds/ow diff --git a/common/Resources/Sounds/piano b/common/Resources/Sounds/piano Binary files differnew file mode 100755 index 0000000..f98a513 --- /dev/null +++ b/common/Resources/Sounds/piano diff --git a/common/Resources/Sounds/plane b/common/Resources/Sounds/plane Binary files differnew file mode 100755 index 0000000..d20142a --- /dev/null +++ b/common/Resources/Sounds/plane diff --git a/common/Resources/Sounds/rhodes b/common/Resources/Sounds/rhodes Binary files differnew file mode 100755 index 0000000..16cd8ec --- /dev/null +++ b/common/Resources/Sounds/rhodes diff --git a/common/Resources/Sounds/saxo b/common/Resources/Sounds/saxo Binary files differnew file mode 100755 index 0000000..f422c74 --- /dev/null +++ b/common/Resources/Sounds/saxo diff --git a/common/Resources/Sounds/sheep b/common/Resources/Sounds/sheep Binary files differnew file mode 100755 index 0000000..178bb43 --- /dev/null +++ b/common/Resources/Sounds/sheep diff --git a/common/Resources/Sounds/shenai b/common/Resources/Sounds/shenai Binary files differnew file mode 100755 index 0000000..115f125 --- /dev/null +++ b/common/Resources/Sounds/shenai diff --git a/common/Resources/Sounds/sitar b/common/Resources/Sounds/sitar Binary files differnew file mode 100755 index 0000000..9ba4df5 --- /dev/null +++ b/common/Resources/Sounds/sitar diff --git a/common/Resources/Sounds/slap b/common/Resources/Sounds/slap Binary files differnew file mode 100755 index 0000000..6e1f375 --- /dev/null +++ b/common/Resources/Sounds/slap diff --git a/common/Resources/Sounds/triangle b/common/Resources/Sounds/triangle Binary files differnew file mode 100755 index 0000000..d916fd0 --- /dev/null +++ b/common/Resources/Sounds/triangle diff --git a/common/Resources/Sounds/trumpet b/common/Resources/Sounds/trumpet Binary files differnew file mode 100755 index 0000000..a858a96 --- /dev/null +++ b/common/Resources/Sounds/trumpet diff --git a/common/Resources/Sounds/tuba b/common/Resources/Sounds/tuba Binary files differnew file mode 100755 index 0000000..9e47196 --- /dev/null +++ b/common/Resources/Sounds/tuba diff --git a/common/Resources/Sounds/violin b/common/Resources/Sounds/violin Binary files differnew file mode 100755 index 0000000..f89733c --- /dev/null +++ b/common/Resources/Sounds/violin diff --git a/common/Resources/Sounds/voix b/common/Resources/Sounds/voix Binary files differnew file mode 100755 index 0000000..87f6ca6 --- /dev/null +++ b/common/Resources/Sounds/voix diff --git a/common/Resources/Sounds/water b/common/Resources/Sounds/water Binary files differnew file mode 100755 index 0000000..c6cee2e --- /dev/null +++ b/common/Resources/Sounds/water diff --git a/common/Resources/Sounds/zap b/common/Resources/Sounds/zap Binary files differnew file mode 100755 index 0000000..e401f6b --- /dev/null +++ b/common/Resources/Sounds/zap diff --git a/common/Util/CSoundClient.py b/common/Util/CSoundClient.py index bdd6e97..5f2e9bf 100644 --- a/common/Util/CSoundClient.py +++ b/common/Util/CSoundClient.py @@ -140,6 +140,7 @@ class _CSoundClientPlugin: global _loop_default sc_loop_delete(_loop_default) _loop_default = sc_loop_new() + print 'loop cleared' # this is function deletes an Event from a loop # TODO: rename this function diff --git a/setup.sh b/setup.sh new file mode 100644 index 0000000..15a8ebb --- /dev/null +++ b/setup.sh @@ -0,0 +1,4 @@ +python TamTamEdit.activity/setup.py dist +python TamTamMini.activity/setup.py dist +python TamTamSynthLab.activity/setup.py dist +mv TamTam*/*.xo . |