From 1816980ba83275c656d0b740a071e8716e7ce3c1 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Mon, 13 Nov 2023 18:06:18 -0500
Subject: [PATCH] 2023-11-13 Fred Gleason <fredg@paravelsystems.com> 	*
 Removed the 'RDCae::setOutputPort()' method. 	* Removed the 'Set Output
 Port' ['OP'] CAE command from caed(8).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog          |  1 +
 cae/cae.cpp        | 34 -----------------------
 cae/cae.h          |  2 --
 cae/cae_server.cpp | 18 ------------
 cae/cae_server.h   |  2 --
 docs/apis/cae.xml  | 68 ++--------------------------------------------
 6 files changed, 4 insertions(+), 121 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f58f284..5464cc52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24475,3 +24475,4 @@
 	caed(8) instance.
 2023-11-13 Fred Gleason <fredg@paravelsystems.com>
 	* Removed the 'RDCae::setOutputPort()' method.
+	* Removed the 'Set Output Port' ['OP'] CAE command from caed(8).
diff --git a/cae/cae.cpp b/cae/cae.cpp
index b923851c..0041222a 100644
--- a/cae/cae.cpp
+++ b/cae/cae.cpp
@@ -178,10 +178,6 @@ MainObject::MainObject(QObject *parent)
 	  this,SLOT(stopRecordingData(int,unsigned,unsigned)));
   connect(cae_server,SIGNAL(setInputVolumeReq(int,unsigned,unsigned,int)),
 	  this,SLOT(setInputVolumeData(int,unsigned,unsigned,int)));
-  connect(cae_server,
-	  SIGNAL(setOutputPortReq(int,unsigned,unsigned,unsigned,int)),
-	  this,
-	  SLOT(setOutputPortData(int,unsigned,unsigned,unsigned,int)));
   connect(cae_server,
 	  SIGNAL(setOutputVolumeReq(int,unsigned,unsigned,int,int)),
 	  this,
@@ -689,36 +685,6 @@ void MainObject::setInputVolumeData(int id,unsigned card,unsigned stream,
 }
 
 
-void MainObject::setOutputPortData(int id,unsigned card,unsigned stream,
-				   unsigned port,int level)
-{
-  Driver *dvr=GetDriver(card);
-
-  if(dvr==NULL) {
-    cae_server->sendCommand(id,QString::asprintf("OP %u %u %u %d -!",
-						 card,stream,port,level));
-    return;
-  }
-  if(!rda->config()->testOutputStreams()) {
-    for(unsigned i=0;i<RD_MAX_PORTS;i++) {
-      if(i==stream) {
-	dvr->setOutputVolume(card,stream,i,level);
-      }
-      else {
-	dvr->setOutputVolume(card,stream,i,RD_MUTE_DEPTH);
-      }
-    }
-    if(rda->config()->enableMixerLogging()) {
-      rda->syslog(LOG_INFO,
-	    "[mixer] SetOutputPort - Card: %d  Stream: %d  Port: %d  Level: %d",
-		  card,stream,port,level);
-    }
-  }
-  cae_server->sendCommand(id,QString::asprintf("OV %u %u %u %d +!",
-					       card,stream,port,level));
-}
-
-
 void MainObject::setOutputVolumeData(int id,unsigned card,unsigned stream,
 				     int port,int level)
 {
diff --git a/cae/cae.h b/cae/cae.h
index d72c24bb..1eb19326 100644
--- a/cae/cae.h
+++ b/cae/cae.h
@@ -85,8 +85,6 @@ class MainObject : public QObject
 		 int threshold_level);
   void stopRecordingData(int id,unsigned card,unsigned stream);
   void setInputVolumeData(int id,unsigned card,unsigned stream,int level);
-  void setOutputPortData(int id,unsigned card,unsigned stream,unsigned port,
-			 int level);
   void setOutputVolumeData(int id,unsigned card,unsigned stream,int port,
 			  int level);
   void fadeOutputVolumeData(int id,unsigned card,unsigned stream,unsigned port,
diff --git a/cae/cae_server.cpp b/cae/cae_server.cpp
index 27fecdb9..6edddc73 100644
--- a/cae/cae_server.cpp
+++ b/cae/cae_server.cpp
@@ -413,24 +413,6 @@ bool CaeServer::ProcessCommand(int id,const QString &cmd)
       }
     }
   }
