Changeset 1293

Timestamp:

10/29/07 21:05:04 (10 months ago)

Author:

calvin

Message:

zoners patch: remember preset in parameter view.
also changed the wave list into a CListViewCtrl (fixes a small redraw problem) and fixed a couple CListViewCtrl-mistakes

Location:

trunk/src/buzelib

Files:

• Document.cpp (modified) (1 diff)
• Document.h (modified) (2 diffs)
• FileBrowserView.cpp (modified) (1 diff)
• MachineParameterView.cpp (modified) (2 diffs)
• WaveEntryList.cpp (modified) (2 diffs)
• WaveTableList.cpp (modified) (3 diffs)
• WaveTableList.h (modified) (3 diffs)
• WaveTableView.cpp (modified) (13 diffs)
• WaveTableView.h (modified) (4 diffs)

trunk/src/buzelib/Document.cpp

@@ -1125 +1125 @@
 }
 
+void CDocument::setMachinePreset(zzub::metaplugin* plugin, std::string name) {
+        lastPreset[plugin] = name;
+}
+
+std::string CDocument::getMachinePreset(zzub::metaplugin* plugin) {
+        map<metaplugin*, std::string>::iterator name = lastPreset.find(plugin);
+        if (name == lastPreset.end())
+                return "";
+        return name->second;
+}
+
 pattern_position CDocument::getPatternPosition(zzub::metaplugin* plugin, zzub::pattern* pattern) {
         pattern_position pos;

trunk/src/buzelib/Document.h

@@ -92 +92 @@
 
         std::map<zzub::metaplugin*, zzub::pattern*> m_pFocusedPattern;
+        std::map<zzub::metaplugin*, std::string> lastPreset;
 
     std::vector<CView*> views;
@@ -273 +274 @@
         // play back the specified pattern
         void playPattern(zzub::metaplugin* machine, zzub::pattern* pattern, int row=0);
+        void setMachinePreset(zzub::metaplugin* plugin, std::string name);
+        std::string getMachinePreset(zzub::metaplugin* plugin);
 
         void playStream(int note, std::string dataUrl, std::string pluginUri);

trunk/src/buzelib/FileBrowserView.cpp

@@ -147 +147 @@
 
         fileList.Create(m_hWnd, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL | LBS_NOTIFY | LVS_SHOWSELALWAYS, 0, IDC_FILELIST);
-        fileList.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT|WS_EX_CLIENTEDGE,LVS_EX_FULLROWSELECT|WS_EX_CLIENTEDGE);
+        fileList.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT,LVS_EX_FULLROWSELECT);
         updateFiles();
 

trunk/src/buzelib/MachineParameterView.cpp

@@ -96 +96 @@
         bindPresets();
 
+        // default to the last preset
+
+        std::string lastPreset = document->getMachinePreset(machine);
+        if (lastPreset.size()) {
+                int index = presetDropDown.FindStringExact(0, lastPreset.c_str());
+                if (index > 0) {
+                        presetDropDown.SetCurSel(index);
+                }
+        }
+
         document->addView(this);
         return lres;
@@ -390 +400 @@
                 valueIndex++;
         }
+        document->setMachinePreset(machine, pi.name);
+        /*  machine->setLastPreset((char*)pi.name.c_str()); */
         return 0;
 }

trunk/src/buzelib/WaveEntryList.cpp

@@ -51 +51 @@
 LRESULT CWaveEntryList::OnDropFiles(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
         MessageBox("Wave level drop", "Wave level", MB_OK);
-    int waveIndex = view->waveTableList.GetCurSel();
+    int waveIndex = view->waveTableList.GetSelectedIndex();
         if (waveIndex == -1) return 0;
 
@@ -82 +82 @@
 LRESULT CWaveEntryList::OnRButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
 
-    int waveIndex = view->waveTableList.GetCurSel();
+    int waveIndex = view->waveTableList.GetSelectedIndex();
         if (waveIndex == -1) return 0;
 

trunk/src/buzelib/WaveTableList.cpp

@@ -27 +27 @@
 
 LRESULT CWaveTableList::OnDropFiles(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-        BOOL bOutside;
         POINT pt;
         GetCursorPos(&pt);
         ScreenToClient(&pt);
-        int curWave = this->ItemFromPoint(pt, bOutside);
+        int curWave = this->HitTest(pt, 0);
 
         SetRedraw(FALSE);
-        SetCurSel(curWave);
+        SelectItem(curWave);
 
         HDROP hDropInfo=(HDROP)wParam;
@@ -110 +109 @@
 
         POINT pt={LOWORD(lParam), HIWORD(lParam) };
-        BOOL outside;
-        int waveIndex = ItemFromPoint(pt, outside);
+
+        int waveIndex = HitTest(pt, 0);
         if (waveIndex == -1) return 0;
 
-        SetCurSel(waveIndex);
+        SelectItem(waveIndex);
 
         CMenu menu; 
@@ -132 +131 @@
         return 0;
 }
+
+LRESULT CWaveTableList::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
+        RECT rcClient;
+        GetClientRect(&rcClient);
+        SetColumnWidth(0, rcClient.right - rcClient.left - 2);
+        return 0;
+}
+

