cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes for Raspberry Pi Build.

Browse Source
This commit is contained in:
kevin 2020-04-04 20:53:20 +00:00
parent c266475c99
commit 86c641c4ab
5 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Makefile.am
View File

@ -1,49 +1,47 @@
dir = src/libcw
libcwHDR = libcwHDR =
libcwSRC = libcwSRC =
libcwHDR += $(dir)/cwCommon.h $(dir)/cwCommonImpl.h $(dir)/cwMem.h $(dir)/cwLog.h $(dir)/cwUtility.h libcwHDR += src/libcw/cwCommon.h src/libcw/cwCommonImpl.h src/libcw/cwMem.h src/libcw/cwLog.h src/libcw/cwUtility.h
libcwSRC += $(dir)/cwCommonImpl.cpp $(dir)/cwMem.cpp $(dir)/cwLog.cpp $(dir)/cwUtility.cpp 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 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 += $(dir)/cwFileSys.cpp $(dir)/cwText.cpp $(dir)/cwFile.cpp $(dir)/cwTime.cpp $(dir)/cwLex.cpp 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 libcwHDR += src/libcw/cwObject.h src/libcw/cwObjectTemplate.h src/libcw/cwTextBuf.h
libcwSRC += $(dir)/cwObject.cpp $(dir)/cwTextBuf.cpp libcwSRC += src/libcw/cwObject.cpp src/libcw/cwTextBuf.cpp
libcwHDR += $(dir)/cwThread.h $(dir)/cwMutex.h $(dir)/cwMpScNbQueue.h libcwHDR += src/libcw/cwThread.h src/libcw/cwMutex.h src/libcw/cwMpScNbQueue.h
libcwSRC += $(dir)/cwThread.cpp $(dir)/cwMutex.cpp libcwSRC += src/libcw/cwThread.cpp src/libcw/cwMutex.cpp
libcwHDR += $(dir)/cwWebSock.h $(dir)/cwWebSockSvr.h $(dir)/cwLib.h libcwHDR += src/libcw/cwWebSock.h src/libcw/cwWebSockSvr.h src/libcw/cwLib.h
libcwSRC += $(dir)/cwWebSock.cpp $(dir)/cwWebSockSvr.cpp $(dir)/cwLib.cpp libcwSRC += src/libcw/cwWebSock.cpp src/libcw/cwWebSockSvr.cpp src/libcw/cwLib.cpp
libcwHDR += $(dir)/cwUiDecls.h $(dir)/cwUi.h $(dir)/cwUiTest.h libcwHDR += src/libcw/cwUiDecls.h src/libcw/cwUi.h src/libcw/cwUiTest.h
libcwSRC += $(dir)/cwUi.cpp $(dir)/cwUiTest.cpp libcwSRC += src/libcw/cwUi.cpp src/libcw/cwUiTest.cpp
libcwHDR += $(dir)/cwSerialPortDecls.h $(dir)/cwSerialPort.h $(dir)/cwSerialPortSrv.h libcwHDR += src/libcw/cwSerialPortDecls.h src/libcw/cwSerialPort.h src/libcw/cwSerialPortSrv.h
libcwSRC += $(dir)/cwSerialPort.cpp $(dir)/cwSerialPortSrv.cpp libcwSRC += src/libcw/cwSerialPort.cpp src/libcw/cwSerialPortSrv.cpp
libcwHDR += $(dir)/cwMidiDecls.h $(dir)/cwMidi.h $(dir)/cwMidiPort.h libcwHDR += src/libcw/cwMidiDecls.h src/libcw/cwMidi.h src/libcw/cwMidiPort.h
libcwSRC += $(dir)/cwMidi.cpp $(dir)/cwMidiPort.cpp $(dir)/cwMidiAlsa.cpp libcwSRC += src/libcw/cwMidi.cpp src/libcw/cwMidiPort.cpp src/libcw/cwMidiAlsa.cpp
libcwHDR += $(dir)/cwAudioDeviceDecls.h $(dir)/cwAudioDevice.h $(dir)/cwAudioDeviceAlsa.h libcwHDR += src/libcw/cwAudioDeviceDecls.h src/libcw/cwAudioDevice.h src/libcw/cwAudioDeviceAlsa.h
libcwSRC += $(dir)/cwAudioDevice.cpp $(dir)/cwAudioDeviceAlsa.cpp $(dir)/cwAudioDeviceTest.cpp libcwSRC += src/libcw/cwAudioDevice.cpp src/libcw/cwAudioDeviceAlsa.cpp src/libcw/cwAudioDeviceTest.cpp
libcwHDR += $(dir)/cwAudioBufDecls.h $(dir)/cwAudioBuf.h libcwHDR += src/libcw/cwAudioBufDecls.h src/libcw/cwAudioBuf.h
libcwSRC += $(dir)/cwAudioBuf.cpp libcwSRC += src/libcw/cwAudioBuf.cpp
libcwHDR += $(dir)/cwSocketDecls.h $(dir)/cwSocket.h libcwHDR += src/libcw/cwSocketDecls.h src/libcw/cwSocket.h
libcwSRC += $(dir)/cwSocket.cpp libcwSRC += src/libcw/cwSocket.cpp
libcwHDR += $(dir)/cwIo.h $(dir)/cwIoTest.h libcwHDR += src/libcw/cwIo.h src/libcw/cwIoTest.h
libcwSRC += $(dir)/cwIo.cpp $(dir)/cwIoTest.cpp libcwSRC += src/libcw/cwIo.cpp src/libcw/cwIoTest.cpp
libcwHDR += $(dir)/cwTcpSocket.h $(dir)/cwTcpSocketSrv.h $(dir)/cwTcpSocketTest.h libcwHDR += src/libcw/cwTcpSocket.h src/libcw/cwTcpSocketSrv.h src/libcw/cwTcpSocketTest.h
libcwSRC += $(dir)/cwTcpSocket.cpp $(dir)/cwTcpSocketSrv.cpp $(dir)/cwTcpSocketTest.cpp 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 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 += $(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 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

6
cwAudioDeviceAlsa.cpp
View File

@ -166,7 +166,7 @@ namespace cw
case SND_PCM_STATE_PAUSED: return "paused"; case SND_PCM_STATE_PAUSED: return "paused";
case SND_PCM_STATE_SUSPENDED: return "suspended"; case SND_PCM_STATE_SUSPENDED: return "suspended";
case SND_PCM_STATE_DISCONNECTED: return "disconnected"; case SND_PCM_STATE_DISCONNECTED: return "disconnected";
case SND_PCM_STATE_PRIVATE1: return "private1"; //case SND_PCM_STATE_PRIVATE1: return "private1";
} }
return "<invalid>"; return "<invalid>";
@ -491,7 +491,7 @@ namespace cw
case SND_PCM_STATE_DRAINING: case SND_PCM_STATE_DRAINING:
case SND_PCM_STATE_PAUSED: case SND_PCM_STATE_PAUSED:
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
case SND_PCM_STATE_PRIVATE1: //case SND_PCM_STATE_PRIVATE1:
//case SND_PCM_STATE_LAST: //case SND_PCM_STATE_LAST:
break; break;
} }
@ -872,7 +872,7 @@ namespace cw
case SND_PCM_STATE_DRAINING: case SND_PCM_STATE_DRAINING:
case SND_PCM_STATE_PAUSED: case SND_PCM_STATE_PAUSED:
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
case SND_PCM_STATE_PRIVATE1: //case SND_PCM_STATE_PRIVATE1:
continue; continue;
case SND_PCM_STATE_RUNNING: case SND_PCM_STATE_RUNNING:

2
cwEuCon.cpp
View File

@ -606,7 +606,7 @@ namespace cw
const char* name = (const char*)(u+6); const char* name = (const char*)(u+6);
const char* label = "MC Mix - "; 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 this a 'MC Mix' DNS-SD SRV reply
if( strncmp(label, name+1, strlen(label)) == 0 ) if( strncmp(label, name+1, strlen(label)) == 0 )

4
cwObject.cpp
View File

@ -124,8 +124,8 @@ namespace cw
void _objTypePrintUInt16( const object_t* o, print_ctx_t& c ) { printf("%i",o->u.u16); } 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 _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 _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 _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("%li",o->u.u64); } 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 _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 _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); } void _objTypePrintDouble( const object_t* o, print_ctx_t& c ) { printf("%f",o->u.d); }

4
cwUi.cpp
View File

@ -285,7 +285,7 @@ namespace cw
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
const object_t* oo; const object_t* oo;
ele_t* parent_ele; //ele_t* parent_ele;
const char* jsId; const char* jsId;
// find the parent pair // find the parent pair
@ -304,7 +304,7 @@ namespace cw
//} //}
return rc;
} }