Changeset 1286

Timestamp:

10/16/07 02:45:58 (11 months ago)

Author:

calvin

Message:

pattern editor redraw when recording notes and column changes, factored sample editor tick markers and labeling, wavetable status bar also shows wave selection in current unit mode

Location:

trunk/src/buzelib

Files:

• PatternView.cpp (modified) (3 diffs)
• PatternView.h (modified) (2 diffs)
• WaveEditorCtrl.cpp (modified) (6 diffs)
• WaveEditorCtrl.h (modified) (1 diff)
• WaveTableView.cpp (modified) (10 diffs)

trunk/src/buzelib/PatternView.cpp

@@ -221 +221 @@
         mainFrame->addTimerHandler(this);
 
+        machine->addEventHandler(this);
         return 0;
 }
@@ -232 +233 @@
 
 LRESULT CPatternView::OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        machine->removeEventHandler(this);
+
         setPattern(0,0); // in case pattern is deleted and window updated before window is fully destroyed
+
 
         CMessageLoop* pLoop = _Module.GetMessageLoop();
@@ -1821 +1825 @@
         return 0;
 }
+
+bool CPatternView::invoke(zzub_event_data_t& data) {
+        if (!pattern) return false;
+        if (data.type == zzub::event_type_parameter_changed && document->player->recordParameters) {
+                // TODO: restrict updating to around currently playing row(s) only
+                for (int i = 0; i < pattern->getRows(); i++) {
+                        zzub::patterntrack* track = pattern->getPatternTrack(data.change_parameter.group, data.change_parameter.track);
+                        patternEditor.SetValue(data.change_parameter.group, data.change_parameter.track, data.change_parameter.param, i, track->getValue(i, data.change_parameter.param));
+                }
+                return true;
+        }
+        return false;
+}

trunk/src/buzelib/PatternView.h

@@ -51 +51 @@
         , public CMessageFilter
         , public CTimerHandler
