Changeset 1319

Timestamp:

12/21/07 18:03:17 (10 months ago)

Author:

calvin

Message:

zoner: pattern editor updates: unselect, stickySelection mode fixes, select bunchacolumns and select buncharows uncommented and slightly modified so they work
calvin: moved keyjazz back to zzub, removed silly messageboxes in exception dialog, updated pattern editor help

Location:

trunk/src

Files:

• buze/ExceptionDialog.cpp (modified) (2 diffs)
• buzelib/Document.cpp (modified) (5 diffs)
• buzelib/Document.h (modified) (3 diffs)
• buzelib/FileBrowserView.cpp (modified) (1 diff)
• buzelib/MachineParameterView.cpp (modified) (1 diff)
• buzelib/MachineView.cpp (modified) (2 diffs)
• buzelib/PatternView.cpp (modified) (8 diffs)
• buzelib/PatternView.h (modified) (2 diffs)
• buzelib/WaveTableView.cpp (modified) (2 diffs)
• buzelib/buze.rc (modified) (2 diffs)
• buzelib/res/keyboard_patterneditor.txt (modified) (2 diffs)
• buzelib/resource.h (modified) (1 diff)

trunk/src/buze/ExceptionDialog.cpp

@@ -59 +59 @@
                 zzub::BuzzWriter writer(&outf);
                 std::vector<zzub::metaplugin*> plugins;
-                MessageBox("SAVE SONG HERE1");
                 if (writer.writePlayer(player, plugins, true)) {
                         sprintf(szScratch, "Successfully saved current song to %s.", szDumpPath);
@@ -65 +64 @@
                         sprintf(szScratch, "Error while saving song to %s.", szDumpPath);
                 }
-                MessageBox("SAVE SONG HERE2");
                 outf.close();
                 szResult = szScratch;
         } else {
-                MessageBox("SAVE SONG HERE3");
                 szResult = "Could not create temp file.";
         }
-                MessageBox("SAVE SONG HERE4");
 
         if (szResult)

trunk/src/buzelib/Document.cpp