trunk/src/buzelib/WaveTableList.h

@@ -5 +5 @@
 class CWaveTableView;
 
-class CWaveTableList : public CWindowImpl<CWaveTableList, CListBox> {
+class CWaveTableList : public CWindowImpl<CWaveTableList, CListViewCtrl> {
         CWaveTableView* view;
 public:
-        DECLARE_WND_SUPERCLASS("WaveTableList", CListBox::GetWndClassName())
+        DECLARE_WND_SUPERCLASS("WaveTableList", CListViewCtrl::GetWndClassName())
 
    BEGIN_MSG_MAP(CWaveTableList)
@@ -17 +17 @@
                 MESSAGE_HANDLER(WM_DROPFILES, OnDropFiles)
                 MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown)
+                MESSAGE_HANDLER(WM_SIZE, OnSize)
    END_MSG_MAP()
 
@@ -30 +31 @@
         LRESULT OnDropFiles(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnRButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+        LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 };

trunk/src/buzelib/WaveTableView.cpp

@@ -239 +239 @@
         mainSplitter.SetSplitterPanes(waveLevelSplitter, waveTabSplitter);
 
-        waveTableList.Create(waveLevelSplitter, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL | LBS_NOTIFY, WS_EX_CLIENTEDGE, IDC_WAVELIST);
+        waveTableList.Create(waveLevelSplitter, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_REPORT | LVS_SHOWSELALWAYS, 0, IDC_WAVELIST);
+        waveTableList.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT,LVS_EX_FULLROWSELECT);
+        waveTableList.AddColumn("Instrument", 0);
+
         waveEntryList.Create(waveLevelSplitter, rcDefault, 0, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS |WS_CLIPCHILDREN | WS_VSCROLL | LVS_SINGLESEL | LVS_REPORT | LVS_SHOWSELALWAYS, 0, IDC_ENTRYLIST);
-        waveEntryList.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT|WS_EX_CLIENTEDGE,LVS_EX_FULLROWSELECT|WS_EX_CLIENTEDGE);
+        waveEntryList.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT,LVS_EX_FULLROWSELECT);
 
         waveLevelSplitter.SetSplitterPanes(waveTableList, waveEntryList);
@@ -247 +250 @@
         waveEditorCtrl.Create(waveTabSplitter, rcDefault, 0, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS |WS_CLIPCHILDREN | WS_HSCROLL, WS_EX_CLIENTEDGE, IDC_FILELIST);
 
-        waveTabs.Create(waveTabSplitter, rcDefault, 0, 0, 0, IDC_WAVETABS);
+        waveTabs.Create(waveTabSplitter, rcDefault, 0, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN, 0, IDC_WAVETABS);
 
         //editTab.Create(waveTabs);//, rcDefault, 0, WS_CHILD);
@@ -266 +269 @@
         waveTabSplitter.SetSplitterPos(rcClient.bottom - 200);
 
-        waveTableList.SetCurSel(0);
 
         updateFromWaveTable();
+
+        waveTableList.SelectItem(0);
 
         updateToolbar();
@@ -348 +352 @@
         int note = midi_to_buzz_note(keyboard_mapper::map_code_to_note(document->octave, wParam));
         if (note == -1) return 0;
-        int index = waveTableList.GetCurSel();
+        int index = waveTableList.GetSelectedIndex();
         if (index >= player->getWaves()) return 0;
         if (index < 0) return 0;