+        , zzub::event_handler
 {
         friend class CPatternEditor;
@@ -318 +319 @@
     void OnUpdate(CView* pSender, LPARAM lHint, LPVOID pHint);
         virtual void updateTimer();
+        bool invoke(zzub_event_data_t& data);
 
     void bindPatternEditor();

trunk/src/buzelib/WaveEditorCtrl.cpp

@@ -187 +187 @@
         dc.Draw3dRect(&tlrc, GetSysColor(COLOR_BTNHIGHLIGHT), GetSysColor(COLOR_BTNSHADOW));//0, height, width, height+20);
 
-        float unit, firstTickValue;
-        float num_samples = wave->get_sample_count(currentLevel);
-        float samplesPerWord = num_samples / 65536;
-
-        switch (gridType) {
-                case WaveEditorSamples:
-                        unit=getDisplaySamplesPerPixel();
-                        firstTickValue=beginDisplaySample;
-                        break;
-                case WaveEditorTicks:
-                        unit=getDisplaySamplesPerTick();
-                        firstTickValue=(float)beginDisplaySample / view->mainFrame->player->masterInfo.samples_per_tick;
-                        break;
-                case WaveEditorSeconds:
-                        unit=getDisplaySamplesPerSec();
-                        firstTickValue=(float)beginDisplaySample / getWave()->get_samples_per_sec(getWaveLevel());
-                        break;
-                case WaveEditorWord:                                    
-                        unit=getDisplaySamplesPerWord();        
-                        firstTickValue=beginDisplaySample / samplesPerWord;
-                        break;
-                default:
-                        return 0;
-        }
-        
+        float samplesPerUnit = getSamplesPerUnit(gridType);
+        float unit = getDisplaySamplesPerUnit(samplesPerUnit);
+        float firstTickValue = beginDisplaySample / samplesPerUnit;
 
         // assume min 30px per major tick
-        float majorScale=unit*30.0f;
+        float majorScale = unit*30.0f;
         
         // round majorunit up to nearest 10, 100, 1000, 10000 etc if scale is in samples, or 1,2,4,8,16,etc for ticks or, ms,sec,min for time
-        if (majorScale<10)
-                majorScale=ceil(majorScale); else
-        if (majorScale<100)
-                majorScale=ceil(majorScale/10)*10; else
-        if (majorScale<1000)
-                majorScale=ceil(majorScale/100)*100; else
-        if (majorScale<10000)
-                majorScale=ceil(majorScale/1000)*1000; else
-        if (majorScale<100000)
-                majorScale=ceil(majorScale/10000)*10000; else
-                majorScale=ceil(majorScale/100000)*100000;
-
-        float roundAdjust=fmod(firstTickValue, majorScale);
-
-        float firstTick=firstTickValue - roundAdjust;
-
-        float tickX=-roundAdjust/unit;
+        if (majorScale < 10)
+                majorScale = ceil(majorScale); else
+        if (majorScale < 100)
+                majorScale = ceil(majorScale/10)*10; else
+        if (majorScale < 1000)
+                majorScale = ceil(majorScale/100)*100; else
+        if (majorScale < 10000)
+                majorScale = ceil(majorScale/1000)*1000; else
+        if (majorScale < 100000)
+                majorScale = ceil(majorScale/10000)*10000; else
+                majorScale = ceil(majorScale/100000)*100000;
+
+        float roundAdjust = fmod(firstTickValue, majorScale);
+
+        float firstTick = firstTickValue - roundAdjust;
+
+        float tickX = -roundAdjust/unit;
         CPen tickPen;
         tickPen.CreatePen(PS_SOLID, 1, (COLORREF)0x0);
@@ -242 +220 @@
 
         dc.SelectFont(tickFont);
-        int prevBkMode=dc.SetBkMode(TRANSPARENT);
-        while (tickX<width) {
+        int prevBkMode = dc.SetBkMode(TRANSPARENT);
+        while (tickX < width) {
                 dc.MoveTo(tickX, fullHeight+2);
                 dc.LineTo(tickX, fullHeight+8);
 
-                char pc[16];
-
-                if (gridType==WaveEditorWord)
-                        sprintf(pc, "%04X", (int)firstTick); else 
-                        sprintf(pc, "%i", (int)firstTick);
-
-                dc.TextOut(tickX, fullHeight+8, pc, strlen(pc));
-                tickX+=majorScale/unit;
-                firstTick+=majorScale;
+                std::string marker_str = formatSampleUnit(firstTick, gridType);
+                dc.TextOut(tickX, fullHeight+8, marker_str.c_str(), marker_str.length());
+                tickX += majorScale / unit;
+                firstTick += majorScale;
         }
 
@@ -284 +257 @@
 
         return DefWindowProc();
+}
+
+std::string CWaveEditorCtrl::formatSampleUnit(float units, WaveEditorGridMode mode) {
+        std::stringstream marker_strm;
+        if (mode == WaveEditorWord)
+                marker_strm << std::uppercase << std::setw(4) << std::hex << (unsigned int)units; else
+        if (mode == WaveEditorSeconds)
+                marker_strm << std::setprecision(2) << std::fixed << units / 1000.0f; else
+                marker_strm << (unsigned int)units;
+        return marker_strm.str();
 }
 
@@ -458 +441 @@
 
 LRESULT CWaveEditorCtrl::OnKeyDown( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-/*      switch (wParam) {
-                case 'S':
-                if (view->isShiftDown()) {
-                                zoomShowSelection();
-                        }
-                        break;
-                case 'A':
-                if (view->isShiftDown()) {
-                                zoomShowAll();
-                        }
-                        break;
-                case VK_DOWN:
-                        if (view->isShiftDown()) {
-                                zoomOut();
-                        }
-                        break;
-                case VK_UP:
-                        if (view->isShiftDown()) {
-                                zoomIn();
-                        }
-                        break;
-                case VK_RIGHT:
-                        MessageBox("scroll right");
-                        if (view->isShiftDown()) {
-                                MessageBox("move selection");
-                        }
-                        break;
-                case VK_LEFT:
-                        MessageBox("scroll left");
-                        if (view->isShiftDown()) {
-                                MessageBox("move selection");
-                        }
-                        break;
-                default:
-                        //MessageBox("WaveEditorCtrl keydown");
-                        break;
-        }
-*/
         return 0;
 }
@@ -521 +466 @@
 }
 