@@ -70 +70 @@
 
 void CDocument::selectMachine(metaplugin* machine) {
-        resetKeyjazz();
+        player->resetKeyjazz();
         player->midiNoteMachine = machine;
 
@@ -728 +728 @@
 
 
-void CDocument::resetKeyjazz() {
-        // todo: set note off for all current playing keys
-        keyjazz.clear();
-}
-
-
-
-
-
-
 // machine properties (working on selected machine)
 void CDocument::setMachineName(metaplugin* machine, std::string name) {
@@ -1287 +1277 @@
         if (mit == m_pFocusedPattern.end()) return 0;
         return mit->second;
-}
-
-
-bool CDocument::isNotePlaying(metaplugin* m, int note) {
-        for (size_t i = 0; i<keyjazz.size(); i++)
-                if (keyjazz[i].note == note) return true;
-        return false;
 }
 
@@ -1310 +1293 @@
 
 void CDocument::playMachineNote(metaplugin* m, int note, int prevNote) {
-        // create a blank 1-row pattern we're going to play
-        zzub::pattern* p = new zzub::pattern(m->loader->plugin_info, m->getConnections(), m->getTracks(), 1);
-
-        bool multiChannel;
-        size_t noteGroup = -1;
-        size_t noteParameter = -1;
-        m->findNoteColumn(noteParameter, noteGroup, multiChannel);
-        if (noteParameter == -1) return ;
-
-        if (multiChannel) {
-                // play note on track
-                if (note == note_value_off) {
-                        // find which track this note was played in and play a note-stop
-                        for (size_t i = 0; i<keyjazz.size(); i++) {
-                                if (keyjazz[i].note == prevNote || prevNote == -1) {
-                                        patterntrack* pt = p->getPatternTrack(keyjazz[i].group, keyjazz[i].track);
-                                        pt->setValue(0, noteParameter, note_value_off);
-                                        keyjazz.erase(keyjazz.begin() + i);
-                                        i--;
-                                        if (prevNote != -1) break;
-                                }
-                        }
-                } else {
-                        size_t lowestTime = UINT_MAX;
-                        int lowestTrack = -1;
-                        int foundTrack = -1;
-                        size_t lowestIndex;
-
-                        vector<bool> foundTracks(m->getTracks());
-                        for (size_t i = 0; i < foundTracks.size(); i++)
-                                foundTracks[i] = false;
-
-                        for (size_t j = 0; j < keyjazz.size(); j++) {
-                                foundTracks[keyjazz[j].track] = true;
-                                if (keyjazz[j].timestamp < lowestTime) {
-                                        lowestTime = keyjazz[j].timestamp;
-                                        lowestTrack = keyjazz[j].track;
-                                        lowestIndex = j;
-                                }
-                        }
-
-                        for (size_t i = 0; i < foundTracks.size(); i++) {
-                                if (foundTracks[i] == false) {
-                                        foundTrack = i;
-                                        break;
-                                }
-                        }
-                        if (foundTrack == -1) {
-                                foundTrack = lowestTrack;
-                                keyjazz.erase(keyjazz.begin()+lowestIndex);
-                        }
-
-                        patterntrack* pt = p->getPatternTrack(noteGroup, foundTrack);
-                        pt->setValue(0, noteParameter, note);
-
-                        // find an available track or the one with lowest timestamp
-                        KeyjazzInfo ki = {player->workPos, noteGroup, foundTrack, note };
-                        keyjazz.push_back(ki);
-                }
-        } else {
-                // play global note - no need for track counting
-                if (note == note_value_off) {
-                        for (int i = 0; i<keyjazz.size(); i++) {
-                                if (keyjazz[i].note == prevNote) {
-                                        keyjazz.clear();
-
-                                        patterntrack* pt = p->getPatternTrack(noteGroup, 0);
-                                        pt->setValue(0, noteParameter, note);
-                                        break;
-                                }
-                        }
-                } else {
-                        KeyjazzInfo ki = {player->workPos, 1, 0, note };
-                        keyjazz.clear();
-                        keyjazz.push_back(ki);
-                        
-                        patterntrack* pt = p->getPatternTrack(noteGroup, 0);
-                        pt->setValue(0, noteParameter, note);
-                }
-        }
-
-        player->lock();
-        m->playPatternRow(p, 0, true);
-        m->tickAsync();
-        player->unlock();
-
-        delete p;
-}
+        player->playMachineNote(m, note, prevNote, 0);
+}
+
+// from player.cpp:
+namespace zzub {
+        extern bool isNotePlaying(zzub::metaplugin* plugin, const std::vector<zzub::keyjazz_note>& keyjazz, int note);
+};
 
 void CDocument::playStream(int note, std::string pluginUri, std::string dataUrl) {
         if (!streamplayer) return ;
+        if (isNotePlaying(streamplayer, player->keyjazz, note)) {
+                return ;
+        }
 
         zzub::mem_archive archive;
@@ -1409 +1314 @@
         player->lock();
         streamplayer->machine->init(&archive);
+
         playMachineNote(streamplayer, note, 0);
 /*      streamplayer->setParameter(1, 0, 0, note, false);       // note

trunk/src/buzelib/Document.h

@@ -3 +3 @@
 class CPropertyProvider;
 class CConfiguration;
-
-struct KeyjazzInfo {
-    size_t timestamp;
-    size_t group, track;
-        int note;
-};
-
 
 struct pattern_position {
@@ -101 +94 @@
         int lastSaveUndoPosition;       // use to display "Are you sure you want to quit"-message
 
-    std::vector<KeyjazzInfo> keyjazz;
-    void resetKeyjazz();
-
         std::string currentFileName;
         std::string currentDirectory;
@@ -275 +265 @@
 
         void setCurrentFile(std::string fileName);
-        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);

trunk/src/buzelib/FileBrowserView.cpp

@@ -207 +207 @@
 
         CFileInfo* fileInfo = selectedFiles[0];
-        if (mainFrame->document->isNotePlaying(mainFrame->document->streamplayer, note)) return 0;
         
         std::string file = fileInfo->fullName;

trunk/src/buzelib/MachineParameterView.cpp

@@ -149 +149 @@
                 if (!plugin || ((plugin->getFlags() & PLUGIN_FLAGS_MASK) != GENERATOR_PLUGIN_FLAGS)) return 0;
         }
-
-        if (document->isNotePlaying(plugin, note)) return 0;
 
         document->playMachineNote(plugin, note, 0);

trunk/src/buzelib/MachineView.cpp

@@ -201 +201 @@
         if (m == 0) return 0;
 
-        if (document->isNotePlaying(m, note)) return 0;
-
-        //if (m->getType() != plugin_type_generator) return 0;  // only generators
-
         document->playMachineNote(m, note, 0);
         return 0;
@@ -215 +211 @@
         metaplugin* m = document->getSelectedMachine(0);
         if (m == 0) return 0;
-
-        //if (m->getType() != plugin_type_generator) return 0;  // only generators
-
-        if (!document->isNotePlaying(m, note)) return 0;
 
         document->playMachineNote(m, zzub::note_value_off, note);

trunk/src/buzelib/PatternView.cpp

@@ -1398 +1398 @@
         size_t index;
         pattern_position pos = document->getPatternPosition(machine, pattern);
-        pattern->patternToLinear(pos.group, pos.track, pos.column, index);
+        index = patternEditor.GetColumnIndex(pos.group, pos.track, pos.column);
         patternEditor.GetSelectionRect(&sel);
 
@@ -1413 +1413 @@
         size_t index;
         pattern_position pos = document->getPatternPosition(machine, pattern);
-        pattern->patternToLinear(pos.group, pos.track, pos.column, index);
+        index = patternEditor.GetColumnIndex(pos.group, pos.track, pos.column);
         patternEditor.GetSelectionRect(&sel);
 
@@ -1421 +1421 @@
                 patternEditor.SelectRange(sel.left, sel.top, index, pos.row);
         }
+        return 0;
+}
+
+LRESULT CPatternView::OnUnSelect(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
+        patternEditor.SelectRange(-1, -1, -1, -1);
         return 0;
 }
@@ -1429 +1434 @@
         // 2. is the current selection length dividable with our beat highlight, if not, start new selection
         // 3. set or double existing selection
-/*      RECT sel;
+        RECT sel;
         size_t index;
         pattern_position pos = document->getPatternPosition(machine, pattern);
-        pattern->patternToLinear(pos.group, pos.track, pos.column, index);
-        patternEditor.getSelectionRect(&sel);
+        index = patternEditor.GetColumnIndex(pos.group, pos.track, pos.column);
+        patternEditor.GetSelectionRect(&sel);
 
         if (sel.left == -1) {
@@ -1454 +1459 @@
 
         patternEditor.SelectRange(sel.left, pos.row, sel.right, targetLength);
-        */
+        
         return 0;
 }
