diff options
| author | amartin <olpc@xo-00-CE-12.localdomain> | 2007-11-02 19:03:52 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-00-CE-12.localdomain> | 2007-11-02 19:03:52 (GMT) |
| commit | bf851c04d2cba26da3ddca90e9dda2c8610a4850 (patch) | |
| tree | 9b444013aa7d7057e1d4b55ecad54e173cbc8bd1 | |
| parent | 3b5401d301fa1b3ad71a84160fa1ce031e00dfb1 (diff) | |
loading fixes for edit
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 6 | ||||
| -rw-r--r-- | TamTamEdit.activity/TamTamEdit.py | 1 | ||||
| -rw-r--r-- | common/Util/ControlStream.py | 9 |
3 files changed, 8 insertions, 8 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index 73f52a4..215f9a6 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -1444,12 +1444,6 @@ class MainWindow( gtk.EventBox ): self._data['tempo'] = float(ttt.tempo) #self.GUI["2volumeAdjustment"].set_value(self._data['volume']) #self.GUI["2tempoAdjustment"].set_value(self._data['tempo']) - for i in range(Config.NUMBER_OF_TRACKS): - if i == 4: - string = '2drumvolumeAdjustment' - else: - string = '2instrument' + str(i+1) + 'volumeAdjustment' - self.GUI[string].set_value(self._data['track_volume'][i]) ifile.close() self.noteDB.deletePages( oldPages ) diff --git a/TamTamEdit.activity/TamTamEdit.py b/TamTamEdit.activity/TamTamEdit.py index 00fc13d..644d0b5 100644 --- a/TamTamEdit.activity/TamTamEdit.py +++ b/TamTamEdit.activity/TamTamEdit.py @@ -42,7 +42,6 @@ class TamTamEdit(activity.Activity): self.set_toolbox(self.toolbox) self.activity_toolbar = self.toolbox.get_activity_toolbar() - self.activity_toolbar.share.hide() self.toolbox.show() diff --git a/common/Util/ControlStream.py b/common/Util/ControlStream.py index cca7611..9080bf2 100644 --- a/common/Util/ControlStream.py +++ b/common/Util/ControlStream.py @@ -129,6 +129,7 @@ class TamTamTable: nid = int(argv[0]) page = self.pid[int(argv[1])] track = int(argv[2]) + instId = self.noteDB.getPage( page ).instruments[ track ] cs = CSoundNote( int(argv[3]), int(argv[4]), @@ -136,7 +137,7 @@ class TamTamTable: float(argv[6]), float(argv[7]), int(argv[8]), - int(argv[9]), + instId, float(argv[10]), float(argv[11]), float(argv[12]), @@ -161,6 +162,12 @@ class TamTamTable: #print pid, insts instrumentNames = eval( insts ) instruments = [ self.instrumentDB.getInstrumentByName( i ).instrumentId for i in instrumentNames ] + for id in instruments: + i = self.instrumentDB.getInstrument( id ) + if i.kit == None: + self.csnd.load_instrument(i.name) + else: + self.csnd.load_drumkit(i.name) if len( self.noteDB.tune ): after = self.noteDB.tune[-1] else: |