diff --git a/ChangeLog b/ChangeLog index f059e1a0..6d0597dd 100644 --- a/ChangeLog +++ b/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'] - RMLs. +2018-06-12 Fred Gleason + * Changed the name of the 'Initial Audio Ports' control to + 'Active Audio Ports' in the 'Configure JACK' dialog in rdadmin(1). diff --git a/docs/apis/cae.xml b/docs/apis/cae.xml index b944335e..f26ee313 100644 --- a/docs/apis/cae.xml +++ b/docs/apis/cae.xml @@ -1385,31 +1385,6 @@ JACK Operations - - <command>Activate Port</command> - - Add a complementary pair of JACK ports (input and output) to the - JACK graph, at the port position indicated by - port. If the ports are already active, do - nothing. - - - JA num! - - - - - num - - - - The port position to which to associate the added port. - - - - - - <command>Connect Ports</command> @@ -1477,31 +1452,6 @@ - - - <command>Remove Port</command> - - Remove a complementary pair of JACK ports (input and output) from the - JACK graph, at the port position indicated by - port. If the ports are not active, do - nothing. - - - JR num! - - - - - num - - - - The port position to which to associate the added port. - - - - - diff --git a/docs/opsguide/rml.xml b/docs/opsguide/rml.xml index 4fc6cc16..d82c8ed1 100644 --- a/docs/opsguide/rml.xml +++ b/docs/opsguide/rml.xml @@ -171,36 +171,6 @@ Commands - - Activate Jack Port [JA] - - - - Module - caed8 - - - Mnemonic - JA - - - - - Activate an audio port to the JACK processing graph. - - - JA - num! - - - Activate port num in the JACK graph, causing - new playout and captures ports corresponding to - num to be added to the JACK graph. - num must be an integer between - 1 and 24 inclusive. - - - Air Gate [AG] @@ -1389,36 +1359,6 @@ - - Remove Jack Port [JR] - - - - Module - caed8 - - - Mnemonic - JR - - - - - Remove an audio port from the JACK processing graph. - num must be an integer between - 1 and 24 inclusive. - - - JR - num! - - - Deactivate port num in the JACK graph, causing - new playout and captures ports corresponding to - num to be removed from the JACK graph. - - - Run Shell Command [RN] diff --git a/lib/rdmacro.cpp b/lib/rdmacro.cpp index ce4a0843..5e991711 100644 --- a/lib/rdmacro.cpp +++ b/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: diff --git a/lib/rdmacro.h b/lib/rdmacro.h index 5d25b39f..d5d8a5c9 100644 --- a/lib/rdmacro.h +++ b/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, - JC=0x4A43,JD=0x4A44,JR=0x4A52,LB=0x4C42,LC=0x4C43,LL=0x4C4C, - LO=0x4C4F,MB=0x4D42,MD=0x4D44,MN=0x4D4E,MT=0x4D54,NN=0x4E4E, - PB=0x5042,PC=0x5043,PD=0x5044,PE=0x5045,PL=0x504C,PM=0x504D, - PN=0x504E,PP=0x5050,PS=0x5053,PT=0x5054,PU=0x5055,PW=0x5057, - PX=0x5058,RL=0x524C,RN=0x524E,RS=0x5253,RR=0x5252,SA=0x5341, - SC=0x5343,SD=0x5344,SG=0x5347,SI=0x5349,SL=0x534C,SN=0x534e, - SO=0x534F,SP=0x5350,SR=0x5352,ST=0x5354,SX=0x5358,SY=0x5359, - SZ=0x535A,TA=0x5441,UO=0x554F}; + EX=0x4558,FS=0x4653,GE=0x4745,GI=0x4749,GO=0x474F,JC=0x4A43, + JD=0x4A44,LB=0x4C42,LC=0x4C43,LL=0x4C4C,LO=0x4C4F,MB=0x4D42, + MD=0x4D44,MN=0x4D4E,MT=0x4D54,NN=0x4E4E,PB=0x5042,PC=0x5043, + PD=0x5044,PE=0x5045,PL=0x504C,PM=0x504D,PN=0x504E,PP=0x5050, + PS=0x5053,PT=0x5054,PU=0x5055,PW=0x5057,PX=0x5058,RL=0x524C, + RN=0x524E,RS=0x5253,RR=0x5252,SA=0x5341,SC=0x5343,SD=0x5344, + SG=0x5347,SI=0x5349,SL=0x534C,SN=0x534e,SO=0x534F,SP=0x5350, + SR=0x5352,ST=0x5354,SX=0x5358,SY=0x5359,SZ=0x535A,TA=0x5441, + UO=0x554F}; enum Role {Invalid=0,Cmd=1,Reply=2}; RDMacro(); RDMacro::Role role() const; diff --git a/rdadmin/edit_jack.cpp b/rdadmin/edit_jack.cpp index 1628e5df..376096a4 100644 --- a/rdadmin/edit_jack.cpp +++ b/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); diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 738781af..69365afe 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -1923,7 +1923,7 @@ Stále ještě chcete uložit? - Initial Audio Ports + Active Audio Ports diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index b6e42cf9..a531abc3 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -1898,7 +1898,7 @@ Do you still want to save? - Initial Audio Ports + Active Audio Ports diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index e96e3a15..982fae1b 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -1929,7 +1929,7 @@ Do you still want to save? - Initial Audio Ports + Active Audio Ports diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 65e7d93e..e5a1ea9a 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -1651,7 +1651,7 @@ Do you still want to save? - Initial Audio Ports + Active Audio Ports diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 5c8aa8d6..bb8411a3 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -1885,7 +1885,7 @@ Vil du framleis lagra? - Initial Audio Ports + Active Audio Ports diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 5c8aa8d6..bb8411a3 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -1885,7 +1885,7 @@ Vil du framleis lagra? - Initial Audio Ports + Active Audio Ports diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 3ac22350..31033cf8 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -1883,7 +1883,7 @@ Você ainda quer salvar? - Initial Audio Ports + Active Audio Ports