Changeset 1292

Timestamp:

10/29/07 18:00:38 (10 months ago)

Author:

calvin

Message:

zoners patches: colored vu, vc8 patterneditor compile fix, preset save bug.
audio driver prefs shows only allowed recording devices for selected output device.
updated credits, updated shortcuts in the f1-docs.

Location:

trunk/src/buzelib

Files:

• PatternEditor/PatternEditorControl.cpp (modified) (2 diffs)
• Preferences/AudioDriverPreferencesView.cpp (modified) (7 diffs)
• PresetDialog.cpp (modified) (2 diffs)
• VisualVolumeSlider.cpp (modified) (3 diffs)
• VisualVolumeSlider.h (modified) (2 diffs)
• buze.rc (modified) (1 diff)
• res/about.txt (modified) (1 diff)
• res/help.txt (modified) (1 diff)
• res/keyboard_parameters.txt (modified) (1 diff)
• res/keyboard_patterneditor.txt (modified) (2 diffs)
• res/keyboard_wavetable.txt (modified) (1 diff)

trunk/src/buzelib/PatternEditor/PatternEditorControl.cpp

@@ -35 +35 @@
 
         // render row numbers
-        for (int i = 0; i <= screenrows && i + editor.scroll.y < editor.rows; i++) {
+        int i;
+        for (i = 0; i <= screenrows && i + editor.scroll.y < editor.rows; i++) {
                 int rownum = (i + editor.scroll.y) * editor.skip;
                 std::stringstream str;
@@ -51 +52 @@
         screenDC.FillSolidRect(0, 0, rcClient.right, y, bgcolor);
 
-        for (int i = 0; i < editor.tracks.size(); i++) {
+        for (i = 0; i < editor.tracks.size(); i++) {
                 int track_x = editor.tracks[i].unit * editor.font_size.cx;
                 int scroll_x = editor.scroll.x * editor.font_size.cx;

trunk/src/buzelib/Preferences/AudioDriverPreferencesView.cpp

@@ -70 +70 @@
         updateSampleRates();
         updateChannels();
+        updateDrivers();
         return 0;
 }
@@ -80 +81 @@
         }
         recordDevice = mainFrame->driver->getDeviceInfo(recordDevices[inputIndex]);
-return 0;
+        return 0;
 }
 
@@ -101 +102 @@
 void CAudioDriverPreferencesView::updateLatencies() {
 
-        while (int i = audioLatencyDropDown.GetCount())
-                audioLatencyDropDown.DeleteString(i-1);
+        audioLatencyDropDown.ResetContent();
 
         unsigned int rate = 0;
@@ -134 +134 @@
 
 void CAudioDriverPreferencesView::updateChannels() {
-        while (int i = audioChannelDropDown.GetCount())
-                audioChannelDropDown.DeleteString(i-1);
+        audioChannelDropDown.ResetContent();
 
         int channels = device->out_channels / 2;
@@ -151 +150 @@
 void CAudioDriverPreferencesView::updateSampleRates() {
 
-        while (int i = audioRateDropDown.GetCount())
-                audioRateDropDown.DeleteString(i-1);
+        audioRateDropDown.ResetContent();
 
         sampleRates.clear();
@@ -191 +189 @@
 
 void CAudioDriverPreferencesView::updateDrivers() {
+
+        audioDriverDropDown.ResetContent();
+        recordDriverDropDown.ResetContent();
+
         recordDriverDropDown.InsertString(-1, "<none>");
 
-        audiodriver* driver=mainFrame->driver;
-        //int ins = 0, outs = 0;
+        audiodriver* driver = mainFrame->driver;
+
+        int api_id = device?device->api_id:0;
+
         for (int i=0; i<driver->getDeviceCount(); i++) {
                 audiodevice* dev = driver->getDeviceInfo(i);
@@ -201 +205 @@
                         outputDevices.push_back(i);
                 }
-                if (dev->in_channels>0) {
+                if (api_id == dev->api_id &&  dev->in_channels>0) {
                         recordDriverDropDown.InsertString(-1, dev->name.c_str());
                         recordDevices.push_back(i);

trunk/src/buzelib/PresetDialog.cpp

@@ -49 +49 @@
 
         zzub::pattern conv(plugin, 0);
+        int valueIndex = 0;
         for (size_t i = 0; i < conv.getColumns(); i++) {
                 const zzub::parameter* param = conv.getColumnParameter(i);
@@ -55 +56 @@
                 size_t pgroup=0, ptrack=0, pcolumn=0;
                 conv.linearToPattern(i, pgroup, ptrack, pcolumn);
+                if(pgroup == 0) continue;
 
-                pi->values[i] = plugin->getParameter(pgroup, ptrack, pcolumn);
+                pi->values[valueIndex] = plugin->getParameter(pgroup, ptrack, pcolumn);
                 pi->parameters++;
+                valueIndex++;
         }
 

trunk/src/buzelib/VisualVolumeSlider.cpp

@@ -20 +20 @@
         mainFrame = mainFrm;
     maxL = maxR = 0;
+        rPeak = lPeak = rDrop = lDrop = 0;
+        rPeakColor = lPeakColor = 0;
         counter = 0;
     machine = 0;
@@ -128 +130 @@
                 strcpy(pc, "L");
 
+        double f;
+        long pos12db;
+        long pos6db;
+        long ivPos;
+        long peakPos;
+        float *curPeak;
+        float *curDrop;
+        COLORREF *curPeakColor;
         float iV=0;
-        if (pc[0]=='L')
-                iV=(linear_to_dB(maxL)+30) / 30; else
+        if (pc[0]=='L') {
+                iV=(linear_to_dB(maxL)+30) / 30;
+                curPeak = &lPeak;
+                curPeakColor = &lPeakColor;
+                curDrop = &lDrop;
+        } else {
                 iV=(linear_to_dB(maxR)+30) / 30;
+                curPeak = &rPeak;
+                curPeakColor = &rPeakColor;
+                curDrop = &rDrop;
+        }
 
         if (iV<0) iV=0;
@@ -138 +156 @@
         rc.bottom -= 2;
 
+
+        if (*curPeak < iV)
+        {
+                (*curPeak) = iV;
+                (*curPeakColor) = (iV < VU_PERCENT_12DB) ? VU_COLOR_LOW : (iV < VU_PERCENT_6DB) ? VU_COLOR_12DB : VU_COLOR_6DB;
+                (*curDrop) = 0; //VU_PEAK_DROPRATE;
+        }
+
+        f = (direction == SB_VERT) ? rc.bottom : rc.right;
+        ivPos = (LONG)(iV * f);
+        pos12db = (LONG)(VU_PERCENT_12DB * f);
+        pos6db = (LONG)(VU_PERCENT_6DB * f);
+        peakPos = (LONG)((*curPeak) * f);
+
+        // Draw the VU meter
+
         if (direction == SB_VERT) {
-                double f = rc.bottom;
-                RECT rcAmp = { 0, rc.bottom - (LONG)(iV*f), rc.right, rc.bottom };
+                RECT rcAmp = { 0, rc.bottom - ((iV > VU_PERCENT_12DB) ? pos12db : ivPos), rc.right, rc.bottom };
                 OffsetRect(&rcAmp, 1, 1);
-                dc.FillSolidRect(&rcAmp, 0x00ff00);
-
-                RECT rcBlank = { 0, 0, rc.right, rc.bottom - (LONG)(iV*f) + 1};
+                dc.FillSolidRect(&rcAmp, VU_COLOR_LOW);
+                if (iV > VU_PERCENT_12DB) {
+                        RECT rc12db = { 0, rc.bottom - pos12db, rc.right, rc.bottom - ((iV > VU_PERCENT_6DB) ? pos6db : ivPos) };
+                        OffsetRect(&rc12db, 1, 1);
+                        dc.FillSolidRect(&rc12db, VU_COLOR_12DB);
+                        if (iV > VU_PERCENT_6DB) {
+                                RECT rc6db = { 0, rc.bottom - pos6db, rc.right, rc.bottom - ivPos};
+                                OffsetRect(&rc6db, 1, 1);
+                                dc.FillSolidRect(&rc6db, VU_COLOR_6DB);
+                        }
+                }
+        } else {
+                RECT rcAmp = {0, 0, (iV > VU_PERCENT_12DB) ? pos12db : ivPos, rc.bottom };
+                OffsetRect(&rcAmp, 1, 1);
+                dc.FillSolidRect(&rcAmp, VU_COLOR_LOW);
+                if (iV > VU_PERCENT_12DB) {
+                        RECT rc12db = {pos12db, 0, (iV > VU_PERCENT_6DB) ? pos6db : ivPos, rc.bottom };
+                        OffsetRect(&rc12db, 1, 1);
+                        dc.FillSolidRect(&rc12db, VU_COLOR_12DB);
+                        if (iV > VU_PERCENT_6DB) {
+                                RECT rc6db = {pos6db, 0, ivPos, rc.bottom };
+                                OffsetRect(&rc6db, 1, 1);
+                                dc.FillSolidRect(&rc6db, VU_COLOR_6DB);
+                        }
+                }
+        }
+
+        // Draw blank part and peak line
+
+        if (direction == SB_VERT) {
+                RECT rcBlank = { 0, 0, rc.right, rc.bottom - ivPos + 1};
                 OffsetRect(&rcBlank, 1, 1);
-                dc.FillSolidRect(&rcBlank, 0x000000);
-        } else {
-                double f = rc.right;
-                RECT rcAmp = {0, 0, (LONG)(iV*f), rc.bottom };
-                OffsetRect(&rcAmp, 1, 1);
-                dc.FillSolidRect(&rcAmp, 0x00ff00);
-//              DrawAmpRect(dc, &rcAmp, iV, SB_HORZ);
-
-                RECT rcBlank={(LONG)(iV*f)+1, 0, rc.right, rc.bottom};
+                dc.FillSolidRect(&rcBlank, VU_COLOR_BLANK);
+
+                if(*curPeak) {
+                        RECT rcPeak={0, rc.bottom - peakPos, rc.right, rc.bottom - peakPos + 2};
+                        OffsetRect(&rcPeak, 1, 1);
+                        dc.FillSolidRect(&rcPeak, (*curPeakColor));
+                        (*curPeak) -= (*curDrop);
+                        (*curDrop) += VU_PEAK_DROPRATE;
+                }
+        } else {
+                RECT rcBlank={ivPos + 1, 0, rc.right, rc.bottom};
                 OffsetRect(&rcBlank, 1, 1);
-                dc.FillSolidRect(&rcBlank, 0x000000);
-        }
-
+                dc.FillSolidRect(&rcBlank, VU_COLOR_BLANK);
+
+                if(*curPeak) {
+                        RECT rcPeak={peakPos, 0, peakPos + 2, rc.bottom};
+                        OffsetRect(&rcPeak, 1, 1);
+                        dc.FillSolidRect(&rcPeak, (*curPeakColor));
+                        (*curPeak) -= (*curDrop);
+                        (*curDrop) += VU_PEAK_DROPRATE;
+                }
+        }
         return 0;
 }

trunk/src/buzelib/VisualVolumeSlider.h

@@ -7 +7 @@
 // could be made to work both horizontal and vertical, and then
 // create a builtin master mixer-board to set vol and pan
+
+#define VU_COLOR_LOW    0x00ff00        /* Green */
+#define VU_COLOR_12DB   0x99CCFF        /* Yellow */
+#define VU_COLOR_6DB    0x0000FF        /* Red */
+#define VU_COLOR_BLANK  0x000000        /* Black */
+
+#define VU_PERCENT_12DB 0.91            /* Approximately -12 dB judging from jedShivaMeter */
+#define VU_PERCENT_6DB  0.955           /* Approximately  -6 dB judging from jedShivaMeter */
+
+#define VU_PEAK_DROPRATE 0.005
 
 const int VISUAL_BUFFER_SIZE = 1024;
@@ -29 +39 @@
 
         float maxR, maxL;
+        float rPeak, lPeak;
+        float rDrop, lDrop;
+        COLORREF lPeakColor;
+        COLORREF rPeakColor;
         int direction;  // SB_VERT or SB_HORZ
 

trunk/src/buzelib/buze.rc

@@ -987 +987 @@
 IDR_PARAMETERVIEW ACCELERATORS
 BEGIN
+    VK_F1,          ID_HELP,                VIRTKEY, NOINVERT
         VK_TAB,                 ID_PARAMETERVIEW_NEXTSLIDER, VIRTKEY, NOINVERT
         VK_TAB,                 ID_PARAMETERVIEW_PREVIOUSSLIDER, VIRTKEY, SHIFT, NOINVERT

trunk/src/buzelib/res/about.txt

@@ -3 +3 @@
  * Main coding by Anders Ervik
  * Psycle and LADSPA wrappers by Polac
- * Additional code by halfo and zeffii
+ * Additional code by halfo, zeffii and zoner
  * Toolbar icons by Hiren Shah
  * The default index.txt created by Wayfinder

trunk/src/buzelib/res/help.txt

@@ -25 +25 @@
         Delete                          Delete selection
 
+        Shift+Enter                     Show machine parameters
         Ctrl+Backspace                  Show properties
 

trunk/src/buzelib/res/keyboard_parameters.txt

@@ -2 +2 @@
 Parameter View keyboard shortcuts
         
+        (keyboard notes)                Play notes in selected machine
+        Tab                             Next parameter
+        Shift+Tab                       Previous parameter
         Right/Left                      +/- 1 
         Shift+Right/Shift+Left          +/- 4 
         Ctrl+Right/Ctrl+Left            +/- 32 
         0..9                            Type a value 
-        alt+p                           Preset Dropdown
+        Alt+P                           Preset Dropdown
         

trunk/src/buzelib/res/keyboard_patterneditor.txt

@@ -26 +26 @@
         Shift+F5                        Play current pattern  
         Shift+F6                        Play current pattern from cursor
-        Shift+Enter                     Play row under cursor 
+        Shift+8                         Play row under cursor 
         Ctrl+Enter                      New pattern 
         Ctrl+Shift+Enter                Clone pattern 
@@ -68 +68 @@
         Space                           Paste current parameter value
         Ctrl+Space                      Paste current group values
+        Ctrl+T                          Toggle column editor for number columns
         (keyboard notes)                Edit notes 

trunk/src/buzelib/res/keyboard_wavetable.txt

@@ -2 +2 @@
 Wave table keyboard shortcuts
 
-        F9                                      Show file browser
+        (keyboard notes)                Play notes with selected wave
+        F9                              Show file browser
         Shift+A                         Zoom out, show all
         Shift+S                         Zoom to selection