2018-06-12 Fred Gleason <fredg@paravelsystems.com>

* Changed the name of the 'Initial Audio Ports' control to
	'Active Audio Ports' in the 'Configure JACK' dialog in rdadmin(1).

ChangeLog

@@ -17045,5 +17045,6 @@
 	* Incremented the database version to 287.
 	* Added an 'Initial Audio Ports' control to the 'JACK Configuration'
 	dialog in rdadmin(1).
-	* Implemented 'Activate JACK Port' ['JA'] and 'Remove JACK Port' ['JR']
+2018-06-12 Fred Gleason <fredg@paravelsystems.com>
-	RMLs.
+	* Changed the name of the 'Initial Audio Ports' control to
+	'Active Audio Ports' in the 'Configure JACK' dialog in rdadmin(1).

docs/apis/cae.xml

@@ -1385,31 +1385,6 @@
 
 <sect1>
   <title>JACK Operations</title>
-  <sect2>
-    <title><command>Activate Port</command></title>
-    <para>
-      Add a complementary pair of JACK ports (input and output) to the
-      JACK graph, at the port position indicated by
-      <replaceable>port</replaceable>. If the ports are already active, do
-      nothing.
-    </para>
-    <para>
-      <userinput>JA <replaceable>num</replaceable>!</userinput>
-    </para>
-    <variablelist>
-      <varlistentry>
-	<term>
-	  <replaceable>num</replaceable>
-	</term>
-	<listitem>
-	  <para>
-	    The port position to which to associate the added port.
-	  </para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
   <sect2>
     <title><command>Connect Ports</command></title>
     <para>
@@ -1477,31 +1452,6 @@
       </varlistentry>
     </variablelist>
   </sect2>
-
-  <sect2>
-    <title><command>Remove Port</command></title>
-    <para>
-      Remove a complementary pair of JACK ports (input and output) from the
-      JACK graph, at the port position indicated by
-      <replaceable>port</replaceable>. If the ports are not active, do
-      nothing.
-    </para>
-    <para>
-      <userinput>JR <replaceable>num</replaceable>!</userinput>
-    </para>
-    <variablelist>
-      <varlistentry>
-	<term>
-	  <replaceable>num</replaceable>
-	</term>
-	<listitem>
-	  <para>
-	    The port position to which to associate the added port.
-	  </para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
 </sect1>
 
 <sect1>

docs/opsguide/rml.xml

@@ -171,36 +171,6 @@
 
 <sect1 xml:id="sect.rml.commands">
   <title>Commands</title>
-  <sect2 xml:id="sect.rml.activate_jack_port__ja_">
-    <title>Activate Jack Port [JA]</title>
-    <para>
-      <variablelist>
-	<varlistentry>
-	  <term>Module</term>
-	  <listitem><command>caed</command><manvolnum>8</manvolnum></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Mnemonic</term>
-	  <listitem><userinput>JA</userinput></listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      Activate an audio port to the JACK processing graph.
-    </para>
-    <para>
-      <userinput>JA</userinput>
-      <replaceable>num</replaceable>!
-    </para>
-    <para>
-      Activate port <replaceable>num</replaceable> in the JACK graph, causing
-      new playout and captures ports corresponding to
-      <replaceable>num</replaceable> to be added to the JACK graph.
-      <replaceable>num</replaceable> must be an integer between
-      <userinput>1</userinput> and <userinput>24</userinput> inclusive.
-    </para>
-  </sect2>
-
   <sect2 xml:id="sect.rml.air_gate__ag_">
     <title>Air Gate [AG]</title>
     <para>
@@ -1389,36 +1359,6 @@
     </para>
   </sect2>
 
-  <sect2 xml:id="sect.rml.remove_jack_port__jr_">
-    <title>Remove Jack Port [JR]</title>
-    <para>
-      <variablelist>
-	<varlistentry>
-	  <term>Module</term>
-	  <listitem><command>caed</command><manvolnum>8</manvolnum></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Mnemonic</term>
-	  <listitem><userinput>JR</userinput></listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      Remove an audio port from the JACK processing graph.
-      <replaceable>num</replaceable> must be an integer between
-      <userinput>1</userinput> and <userinput>24</userinput> inclusive.
-    </para>
-    <para>
-      <userinput>JR</userinput>
-      <replaceable>num</replaceable>!
-    </para>
-    <para>
-      Deactivate port <replaceable>num</replaceable> in the JACK graph, causing
-      new playout and captures ports corresponding to
-      <replaceable>num</replaceable> to be removed from the JACK graph.
-    </para>
-  </sect2>
-
   <sect2 xml:id="sect.rml.run_shell_command__rn_">
     <title>Run Shell Command [RN]</title>
     <para>

lib/rdmacro.cpp

@@ -178,10 +178,8 @@ bool RDMacro::parseString(const char *str,int n)
       case RDMacro::GE:
       case RDMacro::GI:
       case RDMacro::GO:
-      case RDMacro::JA:
       case RDMacro::JC:
       case RDMacro::JD:
