Changeset 1268

Timestamp:

09/25/07 13:51:21 (13 months ago)

Author:

calvin

Message:

minor cleanups, fixed envelope sustain, wave table double click uses the stream player

Location:

trunk/src/buzelib

Files:

• Document.cpp (modified) (2 diffs)
• Document.h (modified) (1 diff)
• MachineParameterView.cpp (modified) (1 diff)
• MachineView.cpp (modified) (1 diff)
• PatternEditor/PatternEditorControl.cpp (modified) (1 diff)
• PatternEditor/PatternEditorControl.h (modified) (1 diff)
• WaveTableView.cpp (modified) (3 diffs)

trunk/src/buzelib/Document.cpp

@@ -878 +878 @@
                 m->mute(false);
 
+        if (state) m->stop();
+
         updateAllViews(0, UpdateSelectedMachine, m);
 }
@@ -1345 +1347 @@
         player->lock();
         streamplayer->machine->init(&archive);
-        playMachineNote(streamplayer, note);
+        playMachineNote(streamplayer, note, 0);
 /*      streamplayer->setParameter(1, 0, 0, note, false);       // note
         streamplayer->setParameter(3, 0, 0, 0, false);          // offset*/
-        streamplayer->tickAsync();
+        //streamplayer->tickAsync();
         player->unlock();
 }

trunk/src/buzelib/Document.h

@@ -270 +270 @@
         bool isNotePlaying(zzub::metaplugin* m, int note);
         // note = buzz note or NOTE_OFF, prevNote = note for which NOTE_OFF is set or -1
-        void playMachineNote(zzub::metaplugin* m, int note, int prevNote = zzub::note_value_off);
+        void playMachineNote(zzub::metaplugin* m, int note, int prevNote);
         // play back the specified pattern
         void playPattern(zzub::metaplugin* machine, zzub::pattern* pattern, int row=0);

trunk/src/buzelib/MachineParameterView.cpp

@@ -142 +142 @@
         if (document->isNotePlaying(plugin, note)) return 0;
 
-        document->playMachineNote(plugin, note);
+        document->playMachineNote(plugin, note, 0);
         return 0;
 }

trunk/src/buzelib/MachineView.cpp

@@ -193 +193 @@
         if (m->getType() != plugin_type_generator) return 0;    // only generators
 
-        document->playMachineNote(m, note);
+        document->playMachineNote(m, note, 0);
         return 0;
 }

trunk/src/buzelib/PatternEditor/PatternEditorControl.cpp

@@ -304 +304 @@
 }
 
-void CPatternEditorControl::ScrollPattern(int x, int y) {
-}
-
 void CPatternEditorControl::ClearSelection() {
         SelectRange(-1, -1, -1, -1);

trunk/src/buzelib/PatternEditor/PatternEditorControl.h

@@ -77 +77 @@
         POINT GetCursor() { return editor.cursor; }
         int GetColumns() { return editor.columns.size(); }
-        void ScrollPattern(int x, int y);
         void ClearSelection();
         void SetValue(int group, int track, int column, int row, int value);

trunk/src/buzelib/WaveTableView.cpp

@@ -167 +167 @@
                 //points.push_back(ee.points[i].flags);
         }
-        envelopeCtrl->SetEnvelope(env->points.size(), -1, &points.front());
+        envelopeCtrl->SetEnvelope(env->points.size(), env->sustain, &points.front());
 
         // TODO: update disable-checkbox
@@ -412 +412 @@
 
 LRESULT CWaveTableView::OnLbnDblClkWaveList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        int index=waveTableList.GetCurSel();
-        if (index>=player->getWaves()) return 0;
-        if (index<0) return 0;
-
-        wave_info_ex* entry=player->getWave(index);
-        if (entry==0) return 0;
+        int index = waveTableList.GetCurSel();
+        if (index >= player->getWaves()) return 0;
+        if (index < 0) return 0;
+
+        wave_info_ex* entry = player->getWave(index);
+        if (entry == 0) return 0;
         
-        if (entry->get_levels()==0) return 0;
-
-        player->getWavePlayer()->play(entry, 0, NOTE_C4);
+        if (entry->get_levels() == 0) return 0;
+
+        document->playStream(zzub::note_value_c4, "@zzub.org/stream/wavetable;1", stringFromInt(index+1));
         return 0;
 }
@@ -578 +578 @@
                 entry->points.push_back(pt);
         }
+
+        entry->sustain = sustainIndex;
 
 }