-float CWaveEditorCtrl::getDisplaySamplesPerPixel() {
-        // returns number of samples in a pixel
+float CWaveEditorCtrl::getSamplesPerUnit(WaveEditorGridMode mode) {
+        if (mode == WaveEditorSamples) {
+                return 1.0f;
+        } else
+        if (mode == WaveEditorTicks) {
+                return view->mainFrame->player->masterInfo.samples_per_tick;
+        } else
+        if (mode == WaveEditorSeconds) {
+                wave_info_ex* wave = getWave();
+                if (wave == 0) return 0.0f;
+                return (float)wave->get_samples_per_sec(currentLevel) / 1000.0f;
+        } else
+        if (mode == WaveEditorWord) {
+                wave_info_ex* wave = getWave();
+                if (wave == 0) return 0.0f;
+                float num_samples = wave->get_sample_count(currentLevel);
+                return num_samples / 65536;
+        }
+        
+        return 1.0f;
+}
+
+float CWaveEditorCtrl::getDisplaySamplesPerUnit(float samplesPerUnit) {
         RECT rc;
         GetClientRect(&rc);
-        float unit= (float)(endDisplaySample-beginDisplaySample) / rc.right;
-        return unit;
-}
-
-float CWaveEditorCtrl::getDisplaySamplesPerTick() {
-        // returns number of samples in a pixel
-        RECT rc;
-        GetClientRect(&rc);
-        float samplesPerTick=view->mainFrame->player->masterInfo.samples_per_tick_frac+view->mainFrame->player->masterInfo.samples_per_tick;
-        float unit= (float)(endDisplaySample-beginDisplaySample) / samplesPerTick / rc.right;
-        return unit;
-}
-
-float CWaveEditorCtrl::getDisplaySamplesPerSec() {
-        // returns number of samples in a pixel
-        RECT rc;
-        GetClientRect(&rc);
-        float unit= (float)(endDisplaySample-beginDisplaySample) / getWave()->get_samples_per_sec(getWaveLevel()) / rc.right;
-        return unit;
-}
-
-float CWaveEditorCtrl::getDisplaySamplesPerWord(){
-        // returns number of samples per "hexcent"
-        RECT rc;
-        GetClientRect(&rc);
- 
-        wave_info_ex* waveInfo=getWave();
-        if (waveInfo==0) return 0;
- 
-        float num_samples = waveInfo->get_sample_count(currentLevel);
-        float samplesPerWord = num_samples / 65536;
- 
-        float unit= (float)(endDisplaySample-beginDisplaySample) / samplesPerWord / rc.right;
-        return unit;
-}
-
+        return (float)(endDisplaySample-beginDisplaySample) / samplesPerUnit / rc.right;
+}
 
 LRESULT CWaveEditorCtrl::OnHScroll(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
@@ -566 +498 @@
         WORD req=LOWORD(wParam);
         // how many samples are 1 pixel?
-        float unit=getDisplaySamplesPerPixel();
+        float unit = getDisplaySamplesPerUnit(1);
+
+        //float unit = getDisplaySamplesPerPixel();
         if (unit<1.0f) unit=1.0f;
 

trunk/src/buzelib/WaveEditorCtrl.h

@@ -107 +107 @@
         int getWaveLevel();
 
-        float getDisplaySamplesPerPixel();
-        float getDisplaySamplesPerTick();
-        float getDisplaySamplesPerSec();
-        float getDisplaySamplesPerWord();
+        float getSamplesPerUnit(WaveEditorGridMode mode);
+        float getDisplaySamplesPerUnit(float samplesPerUnit);
+        std::string formatSampleUnit(float units, WaveEditorGridMode mode);
 
         void zoomShowSelection();

trunk/src/buzelib/WaveTableView.cpp

@@ -12 +12 @@
 #include "Utils/Keymaps.h"
 
+#ifdef min
+        #undef min
+#endif
+
+#ifdef max
+        #undef max
+#endif
+
+
 using namespace std;
 using namespace zzub;
@@ -92 +101 @@
         waveMachineDropDown.InsertString(-1, "<select machine>");
         for (size_t i=0; i<view->mainFrame->player->getMachines(); i++) {
-                metaplugin* machine=view->mainFrame->player->getMachine(i);
-                if (!machine->loader) continue;
-
-                const zzub::info* info=machine->loader->plugin_info;
-
-                if (info->flags&plugin_flag_plays_waves) {
-                        waveMachineDropDown.InsertString(-1, machine->getName().c_str());
-                }
+                metaplugin* machine = view->mainFrame->player->getMachine(i);
+                if (machine->nonSongPlugin) continue;
+                if ((machine->loader->plugin_info->flags&plugin_flag_plays_waves) == 0) continue;
+
+                waveMachineDropDown.InsertString(-1, machine->getName().c_str());
         }
         waveMachineDropDown.SetCurSel(0);
@@ -336 +342 @@
                 SendMessage(hWndEditToolBar, TB_PRESSBUTTON, ID_WAVE_ZOOM_WORD, TRUE);
                         break;
-
         }
 }
@@ -617 +622 @@
         int waveIndex = waveEditorCtrl.getWaveIndex();
         waveEditorCtrl.setEditWave(waveIndex, level);
+        bindStatus();
 
         return 0;
@@ -625 +631 @@
         waveEditorCtrl.endSelectSample=waveEditorCtrl.getWave()->get_sample_count(waveEditorCtrl.getWaveLevel())-1;
         waveEditorCtrl.Invalidate();
