Changeset 1316

Timestamp:

11/23/07 20:44:47 (9 months ago)

Author:

calvin

Message:

zoner: setMachineLongestPattern after load and fix playback issues in sequencer
calvin: fix resize problem vs selected item in property view drop down items

Location:

trunk/src/buzelib

Files:

• Document.cpp (modified) (1 diff)
• PropertyList/PropertyItemEditors.h (modified) (1 diff)
• SequenceEditor.cpp (modified) (1 diff)

trunk/src/buzelib/Document.cpp

@@ -1243 +1243 @@
         bool status = undoManager.insertAndCommit(redo, undo);
 
-        for (int j = numMachines; j < player->getMachines(); j++) {
+        for (int j = 0; j < player->getMachines(); j++) {
                 metaplugin* machine = player->getMachine(j);
-                MachineDelete* del = new MachineDelete();
-                del->init(machine->getName());
-                undo->actions.push_back(del);
+                if(j >= numMachines) {
+                        MachineDelete* del = new MachineDelete();
+                        del->init(machine->getName());
+                        undo->actions.push_back(del);
+                }
+
+                // set the longest pattern length for sequencer highlight
+
+                size_t maxlen = 0;
+                for(size_t k = 0; k < machine->getPatterns(); ++k) {
+                        if(machine->getPattern(k)->getRows() > maxlen) {
+                                maxlen = machine->getPattern(k)->getRows();
+                        }
+                }
+                setMachineLongestPattern(machine, maxlen);
         }
 

trunk/src/buzelib/PropertyList/PropertyItemEditors.h

@@ -467 +467 @@
       RECT rc = { rcWin.left, rcWin.bottom, rcWin.right, rcWin.bottom + m_cyList };
       m_wndList.SetWindowPos(HWND_TOPMOST, &rc, SWP_SHOWWINDOW);
+          // Make sure selected item is still visible after the resize
+          m_wndList.SetCurSel(m_wndList.GetCurSel());
       return 0;
    }

trunk/src/buzelib/SequenceEditor.cpp

@@ -456 +456 @@
                         copyTrack.iterateTick();
                 int patternLengthRemain=0;
-                patternLengthRemain = getPatternLengthRemain(t,  k ? k-1 : k);
+                patternLengthRemain = getPatternLengthRemain(&copyTrack,  k ? k-1 : k);
                 for (size_t j=0; j<maxRows; j++) {
             sequence_event* event = copyTrack.getCurrentValue();