@@ -397 +401 @@
 
 LRESULT CWaveTableView::OnPlayWave(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        int wavePos=waveTableList.GetCurSel();
+        int wavePos=waveTableList.GetSelectedIndex();
         if (wavePos==LB_ERR) return 0;                  // nothing selected
 
@@ -409 +413 @@
 
 LRESULT CWaveTableView::OnClearWave(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        int index=waveTableList.GetCurSel();
+        int index=waveTableList.GetSelectedIndex();
         if (index>=player->getWaves()) return 0;
         if (index<0) return 0;
@@ -423 +427 @@
 }
 
-LRESULT CWaveTableView::OnLbnDblClkWaveList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        int index = waveTableList.GetCurSel();
+LRESULT CWaveTableView::OnLbnDblClkWaveList(int /*idCtrl*/, LPNMHDR /*pnmh*/, BOOL& /*bHandled*/) {
+        int index = waveTableList.GetSelectedIndex();
         if (index >= player->getWaves()) return 0;
         if (index < 0) return 0;
@@ -438 +442 @@
 
 void CWaveTableView::updateEntry() {
-        int index=waveTableList.GetCurSel();
+        int index=waveTableList.GetSelectedIndex();
         if (index<0 || index>=player->getWaves()) return ;
 
@@ -475 +479 @@
 
 void CWaveTableView::updateSelection() {
-        int index=waveTableList.GetCurSel();
+        int index=waveTableList.GetSelectedIndex();
         if (index==LB_ERR) return ;                     // nothing selected
 
@@ -489 +493 @@
         mainFrame->document->selectWave(entry);
 
-//    recordTab.bindWavePlugins();
 }
 
 void CWaveTableView::updateFromWaveTable() {
-        int sel = waveTableList.GetCurSel();
-        int scroll = waveTableList.GetScrollPos(SB_VERT);
-
-        waveTableList.ResetContent();
+        int sel = waveTableList.GetSelectedIndex();
+        POINT zeroPt = { 0, 0 };
+        int first = waveTableList.HitTest(zeroPt, 0);
+
+        waveTableList.DeleteAllItems();
 
         size_t wavecount = player->getWaves();
@@ -503 +507 @@
                 char pc[256];
                 sprintf(pc, "%02x %s", i+1, wave->name.c_str());
-                waveTableList.AddString(pc);
+                waveTableList.InsertItem(i, pc);
         }
 
         if (sel != -1)
-                waveTableList.SetCurSel(sel);
-
-        waveTableList.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, scroll), 0);
-}
-
-LRESULT CWaveTableView::OnLbnSelChangeWaveList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+                waveTableList.SelectItem(sel);
+
+        int first2 = waveTableList.HitTest(zeroPt, 0);
+
+        RECT rcItem;
+        waveTableList.GetSubItemRect(0, 0, LVIR_BOUNDS, &rcItem);
+        int itemHeight = rcItem.bottom - rcItem.top;
+        SIZE scrollSize = { 0, (first - first2) * itemHeight };
+        waveTableList.Scroll(scrollSize);
+}
+
+LRESULT CWaveTableView::OnLbnSelChangeWaveList(int /*idCtrl*/, LPNMHDR /*pnmh*/, BOOL& /*bHandled*/) {
         updateSelection();
         return 0;
@@ -528 +538 @@
 
 int CWaveTableView::getSelectedWaveIndex() {
-        int index=waveTableList.GetCurSel();
+        int index=waveTableList.GetSelectedIndex();
         if (index==LB_ERR) return -1;                   // nothing selected
         if (index>=player->getWaves()) return -1;
@@ -537 +547 @@
 
 wave_info_ex* CWaveTableView::getSelectedWave() {
-        int index=waveTableList.GetCurSel();
+        int index=waveTableList.GetSelectedIndex();
         if (index==LB_ERR) return 0;                    // nothing selected
         if (index>=player->getWaves()) return 0;

trunk/src/buzelib/WaveTableView.h

@@ -68 +68 @@
 {
         ClientViewListener* clientViewListener;
-        CListBox sampleList;
         CTrackBarCtrl waveVolumeSlider;
         CWaveEntryList waveEntryList;
@@ -112 +111 @@
                 MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
 
-                COMMAND_HANDLER(IDC_WAVELIST, LBN_DBLCLK, OnLbnDblClkWaveList)
-                COMMAND_HANDLER(IDC_WAVELIST, LBN_SELCHANGE, OnLbnSelChangeWaveList)
+                NOTIFY_HANDLER(IDC_WAVELIST, LVN_ITEMCHANGED, OnLbnSelChangeWaveList)
+                NOTIFY_HANDLER(IDC_WAVELIST, NM_DBLCLK, OnLbnDblClkWaveList)
+
                 NOTIFY_HANDLER(IDC_ENTRYLIST, LVN_ITEMCHANGED, OnLbnItemChangedEntryList)
+                
                 COMMAND_HANDLER(IDC_PLAYWAVEBUTTON, BN_CLICKED, OnPlayWave)
                 COMMAND_HANDLER(IDC_STOPWAVEBUTTON, BN_CLICKED, OnStopWave)
@@ -142 +143 @@
                 NOTIFY_HANDLER(IDC_WAVETABS, TCN_SELCHANGE, OnTcnSelchangeWavetab)
 
+                // From CWTLTabViewCtrl: 
+                // Parent windows must have REFLECT_NOTIFICATIONS() in the message map
+                // to pass along the TCN_SELCHANGE message to 
         END_MSG_MAP()
 
@@ -179 +183 @@
         LRESULT OnZoomSelection(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnZoomAll(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-        LRESULT OnLbnDblClkWaveList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-        LRESULT OnLbnSelChangeWaveList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+        LRESULT OnLbnDblClkWaveList(int /*idCtrl*/, LPNMHDR /*pnmh*/, BOOL& /*bHandled*/);
+        LRESULT OnLbnSelChangeWaveList(int /*idCtrl*/, LPNMHDR /*pnmh*/, BOOL& /*bHandled*/);
         LRESULT OnLbnItemChangedEntryList(int /*idCtrl*/, LPNMHDR /*pnmh*/, BOOL& /*bHandled*/);
         LRESULT OnTcnSelchangeWavetab(int /*idCtrl*/, LPNMHDR pNMHDR, BOOL& /*bHandled*/);