diff --git a/ChangeLog b/ChangeLog index 3b25b89a..e3dcb7df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21037,3 +21037,6 @@ * Removed 'Q3TextEdit' dependencies from rddgimport(1). 2021-02-06 Fred Gleason * Removed the 'Q3ListBox' dependencies from rdalsaconfig(1). +2021-02-06 Fred Gleason + * Removed dependencies on 'std::vector' from the SAS USI driver + in ripcd(8). diff --git a/ripcd/sasusi.cpp b/ripcd/sasusi.cpp index cd48a9cb..65f89ec0 100644 --- a/ripcd/sasusi.cpp +++ b/ripcd/sasusi.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the SAS USI Protocol // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,10 +22,8 @@ #include #include -#include #include -#include "globals.h" #include "sasusi.h" SasUsi::SasUsi(RDMatrix *matrix,QObject *parent) @@ -296,7 +294,7 @@ void SasUsi::processCommand(RDMacro *cmd) } cmd_byte=0x01; } - if(cmd->arg(2).toUInt()<=sas_relay_numbers.size()) { + if(cmd->arg(2).toInt()<=sas_relay_numbers.size()) { if(sas_relay_numbers[cmd->arg(2).toUInt()-1]>=0) { snprintf(str,256,"\x05R%d%04d\x0D\x0A",cmd_byte, sas_relay_numbers[cmd->arg(2).toUInt()-1]); @@ -564,7 +562,7 @@ void SasUsi::DispatchCommand() if(!ok) { return; } - for(unsigned i=0;i +// (C) Copyright 2002-2021 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,12 +21,8 @@ #ifndef SASUSI_H #define SASUSI_H -#include - -//#include -#include -#include -#include +#include +#include #include #include @@ -64,7 +60,6 @@ class SasUsi : public Switcher QString PrettifyCommand(const char *cmd) const; RDTTYDevice *sas_device; QTcpSocket *sas_socket; - // Q3Socket *sas_socket; char sas_buffer[SASUSI_MAX_LENGTH]; unsigned sas_ptr; QHostAddress sas_ipaddress; @@ -78,9 +73,9 @@ class SasUsi : public Switcher unsigned sas_start_cart; unsigned sas_stop_cart; RDMatrix::PortType sas_porttype; - std::vector sas_console_numbers; - std::vector sas_source_numbers; - std::vector sas_relay_numbers; + QList sas_console_numbers; + QList sas_source_numbers; + QList sas_relay_numbers; };