Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 07:05:48 +01:00
Code Issues Projects Releases Wiki Activity

2015-03-04 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Renamed the 'SAS USI (3 digit)' driver to
	'SAS User Serial Interface'.
	* Renamed the 'SAS USI (2 digit)' driver to
	'SAS 16000(D)'.
This commit is contained in:
Fred Gleason
2015-03-05 12:41:31 -05:00
parent a8b8e5e6c8
commit 5656687db5
11 changed files with 107 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -14809,3 +14809,8 @@
'rdcatch/edit_download.cpp'. 'rdcatch/edit_download.cpp'.
2015-03-04 Fred Gleason <fredg@paravelsystems.com> 2015-03-04 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 2.10.3int00. * Incremented the package version to 2.10.3int00.
2015-03-04 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'SAS USI (3 digit)' driver to
'SAS User Serial Interface'.
* Renamed the 'SAS USI (2 digit)' driver to
'SAS 16000(D)'.

47
docs/SWITCHERS.txt
View File

@@ -23,10 +23,10 @@ Local Audio Adapter
Logitek vGuest Logitek vGuest
Quartz Electronics Type 1 Routing Protocol Quartz Electronics Type 1 Routing Protocol
Serial Port Modem Control Lines Serial Port Modem Control Lines
Sierra Automated Systems 16000(D) Audio Router
Sierra Automated Systems 32000 Audio Router Sierra Automated Systems 32000 Audio Router
Sierra Automated Systems 64000 Audio Router Sierra Automated Systems 64000 Audio Router
Sierra Automated Systems User Serial Interface (USI) (2 digit) Sierra Automated Systems User Serial Interface (USI)
Sierra Automated Systems User Serial Interface (USI) (3 digit)
Sine Systems ACU-1 (Prophet version) Sine Systems ACU-1 (Prophet version)
Software Authority Protocol Software Authority Protocol
StarGuide III Satellite Receiver StarGuide III Satellite Receiver
@@ -536,6 +536,26 @@ device. The lines map as follows:
2 Ready To Send (RTS) 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 SIERRA AUTOMATED SYSTEMS 32000 AUDIO ROUTER
@@ -592,28 +612,9 @@ outputs as well as audio crosspoints.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
SIERRA AUTOMATED SYSTEMS User Serial Interface (USI) (2 digit) SIERRA AUTOMATED SYSTEMS User Serial Interface (USI)
Driver Name: SAS USI (2 digit) Driver Name: SAS USI
Supported RML Commands:
Switch Take ('ST')
GENERAL NOTES:
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 User Serial Interface (USI) (3 digit)
Driver Name: SAS USI (3 digit)
Supported RML Commands: Supported RML Commands:
Switch Take ('ST') Switch Take ('ST')

20
lib/rdmatrix.cpp
View File

