From 86c641c4ab9ebeff7ee13abdeb7dc86c8077eb39 Mon Sep 17 00:00:00 2001 From: kevin Date: Sat, 4 Apr 2020 20:53:20 +0000 Subject: [PATCH] Minor changes for Raspberry Pi Build. --- Makefile.am | 58 +++++++++++++++++++++---------------------- cwAudioDeviceAlsa.cpp | 6 ++--- cwEuCon.cpp | 2 +- cwObject.cpp | 4 +-- cwUi.cpp | 4 +-- 5 files changed, 36 insertions(+), 38 deletions(-) diff --git a/Makefile.am b/Makefile.am index 623390e..6700236 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,49 +1,47 @@ -dir = src/libcw - libcwHDR = libcwSRC = -libcwHDR += $(dir)/cwCommon.h $(dir)/cwCommonImpl.h $(dir)/cwMem.h $(dir)/cwLog.h $(dir)/cwUtility.h -libcwSRC += $(dir)/cwCommonImpl.cpp $(dir)/cwMem.cpp $(dir)/cwLog.cpp $(dir)/cwUtility.cpp +libcwHDR += src/libcw/cwCommon.h src/libcw/cwCommonImpl.h src/libcw/cwMem.h src/libcw/cwLog.h src/libcw/cwUtility.h +libcwSRC += src/libcw/cwCommonImpl.cpp src/libcw/cwMem.cpp src/libcw/cwLog.cpp src/libcw/cwUtility.cpp -libcwHDR += $(dir)/cwFileSys.h $(dir)/cwText.h $(dir)/cwFile.h $(dir)/cwTime.h $(dir)/cwLex.h $(dir)/cwNumericConvert.h -libcwSRC += $(dir)/cwFileSys.cpp $(dir)/cwText.cpp $(dir)/cwFile.cpp $(dir)/cwTime.cpp $(dir)/cwLex.cpp +libcwHDR += src/libcw/cwFileSys.h src/libcw/cwText.h src/libcw/cwFile.h src/libcw/cwTime.h src/libcw/cwLex.h src/libcw/cwNumericConvert.h +libcwSRC += src/libcw/cwFileSys.cpp src/libcw/cwText.cpp src/libcw/cwFile.cpp src/libcw/cwTime.cpp src/libcw/cwLex.cpp -libcwHDR += $(dir)/cwObject.h $(dir)/cwObjectTemplate.h $(dir)/cwTextBuf.h -libcwSRC += $(dir)/cwObject.cpp $(dir)/cwTextBuf.cpp +libcwHDR += src/libcw/cwObject.h src/libcw/cwObjectTemplate.h src/libcw/cwTextBuf.h +libcwSRC += src/libcw/cwObject.cpp src/libcw/cwTextBuf.cpp -libcwHDR += $(dir)/cwThread.h $(dir)/cwMutex.h $(dir)/cwMpScNbQueue.h -libcwSRC += $(dir)/cwThread.cpp $(dir)/cwMutex.cpp +libcwHDR += src/libcw/cwThread.h src/libcw/cwMutex.h src/libcw/cwMpScNbQueue.h +libcwSRC += src/libcw/cwThread.cpp src/libcw/cwMutex.cpp -libcwHDR += $(dir)/cwWebSock.h $(dir)/cwWebSockSvr.h $(dir)/cwLib.h -libcwSRC += $(dir)/cwWebSock.cpp $(dir)/cwWebSockSvr.cpp $(dir)/cwLib.cpp +libcwHDR += src/libcw/cwWebSock.h src/libcw/cwWebSockSvr.h src/libcw/cwLib.h +libcwSRC += src/libcw/cwWebSock.cpp src/libcw/cwWebSockSvr.cpp src/libcw/cwLib.cpp -libcwHDR += $(dir)/cwUiDecls.h $(dir)/cwUi.h $(dir)/cwUiTest.h -libcwSRC += $(dir)/cwUi.cpp $(dir)/cwUiTest.cpp +libcwHDR += src/libcw/cwUiDecls.h src/libcw/cwUi.h src/libcw/cwUiTest.h +libcwSRC += src/libcw/cwUi.cpp src/libcw/cwUiTest.cpp -libcwHDR += $(dir)/cwSerialPortDecls.h $(dir)/cwSerialPort.h $(dir)/cwSerialPortSrv.h -libcwSRC += $(dir)/cwSerialPort.cpp $(dir)/cwSerialPortSrv.cpp +libcwHDR += src/libcw/cwSerialPortDecls.h src/libcw/cwSerialPort.h src/libcw/cwSerialPortSrv.h +libcwSRC += src/libcw/cwSerialPort.cpp src/libcw/cwSerialPortSrv.cpp -libcwHDR += $(dir)/cwMidiDecls.h $(dir)/cwMidi.h $(dir)/cwMidiPort.h -libcwSRC += $(dir)/cwMidi.cpp $(dir)/cwMidiPort.cpp $(dir)/cwMidiAlsa.cpp +libcwHDR += src/libcw/cwMidiDecls.h src/libcw/cwMidi.h src/libcw/cwMidiPort.h +libcwSRC += src/libcw/cwMidi.cpp src/libcw/cwMidiPort.cpp src/libcw/cwMidiAlsa.cpp -libcwHDR += $(dir)/cwAudioDeviceDecls.h $(dir)/cwAudioDevice.h $(dir)/cwAudioDeviceAlsa.h -libcwSRC += $(dir)/cwAudioDevice.cpp $(dir)/cwAudioDeviceAlsa.cpp $(dir)/cwAudioDeviceTest.cpp +libcwHDR += src/libcw/cwAudioDeviceDecls.h src/libcw/cwAudioDevice.h src/libcw/cwAudioDeviceAlsa.h +libcwSRC += src/libcw/cwAudioDevice.cpp src/libcw/cwAudioDeviceAlsa.cpp src/libcw/cwAudioDeviceTest.cpp -libcwHDR += $(dir)/cwAudioBufDecls.h $(dir)/cwAudioBuf.h -libcwSRC += $(dir)/cwAudioBuf.cpp +libcwHDR += src/libcw/cwAudioBufDecls.h src/libcw/cwAudioBuf.h +libcwSRC += src/libcw/cwAudioBuf.cpp -libcwHDR += $(dir)/cwSocketDecls.h $(dir)/cwSocket.h -libcwSRC += $(dir)/cwSocket.cpp +libcwHDR += src/libcw/cwSocketDecls.h src/libcw/cwSocket.h +libcwSRC += src/libcw/cwSocket.cpp -libcwHDR += $(dir)/cwIo.h $(dir)/cwIoTest.h -libcwSRC += $(dir)/cwIo.cpp $(dir)/cwIoTest.cpp +libcwHDR += src/libcw/cwIo.h src/libcw/cwIoTest.h +libcwSRC += src/libcw/cwIo.cpp src/libcw/cwIoTest.cpp -libcwHDR += $(dir)/cwTcpSocket.h $(dir)/cwTcpSocketSrv.h $(dir)/cwTcpSocketTest.h -libcwSRC += $(dir)/cwTcpSocket.cpp $(dir)/cwTcpSocketSrv.cpp $(dir)/cwTcpSocketTest.cpp +libcwHDR += src/libcw/cwTcpSocket.h src/libcw/cwTcpSocketSrv.h src/libcw/cwTcpSocketTest.h +libcwSRC += src/libcw/cwTcpSocket.cpp src/libcw/cwTcpSocketSrv.cpp src/libcw/cwTcpSocketTest.cpp -libcwHDR += $(dir)/cwMdns.h $(dir)/cwEuCon.h $(dir)/cwDnsSd.h $(dir)/dns_sd/dns_sd.h $(dir)/dns_sd/dns_sd_print.h $(dir)/dns_sd/dns_sd_const.h $(dir)/dns_sd/fader.h $(dir)/dns_sd/rpt.h -libcwSRC += $(dir)/cwMdns.cpp $(dir)/cwEuCon.cpp $(dir)/cwDnsSd.cpp $(dir)/dns_sd/dns_sd.cpp $(dir)/dns_sd/dns_sd_print.cpp $(dir)/dns_sd/fader.cpp $(dir)/dns_sd/rpt.cpp +libcwHDR += src/libcw/cwMdns.h src/libcw/cwEuCon.h src/libcw/cwDnsSd.h src/libcw/dns_sd/dns_sd.h src/libcw/dns_sd/dns_sd_print.h src/libcw/dns_sd/dns_sd_const.h src/libcw/dns_sd/fader.h src/libcw/dns_sd/rpt.h +libcwSRC += src/libcw/cwMdns.cpp src/libcw/cwEuCon.cpp src/libcw/cwDnsSd.cpp src/libcw/dns_sd/dns_sd.cpp src/libcw/dns_sd/dns_sd_print.cpp src/libcw/dns_sd/fader.cpp src/libcw/dns_sd/rpt.cpp diff --git a/cwAudioDeviceAlsa.cpp b/cwAudioDeviceAlsa.cpp index 945b85c..f93c12e 100644 --- a/cwAudioDeviceAlsa.cpp +++ b/cwAudioDeviceAlsa.cpp @@ -166,7 +166,7 @@ namespace cw case SND_PCM_STATE_PAUSED: return "paused"; case SND_PCM_STATE_SUSPENDED: return "suspended"; case SND_PCM_STATE_DISCONNECTED: return "disconnected"; - case SND_PCM_STATE_PRIVATE1: return "private1"; + //case SND_PCM_STATE_PRIVATE1: return "private1"; } return ""; @@ -491,7 +491,7 @@ namespace cw case SND_PCM_STATE_DRAINING: case SND_PCM_STATE_PAUSED: case SND_PCM_STATE_DISCONNECTED: - case SND_PCM_STATE_PRIVATE1: + //case SND_PCM_STATE_PRIVATE1: //case SND_PCM_STATE_LAST: break; } @@ -872,7 +872,7 @@ namespace cw case SND_PCM_STATE_DRAINING: case SND_PCM_STATE_PAUSED: case SND_PCM_STATE_DISCONNECTED: - case SND_PCM_STATE_PRIVATE1: + //case SND_PCM_STATE_PRIVATE1: continue; case SND_PCM_STATE_RUNNING: diff --git a/cwEuCon.cpp b/cwEuCon.cpp index cc34978..faa5ba9 100644 --- a/cwEuCon.cpp +++ b/cwEuCon.cpp @@ -606,7 +606,7 @@ namespace cw const char* name = (const char*)(u+6); const char* label = "MC Mix - "; - printf("%.*s|%li\n", name[0], name+1, strlen(label) ); + printf("%.*s|%i\n", name[0], name+1, strlen(label) ); // if this a 'MC Mix' DNS-SD SRV reply if( strncmp(label, name+1, strlen(label)) == 0 ) diff --git a/cwObject.cpp b/cwObject.cpp index adc4a15..be1a9b1 100644 --- a/cwObject.cpp +++ b/cwObject.cpp @@ -124,8 +124,8 @@ namespace cw void _objTypePrintUInt16( const object_t* o, print_ctx_t& c ) { printf("%i",o->u.u16); } void _objTypePrintInt32( const object_t* o, print_ctx_t& c ) { printf("%i",o->u.i32); } void _objTypePrintUInt32( const object_t* o, print_ctx_t& c ) { printf("%i",o->u.u32); } - void _objTypePrintInt64( const object_t* o, print_ctx_t& c ) { printf("%li",o->u.i64); } - void _objTypePrintUInt64( const object_t* o, print_ctx_t& c ) { printf("%li",o->u.u64); } + void _objTypePrintInt64( const object_t* o, print_ctx_t& c ) { printf("%lli",o->u.i64); } + void _objTypePrintUInt64( const object_t* o, print_ctx_t& c ) { printf("%lli",o->u.u64); } void _objTypePrintBool( const object_t* o, print_ctx_t& c ) { printf("%s",o->u.b ? "true" : "false"); } void _objTypePrintFloat( const object_t* o, print_ctx_t& c ) { printf("%f",o->u.f); } void _objTypePrintDouble( const object_t* o, print_ctx_t& c ) { printf("%f",o->u.d); } diff --git a/cwUi.cpp b/cwUi.cpp index 5c759e1..17e3d9d 100644 --- a/cwUi.cpp +++ b/cwUi.cpp @@ -285,7 +285,7 @@ namespace cw { rc_t rc = kOkRC; const object_t* oo; - ele_t* parent_ele; + //ele_t* parent_ele; const char* jsId; // find the parent pair @@ -304,7 +304,7 @@ namespace cw //} - + return rc; }