Merged 04bd883b65 from master

docs/SWITCHERS.txt

@@ -22,10 +22,12 @@ LiveWire Multicast GPIO
 Local Audio Adapter
 Logitek vGuest
 Quartz Electronics Type 1 Routing Protocol
+Ross NK Video Switchers (via SCP/A Serial Interface)
 Serial Port Modem Control Lines
+Sierra Automated Systems 16000(D) Audio Router
 Sierra Automated Systems 32000 Audio Router
 Sierra Automated Systems 64000 Audio Router
-Sierra Automated Systems Universal Serial Interface (USI)
+Sierra Automated Systems User Serial Interface (USI)
 Sine Systems ACU-1 (Prophet version)
 Software Authority Protocol
 StarGuide III Satellite Receiver
@@ -510,6 +512,22 @@ Control can done either by means of an RS-232C connection or by means of
 TCP/IP to TCP port 23.
 
 
+----------------------------------------------------------------------------
+Ross NK Video Switchers (via SCP/A Serial Interface)
+
+Driver Name: Ross NK-SCP/A Interface
+
+Supported RML Commands:
+  Switch Take ('ST')
+
+GENERAL NOTES:
+Control is done by means of an RS-232C connection to a NK-SCP/A serial
+interface.  Serial port parameters should be set to 9600 baud rate, no parity,
+8 data bits, 1 stop bit, CR termination.  The Breakaway to use is defined
+by setting the 'Card' parameter in the driver configuration, with
+Card 0 = Breakaway 1, Card 1 = Breakaway 2, etc.
+
+
 ----------------------------------------------------------------------------
 SERIAL PORT MODEM CONTROL LINES
 
@@ -535,6 +553,26 @@ device.  The lines map as follows:
   2   Ready To Send       (RTS)
 
 
+----------------------------------------------------------------------------
+SIERRA AUTOMATED SYSTEMS 16000(D) AUDIO ROUTER
+
+Driver Name: SAS 16000(D)
+
+Supported RML Commands:
+  Switch Take ('ST')
+
+GENERAL NOTES:
+Both analog and AES3 digital (D) variants are supported.  Control can done
+by means of an RS-232C connection to the 'User Serial Interface' port on
+the unit.  Serial port parameters should be:
+
+Baud Rate: 9600
+Parity: None
+Data Bits: 8
+Stop Bits: 1
+Terminator: None
+
+
 ----------------------------------------------------------------------------
 SIERRA AUTOMATED SYSTEMS 32000 AUDIO ROUTER
 
@@ -591,9 +629,9 @@ outputs as well as audio crosspoints.
 
 
 ----------------------------------------------------------------------------
-SIERRA AUTOMATED SYSTEMS Universal Serial Interface (USI)
+SIERRA AUTOMATED SYSTEMS User Serial Interface (USI)
 
-Driver Name: SAS User Serial Interface
+Driver Name: SAS USI
 
 Supported RML Commands:
   Switch Take ('ST')

docs/tables/rd_library.txt

@@ -1,7 +1,6 @@
                   RDLIBRARY Table Layout for Rivendell
 
 The RDLIBRARY table holds configuration data for the RDLibrary widget.
-Following is the layout of a record in the RDLIBRARY table:
 
 FIELD NAME           TYPE              REMARKS
 ------------------------------------------------------------------------------
@@ -32,6 +31,7 @@ RIPPER_DEVICE        char(64)
 PARANOIA_LEVEL       int(11)
 RIPPER_LEVEL         int(11)
 CDDB_SERVER          char(64)
+READ_ISRC            enum('N','Y')
 ENABLE_EDITOR        enum('N','Y')
 SRC_CONVERTER        int(11)
 LIMIT_SEARCH         int(11)           0 = No, 1 = Yes, 2 = Previous

docs/tables/stations.txt

@@ -40,6 +40,7 @@ HAVE_FLAC            enum('N','Y')
 HAVE_TWOLAME         enum('N','Y')
 HAVE_LAME            enum('N','Y')
 HAVE_MPG321          enum('N','Y')
+HAVE_MP4_DECODE      enum('N','Y')
 HPI_VERSION          char(16)
 JACK_VERSION         char(16)
 ALSA_VERSION         char(16)