@@ -43,7 +43,7 @@ bool __mx_primary_controls[RDMatrix::LastType][RDMatrix::LastControl]=
{0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // BT 16x1 {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // BT 16x1
{0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // BT 8x2 {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // BT 8x2
{0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0}, // BT ACS 8.2 {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0}, // BT ACS 8.2
{1,1,1,1,0,0,1,1,0,0,0,1,1,1,1,0,1,1,1,1,0,0,0,1,1,0,0,0,0}, // SAS USI 3 {1,1,1,1,0,0,1,1,0,0,0,1,1,1,1,0,1,1,1,1,0,0,0,1,1,0,0,0,0}, // SAS USI
{0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0}, // BT 16x2 {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0}, // BT 16x2
{0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // BT SS 12.4 {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // BT SS 12.4
{0,0,0,0,0,0,0,0,1,0,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // Local Adapter {0,0,0,0,0,0,0,0,1,0,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0}, // Local Adapter
@@ -65,7 +65,7 @@ bool __mx_primary_controls[RDMatrix::LastType][RDMatrix::LastControl]=
{0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0}, // BT GPI-16 {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0}, // BT GPI-16
{0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0}, // Modem Lines {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0}, // Modem Lines
{0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0}, // Software Authority {0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0}, // Software Authority
{0,1,1,1,0,0,1,1,0,0,0,1,1,0,0,0,1,1,1,1,0,0,0,0,1,0,0,0,0} // SAS USI 2 {0,1,1,1,0,0,1,1,0,0,0,1,1,0,0,0,1,1,1,1,0,0,0,0,1,0,0,0,0} // SAS 16000
}; };
bool __mx_backup_controls[RDMatrix::LastType][RDMatrix::LastControl]= bool __mx_backup_controls[RDMatrix::LastType][RDMatrix::LastControl]=
{ {
@@ -83,7 +83,7 @@ bool __mx_backup_controls[RDMatrix::LastType][RDMatrix::LastControl]=
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT 16x1 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT 16x1
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT 8x2 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT 8x2
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT ACS 8.2 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT ACS 8.2
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // SAS USI 3 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // SAS USI
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT 16x2 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT 16x2
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT SS 12.4 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT SS 12.4
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // Local Adapter {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // Local Adapter
@@ -105,7 +105,7 @@ bool __mx_backup_controls[RDMatrix::LastType][RDMatrix::LastControl]=
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT GPI-16 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // BT GPI-16
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // Modem Lines {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // Modem Lines
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // Software Authority {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, // Software Authority
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} // SAS USI 2 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} // SAS 16000
}; };
int __mx_default_values[RDMatrix::LastType][RDMatrix::LastControl]= int __mx_default_values[RDMatrix::LastType][RDMatrix::LastControl]=
@@ -124,7 +124,7 @@ int __mx_default_values[RDMatrix::LastType][RDMatrix::LastControl]=
{0,0,0,0,0,0,0,0,0,0,0,16,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT 16x1 {0,0,0,0,0,0,0,0,0,0,0,16,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT 16x1
{0,0,0,0,0,0,0,0,0,0,0,8,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT 8x2 {0,0,0,0,0,0,0,0,0,0,0,8,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT 8x2
{0,0,0,0,0,0,0,0,0,0,0,8,2,16,16,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT ACS 8.2 {0,0,0,0,0,0,0,0,0,0,0,8,2,16,16,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT ACS 8.2
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // SAS USI 3 {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // SAS USI
{0,0,0,0,0,0,0,0,0,0,0,16,2,16,16,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT 16x2 {0,0,0,0,0,0,0,0,0,0,0,16,2,16,16,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT 16x2
{0,0,0,0,0,0,0,0,0,0,0,12,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT SS 12.4 {0,0,0,0,0,0,0,0,0,0,0,12,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT SS 12.4
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // Local Adapter {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // Local Adapter
@@ -146,7 +146,7 @@ int __mx_default_values[RDMatrix::LastType][RDMatrix::LastControl]=
{0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT GPI-16 {0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // BT GPI-16
{0,0,0,0,0,0,0,0,0,0,0,0,0,4,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // Modem Lines {0,0,0,0,0,0,0,0,0,0,0,0,0,4,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // Modem Lines
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // Software Authority {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0}, // Software Authority
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0} // SAS USI 2 {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0} // SAS 16000
}; };
RDMatrix::RDMatrix(const QString &station,int matrix) RDMatrix::RDMatrix(const QString &station,int matrix)
@@ -606,12 +606,12 @@ QString RDMatrix::typeString(RDMatrix::Type type)
return QString("BroadcastTools ACS 8.2"); return QString("BroadcastTools ACS 8.2");
break; break;
case RDMatrix::SasUsi2Digit: case RDMatrix::Sas16000:
return QString("SAS USI (2 digit)"); return QString("SAS 16000(D)");
break; break;
case RDMatrix::SasUsi3Digit: case RDMatrix::SasUsi:
return QString("SAS USI (3 digit)"); return QString("SAS USI");
break; break;
case RDMatrix::Bt16x2: case RDMatrix::Bt16x2:

4
lib/rdmatrix.h
View File

@@ -33,12 +33,12 @@ class RDMatrix
enum PortType {TtyPort=0,TcpPort=1,NoPort=2}; enum PortType {TtyPort=0,TcpPort=1,NoPort=2};
enum Type {LocalGpio=0,GenericGpo=1,GenericSerial=2,Sas32000=3,Sas64000=4, enum Type {LocalGpio=0,GenericGpo=1,GenericSerial=2,Sas32000=3,Sas64000=4,
Unity4000=5,BtSs82=6,Bt10x1=7,Sas64000Gpi=8,Bt16x1=9,Bt8x2=10, Unity4000=5,BtSs82=6,Bt10x1=7,Sas64000Gpi=8,Bt16x1=9,Bt8x2=10,
BtAcs82=11,SasUsi3Digit=12,Bt16x2=13,BtSs124=14, BtAcs82=11,SasUsi=12,Bt16x2=13,BtSs124=14,
LocalAudioAdapter=15,LogitekVguest=16,BtSs164=17,StarGuideIII=18, LocalAudioAdapter=15,LogitekVguest=16,BtSs164=17,StarGuideIII=18,
BtSs42=19,LiveWireLwrpAudio=20,Quartz1=21,BtSs44=22,BtSrc8III=23, BtSs42=19,LiveWireLwrpAudio=20,Quartz1=21,BtSs44=22,BtSrc8III=23,
BtSrc16=24,Harlond=25,Acu1p=26,LiveWireMcastGpio=27,Am16=28, BtSrc16=24,Harlond=25,Acu1p=26,LiveWireMcastGpio=27,Am16=28,
LiveWireLwrpGpio=29,BtSentinel4Web=30,BtGpi16=31,ModemLines=32, LiveWireLwrpGpio=29,BtSentinel4Web=30,BtGpi16=31,ModemLines=32,
SoftwareAuthority=33,SasUsi2Digit=34,LastType=35}; SoftwareAuthority=33,Sas16000=34,LastType=35};
enum Endpoint {Input=0,Output=1}; enum Endpoint {Input=0,Output=1};
enum Mode {Stereo=0,Left=1,Right=2}; enum Mode {Stereo=0,Left=1,Right=2};
enum VguestAttribute {VguestEngine=0,VguestDevice=1,VguestSurface=2, enum VguestAttribute {VguestEngine=0,VguestDevice=1,VguestSurface=2,

2
rdadmin/list_endpoints.cpp
View File

@@ -138,7 +138,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint,
list_list_view->setColumnAlignment(3,Qt::AlignHCenter); list_list_view->setColumnAlignment(3,Qt::AlignHCenter);
break; break;
case RDMatrix::SasUsi3Digit: case RDMatrix::SasUsi:
list_readonly=true; list_readonly=true;
break; break;

8
ripcd/Makefile.am
View File

@@ -63,8 +63,8 @@ dist_ripcd_SOURCES = acu1p.cpp acu1p.h\
sas32000.cpp sas32000.h\ sas32000.cpp sas32000.h\
sas64000.cpp sas64000.h\ sas64000.cpp sas64000.h\
sas64000gpi.cpp sas64000gpi.h\ sas64000gpi.cpp sas64000gpi.h\
sasusi2digit.cpp sasusi2digit.h\ sas16000.cpp sas16000.h\
sasusi3digit.cpp sasusi3digit.h\ sasusi.cpp sasusi.h\
starguide3.cpp starguide3.h\ starguide3.cpp starguide3.h\
starguide_feed.cpp starguide_feed.h\ starguide_feed.cpp starguide_feed.h\
swauthority.cpp swauthority.h\ swauthority.cpp swauthority.h\
@@ -102,8 +102,8 @@ nodist_ripcd_SOURCES = moc_am16.cpp\
moc_sas32000.cpp\ moc_sas32000.cpp\
moc_sas64000.cpp\ moc_sas64000.cpp\
moc_sas64000gpi.cpp\ moc_sas64000gpi.cpp\
moc_sasusi2digit.cpp\ moc_sas16000.cpp\
moc_sasusi3digit.cpp\ moc_sasusi.cpp\
moc_starguide3.cpp\ moc_starguide3.cpp\
moc_swauthority.cpp\ moc_swauthority.cpp\
moc_switcher.cpp\ moc_switcher.cpp\

16
ripcd/loaddrivers.cpp
View File

@@ -49,11 +49,11 @@
#include <local_gpio.h> #include <local_gpio.h>
#include <modemlines.h> #include <modemlines.h>
#include <quartz1.h> #include <quartz1.h>
#include <sas16000.h>
#include <sas32000.h> #include <sas32000.h>
#include <sas64000.h> #include <sas64000.h>
#include <sas64000gpi.h> #include <sas64000gpi.h>
#include <sasusi2digit.h> #include <sasusi.h>
#include <sasusi3digit.h>
#include <starguide3.h> #include <starguide3.h>
#include <swauthority.h> #include <swauthority.h>
#include <unity4000.h> #include <unity4000.h>
@@ -164,6 +164,10 @@ bool MainObject::LoadSwitchDriver(int matrix_num)
ripcd_switcher[matrix_num]=new Quartz1(matrix,this); ripcd_switcher[matrix_num]=new Quartz1(matrix,this);
break; break;
case RDMatrix::Sas16000:
ripcd_switcher[matrix_num]=new Sas16000(matrix,this);
break;
case RDMatrix::Sas32000: case RDMatrix::Sas32000:
ripcd_switcher[matrix_num]=new Sas32000(matrix,this); ripcd_switcher[matrix_num]=new Sas32000(matrix,this);
break; break;
@@ -176,12 +180,8 @@ bool MainObject::LoadSwitchDriver(int matrix_num)
ripcd_switcher[matrix_num]=new Sas64000Gpi(matrix,this); ripcd_switcher[matrix_num]=new Sas64000Gpi(matrix,this);
break; break;
case RDMatrix::SasUsi2Digit: case RDMatrix::SasUsi:
ripcd_switcher[matrix_num]=new SasUsi2Digit(matrix,this); ripcd_switcher[matrix_num]=new SasUsi(matrix,this);
break;
case RDMatrix::SasUsi3Digit:
ripcd_switcher[matrix_num]=new SasUsi3Digit(matrix,this);
break; break;
case RDMatrix::SoftwareAuthority: case RDMatrix::SoftwareAuthority:

24
ripcd/sas16000.cpp
View File

@@ -1,4 +1,4 @@
// sasusi2digit.cpp // sas16000.cpp
// //
// A Rivendell switcher driver for the SAS USI Protocol (2 digit) // A Rivendell switcher driver for the SAS USI Protocol (2 digit)
// //
@@ -21,9 +21,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <rddb.h> #include <rddb.h>
#include <globals.h> #include <globals.h>
#include <sasusi2digit.h> #include <sas16000.h>
SasUsi2Digit::SasUsi2Digit(RDMatrix *matrix,QObject *parent,const char *name) Sas16000::Sas16000(RDMatrix *matrix,QObject *parent,const char *name)
: Switcher(matrix,parent,name) : Switcher(matrix,parent,name)
{ {
RDTty *tty; RDTty *tty;
@@ -54,37 +54,37 @@ SasUsi2Digit::SasUsi2Digit(RDMatrix *matrix,QObject *parent,const char *name)
} }
RDMatrix::Type SasUsi2Digit::type() RDMatrix::Type Sas16000::type()
{ {
return RDMatrix::SasUsi2Digit; return RDMatrix::Sas16000;
} }
unsigned SasUsi2Digit::gpiQuantity() unsigned Sas16000::gpiQuantity()
{ {
return sas_gpis; return sas_gpis;
} }
unsigned SasUsi2Digit::gpoQuantity() unsigned Sas16000::gpoQuantity()
{ {
return sas_gpos; return sas_gpos;
} }
bool SasUsi2Digit::primaryTtyActive() bool Sas16000::primaryTtyActive()
{ {
return true; return true;
} }
bool SasUsi2Digit::secondaryTtyActive() bool Sas16000::secondaryTtyActive()
{ {
return false; return false;
} }
void SasUsi2Digit::processCommand(RDMacro *cmd) void Sas16000::processCommand(RDMacro *cmd)
{ {
char str[256]; char str[256];
@@ -111,7 +111,7 @@ void SasUsi2Digit::processCommand(RDMacro *cmd)
} }
void SasUsi2Digit::SendCommand(char *str) void Sas16000::SendCommand(char *str)
{ {
LogLine(RDConfig::LogDebug,QString().sprintf("sending USI cmd: %s",(const char *)PrettifyCommand(str))); LogLine(RDConfig::LogDebug,QString().sprintf("sending USI cmd: %s",(const char *)PrettifyCommand(str)));
@@ -119,7 +119,7 @@ void SasUsi2Digit::SendCommand(char *str)
} }
QString SasUsi2Digit::PrettifyCommand(const char *cmd) const QString Sas16000::PrettifyCommand(const char *cmd) const
{ {
QString ret; QString ret;
if(cmd[0]<26) { if(cmd[0]<26) {

18
ripcd/sas16000.h
View File

@@ -1,6 +1,6 @@
// sasusi2digit.h // sas16000.h
// //
// A Rivendell switcher driver for the SAS USI Protocol (2 digit) // A Rivendell switcher driver for the SAS 16000(D) Audio Switcher
// //
// (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2015 Fred Gleason <fredg@paravelsystems.com>
// //
@@ -18,8 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#ifndef SASUSI2DIGIT_H #ifndef SAS16000_H
#define SASUSI2DIGIT_H #define SAS16000_H
#include <vector> #include <vector>
@@ -33,13 +33,13 @@
#include <switcher.h> #include <switcher.h>
#define SASUSI2DIGIT_MAX_LENGTH 256 #define SAS16000_MAX_LENGTH 256
class SasUsi2Digit : public Switcher class Sas16000 : public Switcher
{ {
Q_OBJECT Q_OBJECT
public: public:
SasUsi2Digit(RDMatrix *matrix,QObject *parent=0,const char *name=0); Sas16000(RDMatrix *matrix,QObject *parent=0,const char *name=0);
RDMatrix::Type type(); RDMatrix::Type type();
unsigned gpiQuantity(); unsigned gpiQuantity();
unsigned gpoQuantity(); unsigned gpoQuantity();
@@ -51,7 +51,7 @@ class SasUsi2Digit : public Switcher
void SendCommand(char *str); void SendCommand(char *str);
QString PrettifyCommand(const char *cmd) const; QString PrettifyCommand(const char *cmd) const;
RDTTYDevice *sas_device; RDTTYDevice *sas_device;
char sas_buffer[SASUSI2DIGIT_MAX_LENGTH]; char sas_buffer[SAS16000_MAX_LENGTH];
unsigned sas_ptr; unsigned sas_ptr;
int sas_matrix; int sas_matrix;
int sas_ipport; int sas_ipport;
@@ -62,4 +62,4 @@ class SasUsi2Digit : public Switcher
}; };
#endif // SASUSI2DIGIT_H #endif // SAS16000_H

46
ripcd/sasusi.cpp
View File

@@ -1,4 +1,4 @@
// sasusi3digit.cpp // sasusi.cpp
// //
// A Rivendell switcher driver for the SAS USI Protocol (3 digit) // A Rivendell switcher driver for the SAS USI Protocol (3 digit)
// //
@@ -21,9 +21,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <rddb.h> #include <rddb.h>
#include <globals.h> #include <globals.h>
#include <sasusi3digit.h> #include <sasusi.h>
SasUsi3Digit::SasUsi3Digit(RDMatrix *matrix,QObject *parent,const char *name) SasUsi::SasUsi(RDMatrix *matrix,QObject *parent,const char *name)
: Switcher(matrix,parent,name) : Switcher(matrix,parent,name)
{ {
QString sql; QString sql;
@@ -102,37 +102,37 @@ SasUsi3Digit::SasUsi3Digit(RDMatrix *matrix,QObject *parent,const char *name)
} }
RDMatrix::Type SasUsi3Digit::type() RDMatrix::Type SasUsi::type()
{ {
return RDMatrix::SasUsi3Digit; return RDMatrix::SasUsi;
} }
unsigned SasUsi3Digit::gpiQuantity() unsigned SasUsi::gpiQuantity()
{ {
return sas_gpis; return sas_gpis;
} }
unsigned SasUsi3Digit::gpoQuantity() unsigned SasUsi::gpoQuantity()
{ {
return sas_gpos; return sas_gpos;
} }
bool SasUsi3Digit::primaryTtyActive() bool SasUsi::primaryTtyActive()
{ {
return sas_porttype==RDMatrix::TtyPort; return sas_porttype==RDMatrix::TtyPort;
} }
bool SasUsi3Digit::secondaryTtyActive() bool SasUsi::secondaryTtyActive()
{ {
return false; return false;
} }
void SasUsi3Digit::processCommand(RDMacro *cmd) void SasUsi::processCommand(RDMacro *cmd)
{ {
char str[256]; char str[256];
char cmd_byte; char cmd_byte;
@@ -324,13 +324,13 @@ void SasUsi3Digit::processCommand(RDMacro *cmd)
} }
void SasUsi3Digit::ipConnect() void SasUsi::ipConnect()
{ {
sas_socket->connectToHost(sas_ipaddress.toString(),sas_ipport); sas_socket->connectToHost(sas_ipaddress.toString(),sas_ipport);
} }
void SasUsi3Digit::connectedData() void SasUsi::connectedData()
{ {
LogLine(RDConfig::LogInfo,QString(). LogLine(RDConfig::LogInfo,QString().
sprintf("Connection to SasUsi device at %s:%d established", sprintf("Connection to SasUsi device at %s:%d established",
@@ -342,7 +342,7 @@ void SasUsi3Digit::connectedData()
} }
void SasUsi3Digit::connectionClosedData() void SasUsi::connectionClosedData()
{ {
LogLine(RDConfig::LogNotice,QString(). LogLine(RDConfig::LogNotice,QString().
sprintf("Connection to SasUsi device at %s:%d closed unexpectedly, attempting reconnect", sprintf("Connection to SasUsi device at %s:%d closed unexpectedly, attempting reconnect",
@@ -351,11 +351,11 @@ void SasUsi3Digit::connectionClosedData()
if(sas_stop_cart>0) { if(sas_stop_cart>0) {
ExecuteMacroCart(sas_stop_cart); ExecuteMacroCart(sas_stop_cart);
} }
sas_reconnect_timer->start(SASUSI3DIGIT_RECONNECT_INTERVAL,true); sas_reconnect_timer->start(SASUSI_RECONNECT_INTERVAL,true);
} }
void SasUsi3Digit::readyReadData() void SasUsi::readyReadData()
{ {
char buffer[256]; char buffer[256];
unsigned n; unsigned n;
@@ -369,7 +369,7 @@ void SasUsi3Digit::readyReadData()
sas_ptr=0; sas_ptr=0;
} }
else { else {
if(sas_ptr==SASUSI3DIGIT_MAX_LENGTH) { // Buffer overflow if(sas_ptr==SASUSI_MAX_LENGTH) { // Buffer overflow
sas_ptr=0; sas_ptr=0;
} }
sas_buffer[sas_ptr++]=buffer[i]; sas_buffer[sas_ptr++]=buffer[i];
@@ -379,7 +379,7 @@ void SasUsi3Digit::readyReadData()
} }
void SasUsi3Digit::errorData(int err) void SasUsi::errorData(int err)
{ {
switch((QSocket::Error)err) { switch((QSocket::Error)err) {
case QSocket::ErrConnectionRefused: case QSocket::ErrConnectionRefused:
@@ -387,7 +387,7 @@ void SasUsi3Digit::errorData(int err)
"Connection to SasUsi device at %s:%d refused, attempting reconnect", "Connection to SasUsi device at %s:%d refused, attempting reconnect",
(const char *)sas_ipaddress.toString(), (const char *)sas_ipaddress.toString(),
sas_ipport)); sas_ipport));
sas_reconnect_timer->start(SASUSI3DIGIT_RECONNECT_INTERVAL,true); sas_reconnect_timer->start(SASUSI_RECONNECT_INTERVAL,true);
break; break;
case QSocket::ErrHostNotFound: case QSocket::ErrHostNotFound:
@@ -407,7 +407,7 @@ void SasUsi3Digit::errorData(int err)
} }
void SasUsi3Digit::SendCommand(char *str) void SasUsi::SendCommand(char *str)
{ {
LogLine(RDConfig::LogDebug,QString().sprintf("sending USI cmd: %s",(const char *)PrettifyCommand(str))); LogLine(RDConfig::LogDebug,QString().sprintf("sending USI cmd: %s",(const char *)PrettifyCommand(str)));
switch(sas_porttype) { switch(sas_porttype) {
@@ -425,9 +425,9 @@ void SasUsi3Digit::SendCommand(char *str)
} }
void SasUsi3Digit::DispatchCommand() void SasUsi::DispatchCommand()
{ {
char buffer[SASUSI3DIGIT_MAX_LENGTH]; char buffer[SASUSI_MAX_LENGTH];
unsigned input; unsigned input;
unsigned output; unsigned output;
int line; int line;
@@ -613,7 +613,7 @@ void SasUsi3Digit::DispatchCommand()
} }
void SasUsi3Digit::ExecuteMacroCart(unsigned cartnum) void SasUsi::ExecuteMacroCart(unsigned cartnum)
{ {
RDMacro rml; RDMacro rml;
rml.setRole(RDMacro::Cmd); rml.setRole(RDMacro::Cmd);
@@ -626,7 +626,7 @@ void SasUsi3Digit::ExecuteMacroCart(unsigned cartnum)
} }
QString SasUsi3Digit::PrettifyCommand(const char *cmd) const QString SasUsi::PrettifyCommand(const char *cmd) const
{ {
QString ret; QString ret;
if(cmd[0]<26) { if(cmd[0]<26) {

18
ripcd/sasusi.h
View File

@@ -1,4 +1,4 @@
// sasusi3digit.h // sasusi.h
// //
// A Rivendell switcher driver for the SAS USI Protocol (3 digit) // A Rivendell switcher driver for the SAS USI Protocol (3 digit)
// //
@@ -18,8 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#ifndef SASUSI3DIGIT_H #ifndef SASUSI_H
#define SASUSI3DIGIT_H #define SASUSI_H
#include <vector> #include <vector>
@@ -34,14 +34,14 @@
#include <switcher.h> #include <switcher.h>
#define SASUSI3DIGIT_RECONNECT_INTERVAL 10000 #define SASUSI_RECONNECT_INTERVAL 10000
#define SASUSI3DIGIT_MAX_LENGTH 256 #define SASUSI_MAX_LENGTH 256
class SasUsi3Digit : public Switcher class SasUsi : public Switcher
{ {
Q_OBJECT Q_OBJECT
public: public:
SasUsi3Digit(RDMatrix *matrix,QObject *parent=0,const char *name=0); SasUsi(RDMatrix *matrix,QObject *parent=0,const char *name=0);
RDMatrix::Type type(); RDMatrix::Type type();
unsigned gpiQuantity(); unsigned gpiQuantity();
unsigned gpoQuantity(); unsigned gpoQuantity();
@@ -63,7 +63,7 @@ class SasUsi3Digit : public Switcher
QString PrettifyCommand(const char *cmd) const; QString PrettifyCommand(const char *cmd) const;
RDTTYDevice *sas_device; RDTTYDevice *sas_device;
QSocket *sas_socket; QSocket *sas_socket;
char sas_buffer[SASUSI3DIGIT_MAX_LENGTH]; char sas_buffer[SASUSI_MAX_LENGTH];
unsigned sas_ptr; unsigned sas_ptr;
QHostAddress sas_ipaddress; QHostAddress sas_ipaddress;
int sas_matrix; int sas_matrix;
@@ -82,4 +82,4 @@ class SasUsi3Digit : public Switcher
}; };
#endif // SASUSI3DIGIT_H #endif // SASUSI_H