-      case RDMacro::JR:
       case RDMacro::LB:
       case RDMacro::LC:
       case RDMacro::LL:

lib/rdmacro.h

@@ -37,15 +37,15 @@ class RDMacro
  public:
   enum Command {AG=0x4147,AL=0x414C,BO=0x424F,CC=0x4343,CE=0x4345,CL=0x434C,
 		CP=0x4350,DB=0x4442,DL=0x444C,DP=0x4450,DS=0x4453,DX=0x4458,
-		EX=0x4558,FS=0x4653,GE=0x4745,GI=0x4749,GO=0x474F,JA=0x4A41,
+		EX=0x4558,FS=0x4653,GE=0x4745,GI=0x4749,GO=0x474F,JC=0x4A43,
-		JC=0x4A43,JD=0x4A44,JR=0x4A52,LB=0x4C42,LC=0x4C43,LL=0x4C4C,
+		JD=0x4A44,LB=0x4C42,LC=0x4C43,LL=0x4C4C,LO=0x4C4F,MB=0x4D42,
-		LO=0x4C4F,MB=0x4D42,MD=0x4D44,MN=0x4D4E,MT=0x4D54,NN=0x4E4E,
+		MD=0x4D44,MN=0x4D4E,MT=0x4D54,NN=0x4E4E,PB=0x5042,PC=0x5043,
-		PB=0x5042,PC=0x5043,PD=0x5044,PE=0x5045,PL=0x504C,PM=0x504D,
+		PD=0x5044,PE=0x5045,PL=0x504C,PM=0x504D,PN=0x504E,PP=0x5050,
-		PN=0x504E,PP=0x5050,PS=0x5053,PT=0x5054,PU=0x5055,PW=0x5057,
+		PS=0x5053,PT=0x5054,PU=0x5055,PW=0x5057,PX=0x5058,RL=0x524C,
-		PX=0x5058,RL=0x524C,RN=0x524E,RS=0x5253,RR=0x5252,SA=0x5341,
+		RN=0x524E,RS=0x5253,RR=0x5252,SA=0x5341,SC=0x5343,SD=0x5344,
-		SC=0x5343,SD=0x5344,SG=0x5347,SI=0x5349,SL=0x534C,SN=0x534e,
+		SG=0x5347,SI=0x5349,SL=0x534C,SN=0x534e,SO=0x534F,SP=0x5350,
-		SO=0x534F,SP=0x5350,SR=0x5352,ST=0x5354,SX=0x5358,SY=0x5359,
+		SR=0x5352,ST=0x5354,SX=0x5358,SY=0x5359,SZ=0x535A,TA=0x5441,
-		SZ=0x535A,TA=0x5441,UO=0x554F};
+		UO=0x554F};
   enum Role {Invalid=0,Cmd=1,Reply=2};
   RDMacro();
   RDMacro::Role role() const;

rdadmin/edit_jack.cpp

@@ -96,12 +96,12 @@ EditJack::EditJack(RDStation *station,QWidget *parent)
     setAlignment(AlignRight|AlignVCenter|ShowPrefix);
 
   //
-  // Initial Audio Ports
+  // Active Audio Ports
   //
   edit_jack_audio_ports_spin=new QSpinBox(this);
   edit_jack_audio_ports_spin->setRange(0,24);
   edit_jack_audio_ports_label=
-    new QLabel(edit_jack_audio_ports_spin,tr("Initial Audio Ports")+":",this);
+    new QLabel(edit_jack_audio_ports_spin,tr("Active Audio Ports")+":",this);
   edit_jack_audio_ports_label->setFont(font);
   edit_jack_audio_ports_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix);
 

rdadmin/rdadmin_cs.ts

@@ -1923,7 +1923,7 @@ Stále ještě chcete uložit?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Initial Audio Ports</source>
+        <source>Active Audio Ports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdadmin/rdadmin_de.ts

@@ -1898,7 +1898,7 @@ Do you still want to save?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Initial Audio Ports</source>
+        <source>Active Audio Ports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdadmin/rdadmin_es.ts

@@ -1929,7 +1929,7 @@ Do you still want to save?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Initial Audio Ports</source>
+        <source>Active Audio Ports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdadmin/rdadmin_fr.ts

@@ -1651,7 +1651,7 @@ Do you still want to save?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Initial Audio Ports</source>
+        <source>Active Audio Ports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdadmin/rdadmin_nb.ts

@@ -1885,7 +1885,7 @@ Vil du framleis lagra?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Initial Audio Ports</source>
+        <source>Active Audio Ports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdadmin/rdadmin_nn.ts

@@ -1885,7 +1885,7 @@ Vil du framleis lagra?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Initial Audio Ports</source>
+        <source>Active Audio Ports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

rdadmin/rdadmin_pt_BR.ts

@@ -1883,7 +1883,7 @@ Você ainda quer salvar?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Initial Audio Ports</source>
+        <source>Active Audio Ports</source>
         <translation type="unfinished"></translation>
     </message>
 </context>