Merge branch 'csound:7.0' into 7.0

Makefile

@@ -72,13 +72,7 @@ MISC = 	misc/amp.xml misc/csound64.xml misc/formants.xml misc/glossary.xml \
 OPCODES = opcodes/0dbfs.xml	opcodes/ATSadd.xml	opcodes/ATSaddnz.xml \
 	opcodes/ATSbufread.xml	opcodes/ATScross.xml	opcodes/ATSinfo.xml \
 	opcodes/ATSinterpread.xml  opcodes/ATSpartialtap.xml opcodes/ATSread.xml \
-	opcodes/ATSreadnz.xml	opcodes/ATSsinnoi.xml opcodes/JackoAudioIn.xml \
-	opcodes/JackoAudioInConnect.xml	opcodes/JackoAudioOut.xml \
-	opcodes/JackoAudioOutConnect.xml	opcodes/JackoFreewheel.xml \
-	opcodes/JackoInfo.xml	opcodes/JackoInit.xml \
-	opcodes/JackoMidiInConnect.xml	opcodes/JackoMidiOut.xml \
-	opcodes/JackoMidiOutConnect.xml	opcodes/JackoNoteOut.xml \
-	opcodes/JackoOn.xml	opcodes/JackoTransport.xml \
+	opcodes/ATSreadnz.xml	opcodes/ATSsinnoi.xml \
 	opcodes/OSCinit.xml	opcodes/OSClisten.xml	opcodes/OSCsend.xml \
 	opcodes/STKBandedWG.xml \
 	opcodes/STKBeeThree.xml	opcodes/STKBlowBotl.xml	opcodes/STKBlowHole.xml \
@@ -254,7 +248,7 @@ OPCODES = opcodes/0dbfs.xml	opcodes/ATSadd.xml	opcodes/ATSaddnz.xml \
 	opcodes/islider32.xml	opcodes/islider64.xml	opcodes/islider8.xml \
 	opcodes/itablecopy.xml	opcodes/itablegpw.xml	opcodes/itablemix.xml \
 	opcodes/itablew.xml	opcodes/itrirand.xml	opcodes/iunirand.xml \
-	opcodes/iweibull.xml	opcodes/jacktransport.xml	opcodes/jitter.xml \
+	opcodes/iweibull.xml		opcodes/jitter.xml \
 	opcodes/jitter2.xml	opcodes/joystick.xml	opcodes/jspline.xml \
 	opcodes/kbetarand.xml	opcodes/kbexprnd.xml	opcodes/kcauchy.xml \
 	opcodes/k35_hpf.xml opcodes/k35_lpf.xml \

control/realtime.xml

@@ -11,7 +11,6 @@
       <listitem><para><link linkend="exitnow"><citetitle>exitnow</citetitle></link></para></listitem>
       <listitem><para><link linkend="maxalloc"><citetitle>maxalloc</citetitle></link></para></listitem>
       <listitem><para><link linkend="prealloc"><citetitle>prealloc</citetitle></link></para></listitem>
-      <listitem><para><link linkend="jacktransport"><citetitle>jacktransport</citetitle></link></para></listitem>
     </itemizedlist>
   </para>
   <para>The running csound process can be terminated using <link linkend="exitnow"><citetitle>exitnow</citetitle></link>.

control/sensing.xml

@@ -55,7 +55,7 @@
 	<listitem><para><link linkend="changed2"><citetitle>changed2</citetitle></link></para></listitem>
 	<listitem><para><link linkend="metro"><citetitle>metro</citetitle></link></para></listitem>
 	<listitem><para><link linkend="metro2"><citetitle>metro2</citetitle></link></para></listitem>
-        <listitem><para><link linkend="metrobmp"><citetitle>metrobmp</citetitle></link></para></listitem>
+        <listitem><para><link linkend="metrobpm"><citetitle>metrobpm</citetitle></link></para></listitem>
         <listitem><para><link linkend="miditempo"><citetitle>miditempo</citetitle></link></para></listitem>
         <listitem><para><link linkend="seqtime"><citetitle>seqtime</citetitle></link></para></listitem>
         <listitem><para><link linkend="seqtime2"><citetitle>seqtime2</citetitle></link></para></listitem>

