Added listen button that allows to feed audio sample preview to direct outputs

Author: sadko4u

CHANGELOG

@@ -3,6 +3,7 @@
 *******************************************************************************
 
 === 1.0.33 ===
+* Added listen button that allows to feed audio sample preview to direct outputs.
 * Offline tasks are optimized for better floating-point computing.
 
 === 1.0.32 ===

include/private/plugins/sampler.h

@@ -47,7 +47,8 @@ namespace lsp
                 enum dm_mode_t
                 {
                     DM_APPLY_GAIN   = 1 << 0,
-                    DM_APPLY_PAN    = 1 << 1
+                    DM_APPLY_PAN    = 1 << 1,
+                    DM_APPLY_LISTEN = 1 << 2
                 };
 
                 typedef struct sampler_channel_t
@@ -129,6 +130,7 @@ namespace lsp
                 plug::IPort        *pInstSel;           // Instrument selector
                 plug::IPort        *pDOGain;            // Direct output gain flag
                 plug::IPort        *pDOPan;             // Direct output panning flag
+                plug::IPort        *pDOListen;          // Direct output listen flag
 
             protected:
                 void            process_trigger_events();

res/main/ui/sampling/multiple.xml

@@ -15,6 +15,7 @@
 				<label text="labels.direct_output_" pad.l="12"/>
 				<button text="labels.gain" id="do_gain" ui:inject="Button_magenta"/>
 				<button text="labels.panning" id="do_pan" ui:inject="Button_yellow"/>
+				<button text="labels.listen" id="do_lstn" ui:inject="Button_green"/>
 			</ui:if>
 			<void hexpand="true"/>
 		</hbox>

src/doc/manuals/plugins/multisampler.php

@@ -97,6 +97,14 @@
 <ul>
 	<li><b>Bypass</b> - hot bypass switch, when turned on (led indicator is shining), the plugin does not affect the input signal.</li>
 	<li><b>Workspace</b> - combo box that allows to switch between instrument setup and instrument mixer.</li>
+	<?php if ($do) { ?>
+		<li><b>Direct output</b> - set of buttons that allow to control the behaviour of all direct outputs:</li>
+		<ul>
+			<li><b>Gain</b> - the loudness of the instrument is also applied to direct output signal.</li>
+			<li><b>Panning</b> - the panning of the instrument is also applied to direct output signal.</li>
+			<li><b>Listen</b> - the sound of sample preview is also fed to direct output.</li>
+		</ul>
+	<?php } ?>
 </ul>
 
 <p><b>'Instrument mixer' section:</b></p>

src/main/meta/sampler.cpp

@@ -39,6 +39,10 @@ namespace lsp
 {
     namespace meta
     {
+        // Lisf of different revisions for adding controls
+        #define REV_0       0
+        #define REV_1       1
+
         //-------------------------------------------------------------------------
         // Sampler
         static const port_item_t sampler_sample_selectors[] =
@@ -238,7 +242,8 @@ namespace lsp
 
         #define S_DO_CONTROL \
             SWITCH("do_gain", "Apply gain to direct-out", "DOut gain on", 1.0f), \
-            SWITCH("do_pan", "Apply panning to direct-out", "DOut pan on", 1.0f)
+            SWITCH("do_pan", "Apply panning to direct-out", "DOut pan on", 1.0f), \
+            ADDON_SWITCH(REV_1, "do_lstn", "Pass listen events to direct-out", "DOut listen on", 0.0f)
 
         #define S_SAMPLE_FILE(gain)        \
             PATH("sf", "Sample file"), \

src/main/plug/sampler.cpp

@@ -122,6 +122,7 @@ namespace lsp
             pInstSel        = NULL;
             pDOGain         = NULL;
             pDOPan          = NULL;
+            pDOListen       = NULL;
         }
 
         sampler::~sampler()
@@ -243,6 +244,7 @@ namespace lsp
             {
                 BIND_PORT(pDOGain);
                 BIND_PORT(pDOPan);
+                BIND_PORT(pDOListen);
             }
 
             // If number of samplers <= 2 - skip area selector
@@ -421,6 +423,8 @@ namespace lsp
                 nDOMode        |= DM_APPLY_GAIN;
             if ((pDOPan != NULL) && (pDOPan->value() >= 0.5f))
                 nDOMode        |= DM_APPLY_PAN;
+            if ((pDOListen != NULL) && (pDOListen->value() >= 0.5f))
+                nDOMode        |= DM_APPLY_LISTEN;
 
             lsp_trace("muting=%s", (bMuting) ? "true" : "false");
             lsp_trace("note_off=%s", (note_off) ? "true" : "false");
@@ -697,27 +701,33 @@ namespace lsp
                     // Now post-process all channels for sampler
                     for (size_t j=0; j<nChannels; ++j)
                     {
-                        sampler_channel_t *c    = &s->vChannels[j];
+                        sampler_channel_t * const c1   = &s->vChannels[j];
+                        sampler_channel_t * const c2   = &s->vChannels[j ^ 1];
 
                         // Copy data to direct output buffer if present
                         float gain  = (nDOMode & DM_APPLY_GAIN) ? s->fGain : 1.0f;
-                        float pan   = (nDOMode & DM_APPLY_PAN) ? c->fPan : 1.0f;
-                        if (s->vChannels[j].vDry != NULL)
-                            dsp::fmadd_k3(s->vChannels[j].vDry, tmp_outs[j], pan * gain, count);
-                        if (s->vChannels[j^1].vDry != NULL)
-                            dsp::fmadd_k3(s->vChannels[j^1].vDry, tmp_outs[j], (1.0f - pan) * gain, count);
+                        float pan   = (nDOMode & DM_APPLY_PAN) ? c1->fPan : 1.0f;
+
+                        if (c1->vDry != NULL)
+                        {
+                            dsp::fmadd_k3(c1->vDry, tmp_outs[j], pan * gain, count);
+                            if (nDOMode & DM_APPLY_LISTEN)
+                                dsp::add2(c1->vDry, tmp_listen[j], count);
+                        }
+                        if (c2->vDry != NULL)
+                            dsp::fmadd_k3(c2->vDry, tmp_outs[j], (1.0f - pan) * gain, count);
 
                         // Process output
-                        c->sBypass.process(tmp_outs[j], NULL, tmp_outs[j], count);
+                        c1->sBypass.process(tmp_outs[j], NULL, tmp_outs[j], count);
                         dsp::add2(tmp_outs[j], tmp_listen[j], count);
 
                         // Mix output to common sampler's bus
                         if (vChannels[j].vOut != NULL)
-                            dsp::fmadd_k3(vChannels[j].vOut, tmp_outs[j], c->fPan * s->fGain, count);
+                            dsp::fmadd_k3(vChannels[j].vOut, tmp_outs[j], c1->fPan * s->fGain, count);
 
                         // Apply pan to the other stereo channel (if present)
                         if (vChannels[j^1].vOut != NULL)
-                            dsp::fmadd_k3(vChannels[j^1].vOut, tmp_outs[j], (1.0f - c->fPan) * s->fGain, count);
+                            dsp::fmadd_k3(vChannels[j^1].vOut, tmp_outs[j], (1.0f - c1->fPan) * s->fGain, count);
                     }
 
                     // Post-process dry channels