diff options
| -rw-r--r-- | Resources/SynthFiles/synthFile1 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile10 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile2 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile3 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile4 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile5 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile6 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile7 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile8 | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | Resources/SynthFiles/synthFile9 | bin | 12288 -> 12288 bytes | |||
| -rwxr-xr-x | SynthLab/SynthLabConstants.py | 2 | ||||
| -rw-r--r-- | SynthLab/SynthLabParametersWindow.py | 8 | ||||
| -rw-r--r-- | SynthLab/SynthLabWindow.py | 11 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 10 |
14 files changed, 12 insertions, 19 deletions
diff --git a/Resources/SynthFiles/synthFile1 b/Resources/SynthFiles/synthFile1 Binary files differindex 0cb7dfe..36eb18f 100644 --- a/Resources/SynthFiles/synthFile1 +++ b/Resources/SynthFiles/synthFile1 diff --git a/Resources/SynthFiles/synthFile10 b/Resources/SynthFiles/synthFile10 Binary files differindex c42e64e..44f1342 100644 --- a/Resources/SynthFiles/synthFile10 +++ b/Resources/SynthFiles/synthFile10 diff --git a/Resources/SynthFiles/synthFile2 b/Resources/SynthFiles/synthFile2 Binary files differindex edc00a4..3effb94 100644 --- a/Resources/SynthFiles/synthFile2 +++ b/Resources/SynthFiles/synthFile2 diff --git a/Resources/SynthFiles/synthFile3 b/Resources/SynthFiles/synthFile3 Binary files differindex ca11c28..38e33e5 100644 --- a/Resources/SynthFiles/synthFile3 +++ b/Resources/SynthFiles/synthFile3 diff --git a/Resources/SynthFiles/synthFile4 b/Resources/SynthFiles/synthFile4 Binary files differindex 88654bb..1647224 100644 --- a/Resources/SynthFiles/synthFile4 +++ b/Resources/SynthFiles/synthFile4 diff --git a/Resources/SynthFiles/synthFile5 b/Resources/SynthFiles/synthFile5 Binary files differindex 73df1c0..695e318 100644 --- a/Resources/SynthFiles/synthFile5 +++ b/Resources/SynthFiles/synthFile5 diff --git a/Resources/SynthFiles/synthFile6 b/Resources/SynthFiles/synthFile6 Binary files differindex 17c205e..ca28ab9 100644 --- a/Resources/SynthFiles/synthFile6 +++ b/Resources/SynthFiles/synthFile6 diff --git a/Resources/SynthFiles/synthFile7 b/Resources/SynthFiles/synthFile7 Binary files differindex 9ad0529..d1f2df6 100644 --- a/Resources/SynthFiles/synthFile7 +++ b/Resources/SynthFiles/synthFile7 diff --git a/Resources/SynthFiles/synthFile8 b/Resources/SynthFiles/synthFile8 Binary files differindex 094134b..2f76cec 100644 --- a/Resources/SynthFiles/synthFile8 +++ b/Resources/SynthFiles/synthFile8 diff --git a/Resources/SynthFiles/synthFile9 b/Resources/SynthFiles/synthFile9 Binary files differindex 0f0b39e..5e60772 100644 --- a/Resources/SynthFiles/synthFile9 +++ b/Resources/SynthFiles/synthFile9 diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py index 2a41682..a9dd077 100755 --- a/SynthLab/SynthLabConstants.py +++ b/SynthLab/SynthLabConstants.py @@ -33,7 +33,7 @@ class SynthLabConstants: elif y > HALF_SIZE-GATE_OFFSET: y = HALF_SIZE m.append( ( x, y ) ) - INIT_LOCATIONS = [ [55,750], [135,750], [215,750], [295, 750], [420,750], [500,750], [580,750], [660, 750], [785,750], [865,750], [945,750], [1025, 750], [540, 645]] + INIT_LOCATIONS = [ [420,750], [500,750], [580,750], [660, 750], [55,750], [135,750], [215,750], [295, 750], [785,750], [865,750], [945,750], [1025, 750], [540, 645]] FLOAT = [.01, False] INTEGER = [1, 1] diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py index 243d70a..948bf10 100644 --- a/SynthLab/SynthLabParametersWindow.py +++ b/SynthLab/SynthLabParametersWindow.py @@ -29,7 +29,6 @@ class SynthLabParametersWindow( gtk.Window ): self.connect("key-press-event", self.onKeyPress) self.connect("key-release-event", self.onKeyRelease) self.connect('focus_in_event',self.onFocusIn) - self.connect('focus_out_event',self.onFocusOut) self.instanceID = instanceID self.objectType = self.instanceID / 4 self.synthObjectsParameters = synthObjectsParameters @@ -46,7 +45,6 @@ class SynthLabParametersWindow( gtk.Window ): self.tooltips = gtk.Tooltips() self.sample_names = [name for i in range( len( Config.INSTRUMENTS ) ) for name in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[ name ].instrumentId == i ] - types = SynthLabConstants.CHOOSE_TYPE[self.objectType] types2 = SynthLabConstants.CHOOSE_TYPE2[self.objectType] typesLabelList = Tooltips.SYNTHTYPES[self.objectType] @@ -138,15 +136,9 @@ class SynthLabParametersWindow( gtk.Window ): self.show_all() def onFocusIn(self, event, data=None): - print 'DEBUG: Params Window::onFocusIn' csnd = new_csound_client() csnd.connect(True) - def onFocusOut(self, event, data=None): - print 'DEBUG: Params Window::onFocusOut' - - - def destroy( self, data=None ): self.hide() diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index 7306848..0aa4d01 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -48,6 +48,17 @@ class SynthLabWindow(SubActivity): self.duration = 2 self.durString = '%.2f' % self.duration self.playingPitch = [] + + loopPointsTable = [] + sample_names = [name for i in range( len( Config.INSTRUMENTS ) ) for name in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[ name ].instrumentId == i ] + for inst in sample_names: + loopStart = Config.INSTRUMENTS[ inst ].loopStart + loopEnd = Config.INSTRUMENTS[ inst ].loopEnd + crossDur = Config.INSTRUMENTS[ inst ].crossDur + loopPointsTable.extend( [ loopStart, loopEnd, crossDur ] ) + mess = "f5755 0 512 -2 " + " " .join([str(n) for n in loopPointsTable]) + self.csnd.inputMessage( mess ) + self.lineWidth = 3 self.lineWidthMUL2 = self.lineWidth*2 self.lineWidthMUL4 = self.lineWidth*4 diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 3ef8fb5..40e0756 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -52,16 +52,6 @@ class miniTamTamMain(SubActivity): for i in range(21): self.csnd.setTrackVolume( 100, i ) - loopPointsTable = [] - sample_names = [name for i in range( len( Config.INSTRUMENTS ) ) for name in Config.INSTRUMENTS.keys() if Config.INSTRUMENTS[ name ].instrumentId == i ] - for inst in sample_names: - loopStart = Config.INSTRUMENTS[ inst ].loopStart - loopEnd = Config.INSTRUMENTS[ inst ].loopEnd - crossDur = Config.INSTRUMENTS[ inst ].crossDur - loopPointsTable.extend( [ loopStart, loopEnd, crossDur ] ) - mess = "f5755 0 512 -2 " + " " .join([str(n) for n in loopPointsTable]) - self.csnd.inputMessage( mess ) - self.csnd.setMasterVolume(self.volume) self.rythmPlayer.beat = self.beat |