control/top.xml

@@ -5,7 +5,6 @@
   &controlclockctl;
   &controlconditional;
   &controldurctl;
-  &controlfltkintro;
   &controlinvocat;
   &controlpgmctl;
   &controlrealtime;

deprecated/top.xml

@@ -12,7 +12,6 @@
     </para>
   </section>
 
-  &opcodesjackoon;
   <!-- &opcodesabetarand; -->
   <!-- &opcodesabexprnd; -->
   <!-- &opcodesacauchy; -->

examples/chnset.csd

@@ -30,9 +30,9 @@ anois     rand      .1
           chnset    anois, "noise"
  loop:
 idur      random    .3, 1.5
-          timout    0, idur, do
+          timout    0, idur, do_
           reinit    loop
- do:
+ do_:
 ifreq     random    400, 1200
 iamp      random    .1, .3
 asig      oscils    iamp, ifreq, 0

manual.xml

@@ -37,7 +37,6 @@
 <!ENTITY py SYSTEM "csound5/opcodes/py.xml">
 <!ENTITY mixer SYSTEM "csound5/opcodes/mixer.xml">
 <!ENTITY signalflowgraph SYSTEM "csound5/opcodes/signalflowgraph.xml">
-<!ENTITY jacko SYSTEM "csound5/opcodes/Jacko.xml">
 
 <!ENTITY plugin SYSTEM "plugin/top.xml">
 <!ENTITY plugindssi4cs SYSTEM "plugin/dssi4cs.xml">
@@ -697,20 +696,7 @@
 <!ENTITY opcodesiunirand SYSTEM "opcodes/iunirand.xml">
 <!ENTITY opcodesiweibull SYSTEM "opcodes/iweibull.xml">
 
-<!ENTITY opcodesjackoinit SYSTEM "opcodes/JackoInit.xml">
-<!ENTITY opcodesjackoinfo SYSTEM "opcodes/JackoInfo.xml">
-<!ENTITY opcodesjackofreewheel SYSTEM "opcodes/JackoFreewheel.xml">
-<!ENTITY opcodesjackoaudioinconnect SYSTEM "opcodes/JackoAudioInConnect.xml">
-<!ENTITY opcodesjackoaudiooutconnect SYSTEM "opcodes/JackoAudioOutConnect.xml">
-<!ENTITY opcodesjackomidiinconnect SYSTEM "opcodes/JackoMidiInConnect.xml">
-<!ENTITY opcodesjackomidioutconnect SYSTEM "opcodes/JackoMidiOutConnect.xml">
-<!ENTITY opcodesjackoon SYSTEM "opcodes/JackoOn.xml">
-<!ENTITY opcodesjackoaudioin SYSTEM "opcodes/JackoAudioIn.xml">
-<!ENTITY opcodesjackoaudioout SYSTEM "opcodes/JackoAudioOut.xml">
-<!ENTITY opcodesjackomidiout SYSTEM "opcodes/JackoMidiOut.xml">
-<!ENTITY opcodesjackonoteout SYSTEM "opcodes/JackoNoteOut.xml">
-<!ENTITY opcodesjackotransport SYSTEM "opcodes/JackoTransport.xml">
-<!ENTITY opcodesjacktransport SYSTEM "opcodes/jacktransport.xml">
+
 <!ENTITY opcodesjitter2 SYSTEM "opcodes/jitter2.xml">
 <!ENTITY opcodesjitter SYSTEM "opcodes/jitter.xml">
 <!ENTITY opcodesjoystick SYSTEM "opcodes/joystick.xml">
@@ -1977,8 +1963,6 @@
 
   </part>
 
-  <!-- &csound5opcodesSection; -->
-
   <part id="PartOpcodesOverview">
     <title>Opcodes Overview</title>
 
@@ -1994,15 +1978,11 @@
     &strings;
     &vectorial;
     &zak;
-    &plugin;
     &oscnetwork;
-    &mixer;
     &signalflowgraph;
-    &jacko;
-    &py;
-    &Faustopcodes;
-    &imageopcodes;
-    &stkopcodes;
+    &mixer;
+    &plugin;
+    &plugindssi4cs;
     &miscopcodes;
 
   </part>