diff options
| -rwxr-xr-x | Framework/CSound/CSoundConstants.py | 6 | ||||
| -rw-r--r-- | GUI/Core/ThemeWidgets.py | 12 | ||||
| -rwxr-xr-x | GUI/SynthLab/SynthLabParametersWindow.py | 30 | ||||
| -rw-r--r-- | Resources/Sounds/marimba | bin | 14672 -> 33684 bytes | |||
| -rw-r--r-- | Resources/univorc.csd | 6 | ||||
| -rwxr-xr-x | SynthLab/SynthLabConstants.py | 6 |
6 files changed, 32 insertions, 28 deletions
diff --git a/Framework/CSound/CSoundConstants.py b/Framework/CSound/CSoundConstants.py index 8cbc7bd..b47b6cd 100755 --- a/Framework/CSound/CSoundConstants.py +++ b/Framework/CSound/CSoundConstants.py @@ -218,7 +218,7 @@ class CSoundConstants: ZAP: Instrument( 61, INST_TIED, MID, 'melo', 'electronic', .299, .7323, .09895 ), TRUMPET: Instrument( 62, INST_TIED, MID, 'melo', 'musicInst', .39934, .45537, .02729), MARACAS: Instrument( 63, INST_SIMP, MID, "melo", 'musicInst', 0, 0, 0), - MARIMBA: Instrument( 64, INST_TIED, MID, "melo", 'musicInst', .30856, .42322, .05264), + MARIMBA: Instrument( 64, INST_TIED, MID, "melo", 'musicInst', .7096, .81391, .02425), TRIANGLE: Instrument( 65, INST_TIED, MID, "melo", 'musicInst', 1.21002, 1.31805, .01268), LAUGH: Instrument( 66, INST_SIMP, MID, 'melo', 'people', 0, 0, 0 ), VOIX: Instrument( 67, INST_TIED, MID, 'melo', 'people', .89608, .96092, .02343 ), @@ -236,8 +236,8 @@ class CSoundConstants: OCARINA : Instrument( 79, INST_TIED, MID, 'melo', 'musicInst', .12122, .18965, .02205 ), RHODES : Instrument( 80, INST_TIED, MID, 'melo', 'musicInst', .65013, .71429, .02205 ), SAXO : Instrument( 81, INST_TIED, MID, 'melo', 'musicInst', .53722, .6583, .05264 ), - SHENAI : Instrument( 82, INST_TIED, MID, 'melo', 'musicInst', .3402, .37432, .01709 ), - SITAR : Instrument( 83, INST_TIED, MID, 'melo', 'musicInst', .60804, .65593, .01736 ), + SHENAI : Instrument( 82, INST_TIED, MID, 'melo', 'musicInst', .29003, .33072, .00634 ), + SITAR : Instrument( 83, INST_TIED, MID, 'melo', 'musicInst', .63187, .67882, .01654 ), TUBA : Instrument( 84, INST_TIED, LOW, 'melo', 'musicInst', .51063, .58384, .035 ), VIOLIN : Instrument( 85, INST_TIED, MID, 'melo', 'musicInst', .55094, .82054, .14498 ), LAB1 : Instrument( 86, INST_SIMP, MID, 'melo', 'musicInst', 0, 0, 0 ), diff --git a/GUI/Core/ThemeWidgets.py b/GUI/Core/ThemeWidgets.py index dc31f35..86f3c9c 100644 --- a/GUI/Core/ThemeWidgets.py +++ b/GUI/Core/ThemeWidgets.py @@ -50,6 +50,11 @@ widget "*%s*" style "scale_style" self.alloc = allocation self.sliderY = self.alloc.height//2 - self.pixbufHeight//2 return False + + def set_snap( self, snap ): + if snap: self.snap = 1/snap + else: self.snap = False + self.expose(self, event=None) def expose( self, widget, event ): @@ -129,7 +134,12 @@ widget "*%s*" style "scale_style" self.alloc = allocation self.sliderX = self.alloc.width//2 - self.pixbufWidth//2 return False - + + def set_snap( self, snap ): + if snap: self.snap = 1/snap + else: self.snap = False + self.expose(self, event=None) + def expose( self, widget, event ): style = self.get_style() diff --git a/GUI/SynthLab/SynthLabParametersWindow.py b/GUI/SynthLab/SynthLabParametersWindow.py index 7ebcfe7..849ecf3 100755 --- a/GUI/SynthLab/SynthLabParametersWindow.py +++ b/GUI/SynthLab/SynthLabParametersWindow.py @@ -50,11 +50,11 @@ class SynthLabParametersWindow( gtk.Window ): slider3Max = SynthLabConstants.TYPES[selectedType][9] slider1Step = SynthLabConstants.TYPES[selectedType][10][0] - slider1Digits = SynthLabConstants.TYPES[selectedType][10][1] + slider1Snap = SynthLabConstants.TYPES[selectedType][10][1] slider2Step = SynthLabConstants.TYPES[selectedType][11][0] - slider2Digits = SynthLabConstants.TYPES[selectedType][11][1] + slider2Snap = SynthLabConstants.TYPES[selectedType][11][1] slider3Step = SynthLabConstants.TYPES[selectedType][12][0] - slider3Digits = SynthLabConstants.TYPES[selectedType][12][1] + slider3Snap = SynthLabConstants.TYPES[selectedType][12][1] parametersTable = self.synthObjectsParameters.choiceParamsSet[self.objectType] tablePos = (self.instanceID % 4)*4 @@ -65,27 +65,21 @@ class SynthLabParametersWindow( gtk.Window ): self.p1Adjust = gtk.Adjustment(slider1Init, slider1Min, slider1Max, slider1Step, slider1Step, 0) self.p1Adjust.connect("value-changed", self.sendTables) - self.slider1 = ImageVScale(Constants.TAM_TAM_ROOT + '/Resources/Images/sliderbutred.png', self.p1Adjust, 7) - self.slider1.set_digits(slider1Digits) - self.slider1.set_value_pos(2) + self.slider1 = ImageVScale(Constants.TAM_TAM_ROOT + '/Resources/Images/sliderbutred.png', self.p1Adjust, 7, snap = slider1Snap) self.slider1.set_inverted(True) self.slider1.set_size_request(50, 150) self.sliderBox.pack_start(self.slider1, True, False) self.p2Adjust = gtk.Adjustment(slider2Init, slider2Min, slider2Max, slider2Step, slider2Step, 0) self.p2Adjust.connect("value-changed", self.sendTables) - self.slider2 = ImageVScale(Constants.TAM_TAM_ROOT + '/Resources/Images/sliderbutred.png', self.p2Adjust, 7) - self.slider2.set_digits(slider2Digits) - self.slider2.set_value_pos(2) + self.slider2 = ImageVScale(Constants.TAM_TAM_ROOT + '/Resources/Images/sliderbutred.png', self.p2Adjust, 7, snap = slider2Snap) self.slider2.set_inverted(True) self.slider2.set_size_request(50, 150) self.sliderBox.pack_start(self.slider2, True, False) self.p3Adjust = gtk.Adjustment(slider3Init, slider3Min, slider3Max, slider3Step, slider3Step, 0) self.p3Adjust.connect("value-changed", self.sendTables) - self.slider3 = ImageVScale(Constants.TAM_TAM_ROOT + '/Resources/Images/sliderbutred.png', self.p3Adjust, 7) - self.slider3.set_digits(slider3Digits) - self.slider3.set_value_pos(2) + self.slider3 = ImageVScale(Constants.TAM_TAM_ROOT + '/Resources/Images/sliderbutred.png', self.p3Adjust, 7, snap = slider3Snap) self.slider3.set_inverted(True) self.slider3.set_size_request(50, 150) self.sliderBox.pack_start(self.slider3, True, False) @@ -138,15 +132,15 @@ class SynthLabParametersWindow( gtk.Window ): slider3Max = SynthLabConstants.TYPES[selectedType][9] slider1Step = SynthLabConstants.TYPES[selectedType][10][0] - slider1Digits = SynthLabConstants.TYPES[selectedType][10][1] + slider1Snap = SynthLabConstants.TYPES[selectedType][10][1] slider2Step = SynthLabConstants.TYPES[selectedType][11][0] - slider2Digits = SynthLabConstants.TYPES[selectedType][11][1] + slider2Snap = SynthLabConstants.TYPES[selectedType][11][1] slider3Step = SynthLabConstants.TYPES[selectedType][12][0] - slider3Digits = SynthLabConstants.TYPES[selectedType][12][1] + slider3Snap = SynthLabConstants.TYPES[selectedType][12][1] - self.slider1.set_digits(slider1Digits) - self.slider2.set_digits(slider2Digits) - self.slider3.set_digits(slider3Digits) + self.slider1.set_snap(slider1Snap) + self.slider2.set_snap(slider2Snap) + self.slider3.set_snap(slider3Snap) self.p1Adjust.set_all(slider1Init, slider1Min, slider1Max, slider1Step, slider1Step, 0) self.p2Adjust.set_all(slider2Init, slider2Min, slider2Max, slider2Step, slider2Step, 0) diff --git a/Resources/Sounds/marimba b/Resources/Sounds/marimba Binary files differindex 3649453..9d537b7 100644 --- a/Resources/Sounds/marimba +++ b/Resources/Sounds/marimba diff --git a/Resources/univorc.csd b/Resources/univorc.csd index f192975..cb4766b 100644 --- a/Resources/univorc.csd +++ b/Resources/univorc.csd @@ -416,7 +416,7 @@ SynthLab input recording ****************************************************************/ instr 5204 -ain = gasynth +ain = gasynth*2 itable = 5000 + p4 aindex line 0, p3,.25*p3 tabw ain, aindex, itable, 1 @@ -687,8 +687,8 @@ endin f1 0 8192 10 1 f2 0 8192 11 1 1 -f4 0 64 -2 250 2250 2980 420 2050 2630 590 1770 2580 - 750 1450 2590 290 750 2300 360 770 2530 520 900 2510 710 1230 2700 250 1750 2160 350 1350 2250 500 1330 2370 570 1560 2560 600 1470 2770 500 1280 2660 580 1090 2960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +f4 0 32 -2 250 2250 2980 420 2050 2630 590 1770 2580 + 750 1450 2590 290 750 2300 360 770 2530 520 900 2510 710 1230 2700 570 1560 2560 0 0 0 0 0 f40 0 1024 10 1 0 .5 0 0 .3 0 0 .2 0 .1 0 0 0 0 .2 0 0 0 .05 0 0 0 0 .03 ; ADDITIVE SYNTHESIS WAVE f41 0 8193 19 .5 .5 270 .5 ; SIGMOID FUNCTION diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py index 7428c89..4dc3327 100755 --- a/SynthLab/SynthLabConstants.py +++ b/SynthLab/SynthLabConstants.py @@ -6,8 +6,8 @@ class SynthLabConstants: INIT_LOCATIONS = [ [90,760], [150,760], [210,760], [270, 760], [450,760], [510,760], [570,760], [630, 760], [810,760], [870,760], [930,760], [990, 760], [540, 660]] - FLOAT = [.01, 2] - INTEGER = [1, 0] + FLOAT = [.01, False] + INTEGER = [1, 1] # s1 s2 s3 s4 s1min s1max s2min s2max s3min s3max [s1step s1digits] [s2step s2digits] [s3step s3digits] TYPES = { 'lfo': [.5, 1, 0, 0, 0, 1, 0, 20, 0, 5, FLOAT, FLOAT, INTEGER], @@ -19,7 +19,7 @@ class SynthLabConstants: 'pluck': [1, 5000, 0, 1, 0, 2, 100, 8000, 0, 8, FLOAT, INTEGER, FLOAT], 'noise': [0, 3000, 4000, 1, 0, 2, 0, 8000, 0, 6000, INTEGER, FLOAT, FLOAT], 'sample': [1, 5, 5000, 1, 0, 2, 0, 85, 100, 8000, FLOAT, INTEGER, FLOAT], - 'voice': [1, 3, 5, 1, 0, 2, 0, 15, 1, 10, FLOAT, INTEGER, FLOAT], + 'voice': [1, 3, 5, 1, 0, 2, 0, 8, 1, 10, FLOAT, INTEGER, FLOAT], 'wguide': [100, 3000, .8, 1, 0, 200, 100, 5000, 0, 1, FLOAT, FLOAT, FLOAT], 'distort': [800, .7, .7, 1, 0, 1000, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT], 'filter': [1000, .6, 0, 1, 200, 5000, 0, 1, 0, 2, FLOAT, FLOAT, INTEGER], |