-  if((f0.at(0)=="OP")&&(f0.size()==5)) {  // Set Output Port
-    unsigned card=f0.at(1).toUInt(&ok);
-    if(ok&&(card<RD_MAX_CARDS)) {
-      unsigned stream=f0.at(2).toUInt(&ok);
-      if(ok&&(stream<RD_MAX_STREAMS)) {
-	if(ok) {
-	  unsigned port=f0.at(3).toUInt(&ok);
-	  if(ok&&(port<RD_MAX_PORTS)) {
-	    int level=f0.at(4).toInt(&ok);
-	    if(ok) {
-	      emit setOutputPortReq(id,card,stream,port,level);
-	      was_processed=true;
-	    }
-	  }
-	}
-      }
-    }
-  }
   if((f0.at(0)=="OV")&&(f0.size()==5)) {  // Set Output Volume
     unsigned card=f0.at(1).toUInt(&ok);
     if(ok&&(card<RD_MAX_CARDS)) {
diff --git a/cae/cae_server.h b/cae/cae_server.h
index 5bbb1446..e9137bf3 100644
--- a/cae/cae_server.h
+++ b/cae/cae_server.h
@@ -79,8 +79,6 @@ class CaeServer : public QObject
 		 int threshold_level);
   void stopRecordingReq(int id,unsigned card,unsigned stream);
   void setInputVolumeReq(int id,unsigned card,unsigned stream,int level);
-  void setOutputPortReq(int id,unsigned card,unsigned stream,unsigned port,
-			int level);
   void setOutputVolumeReq(int id,unsigned card,unsigned stream,int port,
 			  int level);
   void fadeOutputVolumeReq(int id,unsigned card,unsigned stream,unsigned port,
diff --git a/docs/apis/cae.xml b/docs/apis/cae.xml
index 68018194..1be77444 100644
--- a/docs/apis/cae.xml
+++ b/docs/apis/cae.xml
@@ -113,7 +113,9 @@
   <sect2>
     <title><command>Load Playback</command></title>
     <para>
-      Prepare an audio interface to play an audio file.
+      Prepare an audio interface to play an audio file, while also muting
+      all stream-to-port mixer controls for the stream returned in
+      <replaceable>stream-num</replaceable>.
     </para>
     <para>
       <userinput>LP <replaceable>card-num</replaceable>
@@ -663,70 +665,6 @@
     </variablelist>
   </sect2>
 
-  <sect2>
-    <title><command>Set Output Port</command></title>
-    <para>
-      Configure an output stream to use a particular output port.
-    </para>
-    <para>
-      This will cause the <replaceable>stream-num</replaceable> output volume
-      control feeding the <replaceable>port-num</replaceable> port to be set
-      to the level given by <replaceable>level</replaceable>, while all other
-      output_volume controls for that stream to be muted --e.g. set to
-      -100 dB.
-    </para>
-    <para>
-      <userinput>OP <replaceable>card-num</replaceable>
-      <replaceable>stream-num</replaceable>
-      <replaceable>port-num</replaceable>
-      <replaceable>level</replaceable>!</userinput>
-    </para>
-    <variablelist>
-      <varlistentry>
-	<term>
-	  <replaceable>card-num</replaceable>
-	</term>
-	<listitem>
-	  <para>
-	    The number of the audio adapter to use.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>
-	  <replaceable>stream-num</replaceable>
-	</term>
-	<listitem>
-	  <para>
-	    The stream  number to use. This is relative to the audio adapter
-	    selected.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>
-	  <replaceable>port-num</replaceable>
-	</term>
-	<listitem>
-	  <para>
-	    The port number to use. This is relative to the audio adapter
-	    selected.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>
-	  <replaceable>level</replaceable>
-	</term>
-	<listitem>
-	  <para>
-	    The  level, in hundreths of a dB.
-	  </para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
   <sect2>
     <title><command>Set Output Volume</command></title>
     <para>