From 2debad5744f6d38e54aa6477c26a5181dc8fa5f7 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Mon, 7 Mar 2022 00:14:48 +0100
Subject: [PATCH] - Add Master output audio ports - Update .gitignore

---
 .gitignore  | 10 ++++++----
 drmr2-mkttl | 14 +++++++++++++-
 drmr2.c     | 36 +++++++++++++++++++++++++++++-------
 drmr2.h     |  4 ++++
 4 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 800fd16..9f2a677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
-drmr.so
-drmr_ui.xml
-drmr_ui.so
-drmr.lv2
+*~
+drmr2.so
+drmr2_ui.xml
+drmr2_ui.so
+drmr2.lv2
+drmr2.ttl
 build
 /logo.xcf
 /htest
diff --git a/drmr2-mkttl b/drmr2-mkttl
index 51fbcd1..e624300 100755
--- a/drmr2-mkttl
+++ b/drmr2-mkttl
@@ -70,7 +70,19 @@ add_port "," "    a lv2:InputPort , atom:AtomPort;
     lv2:name \"Control\";"
 
 
-idx=1
+
+add_port "," "    a lv2:AudioPort, lv2:OutputPort;
+  lv2:index %d;
+  lv2:symbol \"master_out_1\";
+  lv2:name \"Master - Out 1\";"
+
+add_port "," "    a lv2:AudioPort, lv2:OutputPort;
+  lv2:index %d;
+  lv2:symbol \"master_out_2\";
+  lv2:name \"Master - Out 2\";"
+
+
+
 out_id=0
 
 while [[ "${out_id}" -lt "${outport_nb}" ]]
diff --git a/drmr2.c b/drmr2.c
index 0f45c81..942e874 100644
--- a/drmr2.c
+++ b/drmr2.c
@@ -166,7 +166,15 @@ connect_port(LV2_Handle instance,
 	    break;
 
 	default:
-	    if( port_index >= DRMR_LEFT_00 && port_index <= DRMR_RIGHT_31)
+	    if( port_index == DRMR_MASTER_LEFT)
+	    {
+		drmr->master_right = (float*)data;
+	    }
+	    else if( port_index == DRMR_MASTER_RIGHT)
+	    {
+		drmr->master_left = (float*)data;
+	    }
+	    else if( port_index >= DRMR_LEFT_00 && port_index <= DRMR_RIGHT_31)
 	    {
 		int outoff = (port_index - DRMR_LEFT_00) / 2;
 
@@ -191,7 +199,7 @@ connect_port(LV2_Handle instance,
 	    }
 
 	    break;
-  }
+    }
 }
 
 
@@ -357,7 +365,8 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
 	  {
 	      case 8:
 	      {
-		  if (!drmr->ignore_note_off) {
+		  if (!drmr->ignore_note_off)
+		  {
 		      nn = data[1];
 		      nn-=baseNote;
 		      untrigger_sample(drmr,nn,offset);
@@ -450,6 +459,12 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
 
   pthread_mutex_lock(&drmr->load_mutex); 
 
+  for( j = 0; j<n_samples; j++)
+  {
+      drmr->master_left[j] = 0.0f;
+      drmr->master_right[j] = 0.0f;
+  }
+
   for (i = 0;i < drmr->num_samples;i++)
   {
       int pos,lim;
@@ -496,8 +511,12 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
 
 	      for (pos = datastart; pos < lim && pos < dataend; pos++)
 	      {
-		  drmr->left[i][pos]  += cs->data[cs->offset]*coef_left;
-		  drmr->right[i][pos] += cs->data[cs->offset]*coef_right;
+		  drmr->master_left[pos]  += cs->data[cs->offset]*coef_left;
+		      drmr->left[i][pos]  += cs->data[cs->offset]*coef_left;
+
+		  drmr->master_right[pos] += cs->data[cs->offset]*coef_right;
+		      drmr->right[i][pos] += cs->data[cs->offset]*coef_right;
+
 		  cs->offset++;
 	      }
 	  }
@@ -508,8 +527,11 @@ static void run(LV2_Handle instance, uint32_t n_samples) {
 	      if (lim > n_samples) lim = n_samples;
 	      for (pos = datastart; pos < lim && pos < dataend; pos++)
 	      {
-		  drmr->left[i][pos]  += cs->data[cs->offset++]*coef_left;
-		  drmr->right[i][pos] += cs->data[cs->offset++]*coef_right;
+		  drmr->master_left[pos]  += cs->data[cs->offset]*coef_left;
+		      drmr->left[i][pos]  += cs->data[cs->offset++]*coef_left;
+		  
+		  drmr->master_right[pos] += cs->data[cs->offset]*coef_right;
+		      drmr->right[i][pos] += cs->data[cs->offset++]*coef_right;
 	      }
 	  }
 
diff --git a/drmr2.h b/drmr2.h
index 5df0ce3..b721146 100644
--- a/drmr2.h
+++ b/drmr2.h
@@ -72,6 +72,8 @@ typedef struct {
 
 typedef enum {
   DRMR_CONTROL = 0,
+  DRMR_MASTER_LEFT,
+  DRMR_MASTER_RIGHT,
   DRMR_LEFT_00,
   DRMR_RIGHT_00,
   DRMR_LEFT_01,
@@ -225,6 +227,8 @@ typedef struct {
 
 typedef struct {
   // Ports
+  float* master_left;
+  float* master_right;
   float** left;
   float** right;
   LV2_Atom_Sequence *control_port;