Fix compilation.
This commit is contained in:
parent
90e7b58b92
commit
5a3c61644c
|
@ -30,7 +30,7 @@ const unsigned int BUFFER_LENGTH = 500U;
|
|||
CFMNetwork::CFMNetwork(const std::string& localAddress, unsigned int localPort, const std::string& gatewayAddress, unsigned int gatewayPort, unsigned int sampleRate, bool debug) :
|
||||
m_socket(localAddress, localPort),
|
||||
m_addr(),
|
||||
m_addrLen(),
|
||||
m_addrLen(0U),
|
||||
m_sampleRate(sampleRate),
|
||||
m_debug(debug),
|
||||
m_enabled(false),
|
||||
|
@ -41,7 +41,8 @@ m_pollTimer(1000U, 5U)
|
|||
assert(!gatewayAddress.empty());
|
||||
assert(sampleRate > 0U);
|
||||
|
||||
CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen);
|
||||
if (CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen) != 0)
|
||||
m_addrLen = 0U;
|
||||
|
||||
int error;
|
||||
m_incoming = ::src_new(SRC_SINC_FASTEST, 1, &error);
|
||||
|
@ -59,11 +60,16 @@ CFMNetwork::~CFMNetwork()
|
|||
|
||||
bool CFMNetwork::open()
|
||||
{
|
||||
if (m_addrLen == 0U) {
|
||||
LogError("Unable to resolve the address of the FM Gateway");
|
||||
return false;
|
||||
}
|
||||
|
||||
LogMessage("Opening FM network connection");
|
||||
|
||||
m_pollTimer.start();
|
||||
|
||||
return m_socket.open();
|
||||
return m_socket.open(m_addr);
|
||||
}
|
||||
|
||||
bool CFMNetwork::writeData(float* data, unsigned int nSamples)
|
||||
|
|
6
Makefile
6
Makefile
|
@ -2,9 +2,9 @@
|
|||
|
||||
CC = cc
|
||||
CXX = c++
|
||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H
|
||||
LIBS = -lpthread
|
||||
LDFLAGS = -g
|
||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -I/usr/local/include
|
||||
LIBS = -lpthread -lsamplerate -lutil
|
||||
LDFLAGS = -g -L/usr/local/lib
|
||||
|
||||
OBJECTS = AMBEFEC.o AX25Control.o AX25Network.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o \
|
||||
DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
CC = cc
|
||||
CXX = c++
|
||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DRASPBERRY_PI -I/usr/local/include
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread -lsamplerate -lutil
|
||||
LDFLAGS = -g -L/usr/local/lib
|
||||
|
||||
OBJECTS = AMBEFEC.o AX25Control.o AX25Network.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o \
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
CC = cc
|
||||
CXX = c++
|
||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread -lsamplerate -lutil
|
||||
LDFLAGS = -g -L/usr/local/lib
|
||||
|
||||
OBJECTS = AMBEFEC.o AX25Control.o AX25Network.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
CC = cc
|
||||
CXX = c++
|
||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DHD44780 -I/usr/local/include
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread -lsamplerate -lutil
|
||||
LDFLAGS = -g -L/usr/local/lib
|
||||
|
||||
OBJECTS = AMBEFEC.o AX25Control.o AX25Network.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
CC = cc
|
||||
CXX = c++
|
||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DOLED -I/usr/local/include
|
||||
LIBS = -lArduiPi_OLED -lwiringPi -lpthread
|
||||
LIBS = -lArduiPi_OLED -lwiringPi -lpthread -lsamplerate -lutil
|
||||
LDFLAGS = -g -L/usr/local/lib
|
||||
|
||||
OBJECTS = AMBEFEC.o AX25Control.o AX25Network.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o \
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
CC = cc
|
||||
CXX = c++
|
||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread -DHAVE_LOG_H -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread -lsamplerate -lutil
|
||||
LDFLAGS = -g -L/usr/local/lib
|
||||
|
||||
OBJECTS = AMBEFEC.o AX25Control.o AX25Network.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o \
|
||||
|
|
Loading…
Reference in New Issue