diff options
Diffstat (limited to 'ourmusic.py')
| -rwxr-xr-x | ourmusic.py | 71 |
1 files changed, 3 insertions, 68 deletions
diff --git a/ourmusic.py b/ourmusic.py index 432e5f1..5fd7f4d 100755 --- a/ourmusic.py +++ b/ourmusic.py @@ -11,12 +11,7 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -<<<<<<< HEAD -# version 4 5/31/10 Correction: -======= -# version 3 2/26/10 Additions: ->>>>>>> 3690ed424760ca6ec230887465f1f2541c5c863a -# auto default font sizing for XO's and versions of SoaS through 0.88 +# version 5 6/8/10 Cosmetic change only # # Notes: # @@ -181,7 +176,6 @@ zero controls before start. \ if self.ver != 0: self.box1.destroy() self.box2.destroy() -<<<<<<< HEAD self.ver = 1 self.box1 = self.w.box(True, self.bb) self.w.text("", self.box1) @@ -203,30 +197,6 @@ channels 1-8(9)]") self.but = self.w.cbbutton(self.b3, self.playcsd, "START !") self.but.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0, 0x7700, 0)) self.but.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0, 0x7700, 0)) -======= - self.w.reset() - self.w.csd("MyMusicMIDI.csd") - if not self.w.csd("MyMusicMIDI.csd"): - self.ver = 1 - self.box1 = self.w.box(True, self.bb) - self.w.text("", self.box1) - self.box2 = self.w.box(True, self.bb) - self.f = self.w.framebox(" <b>1 - MyMusicMIDI</b> ", False, self.box2, self.r) - self.b1 = self.w.box(True, self.f) - self.b2 = self.w.box(True, self.f) - self.b3 = self.w.box(True, self.f) - self.w.spin(0, 0, 16, 1, 1, self.b1, 0, "chan", "Channel # [0=CC7,\n \ -channels 1-8(9)]") - self.w.spin(20, 0, 120, 1, 1, self.b1, 0, "ctrl", "1st Controller #") - self.w.button(self.b2, "pan", "Pan Control ?") - self.w.text("", self.b2) - self.w.spin(7, 0, 127, 1, 1, self.b2, 0, "panctrl", "Pan Controller #") - self.p = False - self.w.text("\n<i>Select options first </i>", self.b3, self.g) - self.but = self.w.cbbutton(self.b3, self.playcsd, "START !") - self.but.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0, 0x7700, 0)) - self.but.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0, 0x7700, 0)) ->>>>>>> 3690ed424760ca6ec230887465f1f2541c5c863a def version2(self, widget): if self.ver != 0: @@ -255,7 +225,6 @@ tones (8) on/off\n\ if self.ver != 0: self.box1.destroy() self.box2.destroy() -<<<<<<< HEAD self.ver = 3 self.box1 = self.w.box(True, self.bb) self.w.text("", self.box1) @@ -278,8 +247,9 @@ channels 1-8(11)]") self.w.spin(60, 0, 118, 1, 1, self.b3, 0, "harmidi", "1st MIDI Note #\n\ (for harmonics)") self.w.button(self.b4, "pan", "Pan Control ?") - self.w.text("", self.b4) self.w.spin(7, 0, 127, 1, 1, self.b4, 0, "panctrl", "Pan Control #") + self.w.text(" If channel='0',\n\ +pan=<u>10</u> depth=<u>11</u>", self.b4) self.w.spin(0, 0, 2, 1, 1, self.b5, 7, "depth", " Depth 0=none\n\ 1=random 2=cont") self.w.spin(7, 0, 127, 1, 1, self.b5, 0, "depctrl", "Depth Control #") @@ -288,41 +258,6 @@ channels 1-8(11)]") self.but = self.w.cbbutton(self.b6, self.playcsd, "START !") self.but.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0, 0x7700, 0)) self.but.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0, 0x7700, 0)) -======= - self.w.reset() - self.w.csd("OurMusicMIDI.csd") - if not self.w.csd("OurMusicMIDI.csd"): - self.ver = 3 - self.box1 = self.w.box(True, self.bb) - self.w.text("", self.box1) - self.box2 = self.w.box(True, self.bb) - self.f = self.w.framebox(" <b>3 - OurMusicMIDI</b> ", False, self.box2, self.r) - self.b1 = self.w.box(True, self.f) - self.b2 = self.w.box(True, self.f) - self.b3 = self.w.box(True, self.f) - self.b4 = self.w.box(True, self.f) - self.b5 = self.w.box(True, self.f) - self.b6 = self.w.box(True, self.f) - self.w.spin(0, 0, 16, 1, 1, self.b1, 0, "chan", "Channel # [0=CC7,\n \ -channels 1-8(11)]") - self.w.spin(20, 0, 120, 1, 1, self.b1, 0, "ctrl", "1st Controller #") - self.w.spin(0, 0, 3, 1, 1, self.b2, 0, "harm", "Harmonics 0=normal\n\ -1=random 2=knob/\nslider 3=MIDI notes") - self.w.spin(7, 0, 127, 1, 1, self.b3, 0, "harctrl", "Harm Control #") - self.w.spin(60, 0, 118, 1, 1, self.b3, 0, "harmidi", "1st MIDI Note #\n\ -(for harmonics)") - self.w.button(self.b4, "pan", "Pan Control ?") - self.w.text("", self.b4) - self.w.spin(7, 0, 127, 1, 1, self.b4, 0, "panctrl", "Pan Control #") - self.w.spin(0, 0, 2, 1, 1, self.b5, 7, "depth", " Depth 0=none\n\ -1=random 2=cont") - self.w.spin(7, 0, 127, 1, 1, self.b5, 0, "depctrl", "Depth Control #") - self.p = False - self.w.text("\n<i>Select options first </i>", self.b6, self.g) - self.but = self.w.cbbutton(self.b6, self.playcsd, "START !") - self.but.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0, 0x7700, 0)) - self.but.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0, 0x7700, 0)) ->>>>>>> 3690ed424760ca6ec230887465f1f2541c5c863a def version4(self, widget): if self.ver != 0: |