+        bindStatus();
 
         return 0;
@@ -653 +660 @@
         updateToolbar();
         waveEditorCtrl.Invalidate(FALSE);
+        bindStatus();
         return 0;
 }
@@ -660 +668 @@
         updateToolbar();
         waveEditorCtrl.Invalidate(FALSE);
+        bindStatus();
         return 0;
 }
@@ -667 +676 @@
         updateToolbar();
         waveEditorCtrl.Invalidate(FALSE);
-        return 0;
-}
-
-// test 014
+        bindStatus();
+        return 0;
+}
+
 LRESULT CWaveTableView::OnZoomWord(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& bHandled) {
         waveEditorCtrl.gridType=WaveEditorWord;
         updateToolbar();
         waveEditorCtrl.Invalidate(FALSE);
-        return 0;
-}
-
-
+        bindStatus();
+        return 0;
+}
 
 LRESULT CWaveTableView::OnZoomIn(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& bHandled) {
@@ -713 +721 @@
                 case UpdateSelectedWave:
                         updateFromWaveTable();
+                        bindStatus();
                         break;
                 case UpdateSelectedWaveEntry:
                         bindWaveLevels();
                         waveEditorCtrl.Invalidate(FALSE);
+                        bindStatus();
                         break;
                 case UpdateMachines:
@@ -743 +753 @@
 void CWaveTableView::bindStatus() {                     
         
-        wave_info_ex* test=waveEditorCtrl.getWave(); //test = currently selected wave entry
-        if (test==0) return;
-
-        float num_samples = waveEditorCtrl.getWave()->get_sample_count(waveEditorCtrl.getWaveLevel());
-        long hexfrompixel = ((waveEditorCtrl.currentCursorSamplePosition/num_samples)*65536);
-        
-        std::stringstream valueStrm;    //current mode
-        
-        if (waveEditorCtrl.gridType==WaveEditorSamples)
-                valueStrm << "Samples";         else
-        if (waveEditorCtrl.gridType==WaveEditorTicks)
-                valueStrm << "Ticks";           else
-        if (waveEditorCtrl.gridType==WaveEditorSeconds)
-                valueStrm << "Seconds";         else
-        if (waveEditorCtrl.gridType==WaveEditorWord)
-                valueStrm << std::hex << hexfrompixel;
-
-
-
-        statusBar.SetText(1, valueStrm.str().c_str());
-}
+        wave_info_ex* wave = waveEditorCtrl.getWave(); //test = currently selected wave entry
+
+        float num_samples = 0;
+        
+        if (wave != 0)
+                num_samples = wave->get_sample_count(waveEditorCtrl.getWaveLevel());
+
+        WaveEditorGridMode gridType = waveEditorCtrl.gridType;
+        float samples_per_unit = waveEditorCtrl.getSamplesPerUnit(gridType);
+
+        std::stringstream pos_strm;
+        std::stringstream select_strm;
+        
+        std::string unit_name;
+        switch (gridType) {
+                case WaveEditorSamples:
+                        unit_name = "samples";
+                        break;
+                case WaveEditorSeconds:
+                        unit_name = "sec";
+                        break;
+                case WaveEditorTicks:
+                        unit_name = "ticks";
+                        break;
+                case WaveEditorWord:
+                        unit_name = "hex";
+                        break;
+                default:
+                        unit_name = "??";
+                        break;
+        }
+
+        if (waveEditorCtrl.beginSelectSample != -1) {
+                float min_select = std::min(waveEditorCtrl.beginSelectSample, waveEditorCtrl.endSelectSample);
+                float max_select = std::max(waveEditorCtrl.beginSelectSample, waveEditorCtrl.endSelectSample);
+
+                float select_start_unit = min_select / samples_per_unit;
+                float select_end_unit = max_select / samples_per_unit;
+
+                std::stringstream selectStrm;
+                select_strm << "Select " << waveEditorCtrl.formatSampleUnit(select_start_unit, gridType) << " to " << waveEditorCtrl.formatSampleUnit(select_end_unit, gridType) << " (" << unit_name << ")";
+        }
+        
+        if (num_samples != 0) {
+                int sample_unit = (float)waveEditorCtrl.currentCursorSamplePosition / samples_per_unit;
+                std::string sample_unit_string = waveEditorCtrl.formatSampleUnit(sample_unit, gridType);
+
+                pos_strm << "Pos: " << sample_unit_string << " (" << unit_name << ")";
+        }
+
+        statusBar.SetText(0, pos_strm.str().c_str());
+        statusBar.SetText(1, select_strm.str().c_str());
+}