@@ -1460 +1465 @@
 LRESULT CPatternView::OnSelectColumns(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
         // select column, track, group or all
-/*      RECT sel;
+        RECT sel;
         size_t index;
         pattern_position pos = document->getPatternPosition(machine, pattern);
-        pattern->patternToLinear(pos.group, pos.track, pos.column, index);
-        patternEditor.getSelectionRect(&sel);
+        index = patternEditor.GetColumnIndex(pos.group, pos.track, pos.column);
+        patternEditor.GetSelectionRect(&sel);
 
         int firstColumn = index;
@@ -1471 +1476 @@
         if (sel.top == 0 && sel.bottom == pattern->getRows()-1) {
                 size_t thisTrackFirstColumn, thisGroupFirstColumn;
-                pattern->patternToLinear(pos.group, pos.track, 0, thisTrackFirstColumn);
-                pattern->patternToLinear(pos.group, 0, 0, thisGroupFirstColumn);
+                thisTrackFirstColumn = patternEditor.GetColumnIndex(pos.group, pos.track, 0);
+                thisGroupFirstColumn = patternEditor.GetColumnIndex(pos.group, 0, 0);
                 size_t thisTrackNumColumns = 1;
                 size_t thisGroupNumColumns = 1;
@@ -1515 +1520 @@
 
         patternEditor.SelectRange(firstColumn, 0, lastColumn, pattern->getRows()-1);
-*/
+
         return 0;
 }

