Changeset 1277

Timestamp:

10/08/07 01:34:07 (12 months ago)

Author:

calvin

Message:

machine view context menu entry for solo was broken, showing pattern length in pattern editor status bar

Location:

trunk/src/buzelib

Files:

• MachineView.cpp (modified) (1 diff)
• PatternView.cpp (modified) (4 diffs)

trunk/src/buzelib/MachineView.cpp

@@ -744 +744 @@
         bool isMaster = (machine->getFlags() & PLUGIN_FLAGS_MASK) == ROOT_PLUGIN_FLAGS;
         bool isEffect = (machine->getFlags() & PLUGIN_FLAGS_MASK) == EFFECT_PLUGIN_FLAGS;
-
-        menu.InsertMenu(-1, (machine->isMuted()?MF_CHECKED:MF_UNCHECKED)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_MUTE, "Mute");
+        bool isGenerator = (machine->getFlags() & PLUGIN_FLAGS_MASK) == GENERATOR_PLUGIN_FLAGS;
+
+        menu.InsertMenu(-1, (isMaster?MF_GRAYED:0)|(machine->isMuted()?MF_CHECKED:MF_UNCHECKED)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_MUTE, "Mute");
         //if (mac->type==1)
         bool soloCheck=player->getSoloMachine() && player->getSoloMachine()==machine;
-        menu.InsertMenu(-1, soloCheck?MF_CHECKED:0|((!isEffect||!singleSelect)?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_SOLO, "Solo");
+        menu.InsertMenu(-1, soloCheck?MF_CHECKED:0|((!isGenerator||!singleSelect)?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_SOLO, "Solo");
         menu.InsertMenu(-1, bypassCheck?MF_CHECKED:0|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_BYPASS, "Bypass");
         menu.InsertMenu(-1, minimizeCheck?MF_CHECKED:0|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_MINIMIZE, "M&inimize");

trunk/src/buzelib/PatternView.cpp

@@ -1186 +1186 @@
         pattern_position pos = document->getPatternPosition(machine, pattern);
 
-        string row = "Row " + stringFromInt(pos.row);
+        std::stringstream rowStrm;
+        rowStrm << "Row " << pos.row << " / " << pattern->getRows();
         if (patternEditor.HasSelection()) {
                 RECT rcSel;
                 patternEditor.GetSelectionRect(&rcSel);
-                row += " (" + stringFromInt(rcSel.right-rcSel.left+1) + "x" + stringFromInt(rcSel.bottom-rcSel.top+patternEditor.GetSkip()) + ")";
+                rowStrm << " (" << (rcSel.right-rcSel.left+1) << "x" << (rcSel.bottom-rcSel.top+patternEditor.GetSkip()) << ")";
         }
 
@@ -1202 +1203 @@
         int value = track->getValue(pos.row, pos.column);
         
-        string valueDesc = "";
+        std::stringstream valueStrm;
         if (value != getNoValue(param)) {
                 if (param->type == parameter_type_note) {
-                        valueDesc = noteFromInt(value);
+                        valueStrm << noteFromInt(value);
                 } else {
-                        valueDesc = machine->describeValue(pos.group, pos.column, value);
-                        char pcStatus[256];
-                        sprintf(pcStatus, "%04x (%i) %s", value, value, valueDesc.c_str());
-                        valueDesc = pcStatus;
+                        std::string desc = machine->describeValue(pos.group, pos.column, value);
+                        valueStrm << std::setw(4) << std::setfill('0') << std::hex << value << " (" << std::dec << value << ") " << desc;
                 }
         }
@@ -1217 +1216 @@
         if (param->description != 0) paramDesc = (string)param->description;
 
-        statusBar.SetText(0, row.c_str());
-        statusBar.SetText(1, valueDesc.c_str());
+        statusBar.SetText(0, rowStrm.str().c_str());
+        statusBar.SetText(1, valueStrm.str().c_str());
         statusBar.SetText(2, paramDesc.c_str());
 }
@@ -1233 +1232 @@
                 const PATTERNCOLUMN& col = patternEditor.GetColumn(rcSelection.left);
                 pastePatternTrack(selection, rcSelection.top, col.group, col.track, col.column);
-                //document->placeRangeTrack(machine, pattern, rc.top, rc.left, track);
                 delete selection;
         }