Changeset 1280

Timestamp:

10/11/07 04:26:57 (12 months ago)

Author:

calvin

Message:

hide nonSongPlugins from machine selector and parameter views; threw out stateToPatternSpace() and getStateParameters()

Location:

trunk/src/buzelib

Files:

• MachineParameterView.cpp (modified) (6 diffs)
• MachineView.cpp (modified) (4 diffs)
• MachineView.h (modified) (1 diff)
• MainFrm.cpp (modified) (1 diff)
• ParameterSliderCtrl.cpp (modified) (2 diffs)
• PresetDialog.cpp (modified) (2 diffs)
• SelectMachine.cpp (modified) (2 diffs)
• SelectMachine.h (modified) (2 diffs)
• Utils/utils.cpp (modified) (1 diff)
• Utils/utils.h (modified) (1 diff)

trunk/src/buzelib/MachineParameterView.cpp

@@ -208 +208 @@
         defaultPreset.name = "<default>";
         defaultPreset.parameters = 0;
-        for (size_t i = 0; i<getStateParameters(machine); i++) {
+        pattern conv(machine, 0);
+        for (size_t i = 0; i<conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+
                 size_t pgroup = 0, ptrack = 0, pcolumn = 0;
-                stateToPatternSpace(machine, i, pgroup, ptrack, pcolumn);
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
                 if (pgroup == 0) continue;
 
@@ -255 +259 @@
 LRESULT CMachineParameterView::OnPresetRandom(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
 
-        for (size_t i = 0; i<getStateParameters(machine); i++) {
+        pattern conv(machine, 0);
+        for (size_t i = 0; i<conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+
                 size_t pgroup = 0, ptrack = 0, pcolumn = 0;
-                stateToPatternSpace(machine, i, pgroup, ptrack, pcolumn);
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
                 if (pgroup == 0) continue;
-
-                const parameter* param = machine->getMachineParameter(pgroup, ptrack, pcolumn);
-                if (!param) continue;
 
                 if (param->type!=parameter_type_note) {
@@ -367 +372 @@
 
 LRESULT CMachineParameterView::OnSelChange(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        int presetIndex=presetDropDown.GetCurSel();
-        const PresetInfo& pi=*(const PresetInfo*)presetDropDown.GetItemData(presetIndex);
-
-        // TODO: rid getStateParameters from libzzub and handle all that stuff locally
+        int presetIndex = presetDropDown.GetCurSel();
+        const PresetInfo& pi = *(const PresetInfo*)presetDropDown.GetItemData(presetIndex);
+
+        pattern conv(machine, 0);
+
         int valueIndex = 0;
-        for (size_t i=0; i<pi.parameters; i++) {
-                if (i<getStateParameters(machine)) {
-                        size_t pgroup=0, ptrack=0, pcolumn=0;
-                        stateToPatternSpace(machine, i, pgroup, ptrack, pcolumn);
-                        if (pgroup == 0) continue;
-
-                        machine->setParameter(pgroup, ptrack, pcolumn, pi.values[valueIndex], true);
-                        valueIndex++;
-                } else 
-                        break;
+        for (size_t i = 0; i < conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+                if (i >= pi.parameters) break;
+
+                size_t pgroup=0, ptrack=0, pcolumn=0;
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
+                if (pgroup == 0) continue;
+
+                machine->setParameter(pgroup, ptrack, pcolumn, pi.values[valueIndex], true);
+                valueIndex++;
         }
         return 0;
@@ -571 +578 @@
 }
 
-        pluginloader* loader=machine->loader;
-
-        // burde hete getstatecolumn
-        size_t numSliders=0;
-        size_t stateColumns=getStateParameters(machine);
-        for (size_t i=0; i<stateColumns; i++) {
+        pluginloader* loader = machine->loader;
+
+        size_t numSliders = 0;
+        pattern conv(machine, 0);
+        for (size_t i=0; i<conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+
                 size_t pgroup=0, ptrack=0, pcolumn=0;
-                stateToPatternSpace(machine, i, pgroup, ptrack, pcolumn);
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
+
                 if (pgroup != 0) {
-
                         bool paramHide=mainFrame->getMachineParameterHidden(machine, pgroup, ptrack, pcolumn);
-                        if (paramHide) {
-                                continue;
-                        }
+                        if (paramHide) continue;
+                } else
+                if (pgroup == 0) {
+                        zzub::connection* conn = machine->getConnection(ptrack);
+                        if (conn->plugin_in->nonSongPlugin) continue;
                 }
                 numSliders++;
@@ -600 +611 @@
         sliders.resize(numSliders);
         size_t sliderIndex=0;
-        for (size_t i=0; i<stateColumns; i++) {
+        for (size_t i = 0; i < conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+
                 size_t pgroup=0, ptrack=0, pcolumn=0;
-                stateToPatternSpace(machine, i, pgroup, ptrack, pcolumn);
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
 
                 if (pgroup != 0) {
                         bool paramHide=mainFrame->getMachineParameterHidden(machine, pgroup, ptrack, pcolumn);
                         if (paramHide) continue;
+                } else
+                if (pgroup == 0) {
+                        zzub::connection* conn = machine->getConnection(ptrack);
+                        if (conn->plugin_in->nonSongPlugin) continue;
                 }
 
@@ -674 +692 @@
         menu.CreatePopupMenu();
 
-        pluginloader* loader=machine->loader;
+        pluginloader* loader = machine->loader;
 
         CMenu hiddenMenu;
         hiddenMenu.CreatePopupMenu();
-        int hiddens=0;
-        for (size_t i=0; i<getStateParameters(machine); i++) {
+        int hiddens = 0;
+        pattern conv(machine, 0);
+
+        for (size_t i=0; i<conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+
                 size_t pgroup=0, ptrack=0, pcolumn=0;
-                stateToPatternSpace(machine, i, pgroup, ptrack, pcolumn);
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
 
                 if (pgroup == 0) continue;
 
-                size_t paramIndex=-1;
-                zzub::pattern conv(machine->loader->plugin_info, machine->getConnections(), machine->getTracks(), 0);
-                conv.patternToLinear(pgroup, ptrack, pcolumn, paramIndex);
-
-                bool paramHide=mainFrame->getMachineParameterHidden(machine, pgroup, ptrack, pcolumn);
+                bool paramHide = mainFrame->getMachineParameterHidden(machine, pgroup, ptrack, pcolumn);
                 
                 if (paramHide) {
-                        hiddenMenu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_PARAMETER_UNHIDE_FIRST+paramIndex, conv.getColumnParameter(paramIndex)->name);
+                        hiddenMenu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_PARAMETER_UNHIDE_FIRST+i, param->name);
                         hiddens++;
                 }

trunk/src/buzelib/MachineView.cpp

@@ -1235 +1235 @@
 }
 
-
-void CMachineView::drawMachine(CDC& dc, metaplugin* plugin) {
+void CMachineView::drawMachine(CDC& dc, metaplugin* plugin, bool ledOnly) {
 
         int halfWidth=(getMachineWidth(plugin)/2) * scale;
@@ -1296 +1295 @@
         dc.TextOut(mRect.left+halfWidth, mRect.top+halfHeight-(fontSize/2)+adjustY, label.c_str(), label.length());
 
-        if (document->isSelectedMachine(plugin)) {
-                CPen selectPen;
-                selectPen.CreatePen(PS_DOT, 1, (COLORREF)0);
-                dc.SelectPen(selectPen);
-                dc.MoveTo(mRect.left-2, mRect.top-2);
-                dc.LineTo(mRect.right+1, mRect.top-2);
-                dc.LineTo(mRect.right+1, mRect.bottom+1);
-                dc.LineTo(mRect.left-2, mRect.bottom+1);
-                dc.LineTo(mRect.left-2, mRect.top-2);
+        if (!ledOnly && document->isSelectedMachine(plugin)) {
+                RECT fRect = mRect;
+                fRect.left -= 2;
+                fRect.top -= 2;
+                fRect.right += 2;
+                fRect.bottom += 2;
+                dc.SetTextColor(0);
+                dc.DrawFocusRect(&fRect);
         }
 
@@ -1384 +1382 @@
                 if (machine->nonSongPlugin) continue;
 
-                drawMachine(dc, machine);
+                drawMachine(dc, machine, false);
 
         }
@@ -1412 +1410 @@
                         } else {
                                 // draw a rectangle from the machine skin where the led is drawn
-                                drawMachine(dc, machine);
+                                drawMachine(dc, machine, true);
                         }
                 } else {

trunk/src/buzelib/MachineView.h

@@ -173 +173 @@
         CBrush& getMachinePanningBrush(zzub::metaplugin* machine);
         CBrush& getMachineLedBrush(zzub::metaplugin* machine);
-        void drawMachine(CDC& dc, zzub::metaplugin* plugin);
+        void drawMachine(CDC& dc, zzub::metaplugin* plugin, bool ledOnly);
         void drawDirectionTriangle(CDC& dc, RECT mRect, RECT sRect, std::string text);
         void drawVolumeSlider(CDC& dc, RECT vsr, int value);

trunk/src/buzelib/MainFrm.cpp

@@ -1823 +1823 @@
                 int views = (machineParameters.getViews() % 16);
 
-                int params = getStateParameters(m);
+                int params = 0;
+                pattern conv(m, 0);
+                for (size_t i = 0; i < conv.getColumns(); i++) {
+                        const parameter* param = conv.getColumnParameter(i);
+                        if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+                        size_t g = 0, t = 0, c = 0;
+                        conv.linearToPattern(i, g, t, c);
+                        if (g == 0) {
+                                zzub::connection* conn = m->getConnection(t);
+                                if (conn->plugin_in->nonSongPlugin) continue;
+                        }
+                        params++;
+                }
                 int parameterHeight = params*CParameterSliderCtrl::sliderHeight + 20;   // 22 = toolbarheight
 

trunk/src/buzelib/ParameterSliderCtrl.cpp

@@ -66 +66 @@
         if (group == 0) {
                 connection* conn = machine->getConnection(track);
-                parameterName = "a-"+conn->plugin_in->getName();
+                if (column == 0)
+                        parameterName = "a-"+conn->plugin_in->getName();
+                if (column == 1)
+                        parameterName = "p-"+conn->plugin_in->getName();
         } else
         if (group == 2) {
@@ -143 +146 @@
         hiddenMenu.CreatePopupMenu();
         size_t hiddens=0;
-        for (size_t i=0; i<getStateParameters(machine); i++) {
+        pattern conv(machine, 0);
+        for (size_t i=0; i<conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+
                 size_t pgroup=0, ptrack=0, pcolumn=0;
-                stateToPatternSpace(machine, i, pgroup, ptrack, pcolumn);
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
 
-                size_t paramIndex=-1;
-                zzub::pattern conv(machine, 0);
-                conv.patternToLinear(pgroup, ptrack, pcolumn, paramIndex);
-
-//              if (!loader || !loader->getExtendedParameterProperty(paramIndex, "Hidden", &paramHide))
-//                      paramHide=0;
                 bool paramHide=mainFrame->getMachineParameterHidden(machine, pgroup, ptrack, pcolumn);
                 if (paramHide) {
-                        hiddenMenu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_PARAMETER_UNHIDE_FIRST+paramIndex, conv.getColumnParameter(paramIndex)->name);
+                        hiddenMenu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_PARAMETER_UNHIDE_FIRST+i, param->name);
                         hiddens++;
                 }

trunk/src/buzelib/PresetDialog.cpp

@@ -6 +6 @@
 
 CPresetDialog::CPresetDialog(PresetManager* prs, zzub::metaplugin* plug) {
-    presets = prs;
-    plugin = plug;
+        presets = prs;
+        plugin = plug;
 }
 
 
 LRESULT CPresetDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
-    commentBox.Attach(GetDlgItem(IDC_PRESET_COMMENT_EDIT));
-    deleteButton.Attach(GetDlgItem(IDC_PRESET_DELETE_BUTTON));
-    presetList.Attach(GetDlgItem(IDC_PRESET_LIST));
-    nameBox.Attach(GetDlgItem(IDC_PRESET_NAME));
+        commentBox.Attach(GetDlgItem(IDC_PRESET_COMMENT_EDIT));
+        deleteButton.Attach(GetDlgItem(IDC_PRESET_DELETE_BUTTON));
+        presetList.Attach(GetDlgItem(IDC_PRESET_LIST));
+        nameBox.Attach(GetDlgItem(IDC_PRESET_NAME));
 
         for (size_t i=0; i<presets->getPresetCount(); i++) {
-        PresetInfo* pi=presets->getPreset(i);
+                PresetInfo* pi=presets->getPreset(i);
                 presetList.InsertString(i, pi->name.c_str());
         }
-    
-    return TRUE;
+        
+        return TRUE;
 }
 
@@ -31 +31 @@
 
 LRESULT CPresetDialog::OnBnClickedOk(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-    char pc[4096];
-    nameBox.GetWindowText(pc, 4096);
+        char pc[4096];
+        nameBox.GetWindowText(pc, 4096);
 
-    // overwrite existing preset?
-    PresetInfo* pi = presets->getPreset(pc);
-    bool newpreset = false;
+        // overwrite existing preset?
+        PresetInfo* pi = presets->getPreset(pc);
+        bool newpreset = false;
 
-    if (!pi) {
-        // no - create a new
-        pi = new PresetInfo();
-        pi->name = pc;
-        newpreset = true;
-    }
+        if (!pi) {
+                // no - create a new
+                pi = new PresetInfo();
+                pi->name = pc;
+                newpreset = true;
+        }
 
-    commentBox.GetWindowText(pc, 4096);
-    pi->comment = pc;
-    pi->parameters = getStateParameters(plugin);
-    for (size_t i = 0; i<pi->parameters; i++) {
+        commentBox.GetWindowText(pc, 4096);
+        pi->comment = pc;
+
+        zzub::pattern conv(plugin, 0);
+        for (size_t i = 0; i < conv.getColumns(); i++) {
+                const zzub::parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+
                 size_t pgroup=0, ptrack=0, pcolumn=0;
-                stateToPatternSpace(plugin, i, pgroup, ptrack, pcolumn);
+                conv.linearToPattern(i, pgroup, ptrack, pcolumn);
 
-        pi->values[i] = plugin->getParameter(pgroup, ptrack, pcolumn);
-    }
+                pi->values[i] = plugin->getParameter(pgroup, ptrack, pcolumn);
+                pi->parameters++;
+        }
 
-    if (newpreset)
-        presets->add(*pi);
+        if (newpreset)
+                presets->add(*pi);
 
         EndDialog(wID);
 
-    return 0;
+        return 0;
 }
 
 LRESULT CPresetDialog::OnPresetChange(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-    int sel = presetList.GetCurSel();
+        int sel = presetList.GetCurSel();
 
-    if (sel != -1) {
-        PresetInfo* pi = presets->getPreset(sel);
-        nameBox.SetWindowText(pi->name.c_str());
-        commentBox.SetWindowText(pi->comment.c_str());
-    }
+        if (sel != -1) {
+                PresetInfo* pi = presets->getPreset(sel);
+                nameBox.SetWindowText(pi->name.c_str());
+                commentBox.SetWindowText(pi->comment.c_str());
+        }
 
-    return 0;
+        return 0;
 }
 
 LRESULT CPresetDialog::OnPresetDelete(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-    int sel = presetList.GetCurSel();
+        int sel = presetList.GetCurSel();
 
-    if (sel != -1) {
-        presets->remove(sel);
-        EndDialog(IDOK);
-    }
+        if (sel != -1) {
+                presets->remove(sel);
+                EndDialog(IDOK);
+        }
 
-    return 0;
+        return 0;
 }

trunk/src/buzelib/SelectMachine.cpp

@@ -1 +1 @@
 #include "StdAfx.h"
 #include "resource.h"
-
-#include ".\selectmachine.h"
+#include "SelectMachine.h"
 
 using namespace zzub;
@@ -12 +11 @@
 }
 
-CSelectMachineDialog::~CSelectMachineDialog(void)
-{
+CSelectMachineDialog::~CSelectMachineDialog(void) {
+}
+
+LRESULT CSelectMachineDialog::OnChar(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        if (wParam=='\n') return SendMessage(WM_COMMAND, IDOK);
+        return TRUE;
+}
+
+LRESULT CSelectMachineDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        using namespace std;
+        CenterWindow(GetParent());
+        list.Attach(GetDlgItem(IDC_MACHINELIST));
+
+        for (size_t i=0; i<player->getMachines(); i++) {
+                zzub::metaplugin* plugin = player->getMachine(i);
+                if (plugin->nonSongPlugin) continue;
+                list.AddString(plugin->getName().c_str());
+        }
+
+        list.SetCurSel(0);
+        list.SetFocus();
+        
+        return TRUE;
+}
+
+LRESULT CSelectMachineDialog::OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+        EndDialog(wID);
+        return 0;
 }
 

trunk/src/buzelib/SelectMachine.h

@@ -13 +13 @@
                 MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
                 MESSAGE_HANDLER(WM_CHAR, OnChar)
-                //COMMAND_ID_HANDLER(IDOK, OnCloseCmd)
                 COMMAND_ID_HANDLER(IDCANCEL, OnCloseCmd)
                 COMMAND_ID_HANDLER(IDOK, OnBnClickedOk)
@@ -22 +21 @@
         ~CSelectMachineDialog(void);
 
-        LRESULT OnChar(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
-                if (wParam=='\n') return SendMessage(WM_COMMAND, IDOK);
-                return TRUE;
-        }
-
-        LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
-                using namespace std;
-                CenterWindow(GetParent());
-                list.Attach(GetDlgItem(IDC_MACHINELIST));
-
-                for (size_t i=0; i<player->getMachines(); i++) {
-                        list.AddString(player->getMachine(i)->getName().c_str());
-                }
-
-        list.SetCurSel(0);
-                list.SetFocus();
-                
-                return TRUE;
-        }
-
-        LRESULT OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-                EndDialog(wID);
-                return 0;
-        }
+        LRESULT OnChar(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnBnClickedOk(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnLbnSelchangeMachinelist(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);

trunk/src/buzelib/Utils/utils.cpp

@@ -84 +84 @@
                 return ((zzub::audio_connection*)conn)->values.pan;
         return 0xffff;
-}
-
-
-/*
-
-    metaplugin column space conversion helpers
-
-*/
-size_t getStateParameters(zzub::metaplugin* self) {
-        size_t count = self->getConnections();  // volume are state parameters
-        count += self->globalState.getStateTrack()->getStateParams();
-        for (size_t i = 0; i < self->trackStates.size(); i++)
-                count += self->trackStates[i]->getStateTrack()->getStateParams();
-
-        return count;
-}
-
-bool stateToPatternSpace(zzub::metaplugin* self, size_t index, size_t& group, size_t& track, size_t& column) {
-        size_t currentParameter = 0;
-
-        for (size_t i = 0; i < self->getConnections(); i++) {
-                if (index == currentParameter) {
-                        group = 0;
-                        track = i;
-                        column = 0;
-                        return true;
-                }
-                currentParameter++;
-        }
-
-        for (size_t i = 0; i < self->loader->plugin_info->global_parameters.size(); i++) {
-                if (self->loader->plugin_info->global_parameters[i]->flags & zzub::parameter_flag_state) {
-                        if (index == currentParameter) {
-                                group = 1;
-                                track = 0;
-                                column = i;
-                                return true;
-                        }
-                        currentParameter++;
-                }
-        }
-
-        for (size_t j=0; j<self->getTracks(); j++) {
-                for (size_t i = 0; i < self->loader->plugin_info->track_parameters.size(); i++) {
-                        if (self->loader->plugin_info->track_parameters[i]->flags & zzub::parameter_flag_state) {
-                                if (index == currentParameter) {
-                                        group = 2;
-                                        track = j;
-                                        column = i;
-                                        return true;
-                                }
-                                currentParameter++;
-                        }
-                }
-        }
-        return false;
 }
 

trunk/src/buzelib/Utils/utils.h

@@ -34 +34 @@
 int getConnectionPan(const zzub::connection* conn);
 
-bool stateToPatternSpace(zzub::metaplugin* self, size_t index, size_t& group, size_t& track, size_t& column);
-size_t getStateParameters(zzub::metaplugin* self);
-
-
 // taken from comment on http://www.codeproject.com/string/stringsplit.asp?df=100&forumid=2167&exp=0&select=1062827#xx1062827xx
 template<typename _Cont>