trunk/src/buzelib/PatternView.h

@@ -177 +177 @@
                 COMMAND_ID_HANDLER(ID_PATTERNEDITOR_SELECT_BEGIN, OnSelectBegin)
                 COMMAND_ID_HANDLER(ID_PATTERNEDITOR_SELECT_END, OnSelectEnd)
+                COMMAND_ID_HANDLER(ID_PATTERNEDITOR_SELECT_UN, OnUnSelect)
                 COMMAND_ID_HANDLER(ID_PATTERNEDITOR_SELECT_COLUMNS, OnSelectColumns)
                 COMMAND_ID_HANDLER(ID_PATTERNEDITOR_SELECT_ROWS, OnSelectRows)
@@ -302 +303 @@
         LRESULT OnSelectBegin(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnSelectEnd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+        LRESULT OnUnSelect(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnSelectRows(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnSelectColumns(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);

trunk/src/buzelib/WaveTableView.cpp

@@ -448 +448 @@
 
         if (!document->streamplayer) return 0;
-        if (document->isNotePlaying(document->streamplayer, note)) return 0;
 
         document->playStream(note, "@zzub.org/stream/wavetable;1", stringFromInt(index+1));
         return 0;
-        //return this->waveEditorCtrl.OnKeyDown(uMsg, wParam, lParam, bHandled);
 }
 
@@ -479 +477 @@
 
 LRESULT CWaveTableView::OnLoadWave(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        MessageBox("Load wave not implemented");
+        MessageBox("Load wave not implemented. Instead, try to drag + drop files onto the wave table.");
         return 0;
 }

trunk/src/buzelib/buze.rc

@@ -835 +835 @@
     "E",            ID_PATTERNEDITOR_SELECT_END, VIRTKEY, SHIFT, CONTROL, 
                                                     NOINVERT
+    "U",            ID_PATTERNEDITOR_SELECT_UN, VIRTKEY, SHIFT, CONTROL, 
+                                                    NOINVERT
     "L",            ID_PATTERNEDITOR_SELECT_COLUMNS, VIRTKEY, SHIFT, CONTROL, 
                                                     NOINVERT
@@ -1247 +1249 @@
 
 
+

trunk/src/buzelib/res/keyboard_patterneditor.txt

@@ -60 +60 @@
         Ctrl+L                          Solo/unsolo current machine 
         Ctrl+R                          Randomize selection 
+        Ctrl+T                          Toggle column editor for number columns
+        Ctrl+U                          Unselect
         Ctrl+Up                         Show pattern for next machine 
         Ctrl+Down                       Show pattern for previous machine 
@@ -68 +70 @@
         Space                           Paste current parameter value
         Ctrl+Space                      Paste current group values
-        Ctrl+T                          Toggle column editor for number columns
         (keyboard notes)                Edit notes 

trunk/src/buzelib/resource.h

@@ -407 +407 @@
 #define ID_ANALYZER_MODE_FIRST                  53539
 #define ID_ANALYZER_MODE_LAST                   53559
-
+#define ID_PATTERNEDITOR_SELECT_UN     53560
 // Next default values for new objects
 //