Added sample reveal on stop event

Author: sadko4u

include/private/ui/trigger.h

@@ -34,10 +34,15 @@ namespace lsp
             protected:
                 ui::IPort                  *pCurrentSample;         // Current sample
                 ui::IPort                  *pRevealSampleOnListen;  // Reveal sample on listen option
-                tk::Button                 *wSampleListen[meta::trigger_metadata::SAMPLE_FILES];  // Listen buttons for files
+                tk::Button                 *wSampleListen[meta::trigger_metadata::SAMPLE_FILES];    // Listen buttons for files
+                tk::Button                 *wSampleStop[meta::trigger_metadata::SAMPLE_FILES];      // Stop buttons for files
 
             protected:
                 static status_t     slot_submit_listen_sample(tk::Widget *sender, void *ptr, void *data);
+                static status_t     slot_submit_stop_sample(tk::Widget *sender, void *ptr, void *data);
+
+            protected:
+                status_t            show_sample(size_t index);
 
             public:
                 explicit trigger(const meta::plugin_t *meta);

res/main/ui/plugins/trigger/single/mono.xml

@@ -302,6 +302,7 @@
 								text="icons.playback_big.play"
 								size="32" ui:inject="Button_cyan" toggle="false" pad.b="6"/>
 							<button id="lc_${i}"
+								ui:id="trg_stop_sample_${i}"
 								font.name="lsp-icons" font.size="10"
 								text="icons.playback_big.stop"
 								size="32" ui:inject="Button_cyan" toggle="false" pad.b="6" />

res/main/ui/plugins/trigger/single/stereo.xml

@@ -313,7 +313,12 @@
 								font.name="lsp-icons" font.size="10"
 								text="icons.playback_big.play"
 								size="32" ui:inject="Button_cyan" toggle="false" pad.b="6"/>
-							<button id="lc_${i}" font.name="lsp-icons" font.size="10" text="icons.playback_big.stop" size="32" ui:inject="Button_cyan" toggle="false" pad.b="6"/>
+							<button
+								ui:id="trg_stop_sample_${i}"
+								id="lc_${i}"
+								font.name="lsp-icons" font.size="10"
+								text="icons.playback_big.stop" size="32"
+								ui:inject="Button_cyan" toggle="false" pad.b="6"/>
 							<led id="no_${i}" pad.b="6" width="32" height="6"/>
 						</ui:with>
 						<cell rows="11">

src/main/ui/trigger.cpp

@@ -54,6 +54,8 @@ namespace lsp
 
             for (size_t i=0; i<meta::trigger_metadata::SAMPLE_FILES; ++i)
                 wSampleListen[i]        = NULL;
+            for (size_t i=0; i<meta::trigger_metadata::SAMPLE_FILES; ++i)
+                wSampleStop[i]          = NULL;
         }
 
         trigger::~trigger()
@@ -110,12 +112,29 @@ namespace lsp
                 if (listen != NULL)
                     listen->slots()->bind(tk::SLOT_CHANGE, slot_submit_listen_sample, this);
 
+                tk::Button * const stop     = w->get_widgetf<tk::Button>("trg_stop_sample_%d", int(i));
+                if (stop != NULL)
+                    stop->slots()->bind(tk::SLOT_CHANGE, slot_submit_stop_sample, this);
+
                 wSampleListen[i]            = listen;
+                wSampleStop[i]              = stop;
             }
 
             return STATUS_OK;
         }
 
+        status_t trigger::show_sample(size_t index)
+        {
+            if (pCurrentSample == NULL)
+                return STATUS_OK;
+
+            pCurrentSample->begin_edit();
+            pCurrentSample->set_value(index);
+            pCurrentSample->notify_all(ui::PORT_USER_EDIT);
+            pCurrentSample->end_edit();
+            return STATUS_OK;
+        }
+
         status_t trigger::slot_submit_listen_sample(tk::Widget *sender, void *ptr, void *data)
         {
             trigger * const self = static_cast<trigger *>(ptr);
@@ -135,13 +154,32 @@ namespace lsp
             for (size_t i=0; i<meta::trigger_metadata::SAMPLE_FILES; ++i)
             {
                 if (sender == self->wSampleListen[i])
-                {
-                    self->pCurrentSample->begin_edit();
-                    self->pCurrentSample->set_value(i);
-                    self->pCurrentSample->notify_all(ui::PORT_USER_EDIT);
-                    self->pCurrentSample->end_edit();
-                    return STATUS_OK;
-                }
+                    return self->show_sample(i);
+            }
+
+            return STATUS_OK;
+        }
+
+        status_t trigger::slot_submit_stop_sample(tk::Widget *sender, void *ptr, void *data)
+        {
+            trigger * const self = static_cast<trigger *>(ptr);
+            if (self == NULL)
+                return STATUS_OK;
+            if (self->pCurrentSample == NULL)
+                return STATUS_OK;
+            if ((self->pRevealSampleOnListen == NULL) || (self->pRevealSampleOnListen->value() < 0.5f))
+                return STATUS_OK;
+
+            // Ensure that button has been pushed down
+            tk::Button * const btn = tk::widget_cast<tk::Button>(sender);
+            if ((btn == NULL) || (!btn->down()->get()))
+                return STATUS_OK;
+
+            // Find the related sample and activate it
+            for (size_t i=0; i<meta::trigger_metadata::SAMPLE_FILES; ++i)
+            {
+                if (sender == self->wSampleStop[i])
+                    return self->show_sample(i);
             }
 
             return STATUS_OK;