From 0138d690a1b47fd6aa842b00a645c08b434c4431 Mon Sep 17 00:00:00 2001 From: kevin Date: Wed, 8 Apr 2020 20:08:11 -0400 Subject: [PATCH 1/2] cwObject.cpp : Fixed int64 printf specifiers. --- cwObject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cwObject.cpp b/cwObject.cpp index 1929325..5745b7d 100644 --- a/cwObject.cpp +++ b/cwObject.cpp @@ -126,8 +126,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("%" PRIx64 ,o->u.i64); } + void _objTypePrintUInt64( const object_t* o, print_ctx_t& c ) { printf("%" PRIx64 ,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); } From a27293c26f2297580bd51c5fb94065cbdcf1bef2 Mon Sep 17 00:00:00 2001 From: kevin Date: Wed, 8 Apr 2020 20:23:38 -0400 Subject: [PATCH 2/2] cwAudioDeviceAlsa.cpp : Removed pre-proc guards around SNDPCM_PRIVATE1 --- cwAudioDeviceAlsa.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cwAudioDeviceAlsa.cpp b/cwAudioDeviceAlsa.cpp index 612b908..804db8c 100644 --- a/cwAudioDeviceAlsa.cpp +++ b/cwAudioDeviceAlsa.cpp @@ -166,9 +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"; -#if defined(OS_64) // SND_PCM_STATE_PRIVATE1 is not defined on Rasp. Pi. which also happens to be 32bit OS. case SND_PCM_STATE_PRIVATE1: return "private1"; -#endif } return ""; @@ -493,10 +491,8 @@ namespace cw case SND_PCM_STATE_DRAINING: case SND_PCM_STATE_PAUSED: case SND_PCM_STATE_DISCONNECTED: -#if defined(OS_64) // SND_PCM_STATE_PRIVATE1 is not defined on Rasp. Pi. which also happens to be 32bit OS. - case SND_PCM_STATE_PRIVATE1: -#endif - //case SND_PCM_STATE_LAST: + case SND_PCM_STATE_PRIVATE1: + //case SND_PCM_STATE_LAST: break; } @@ -876,9 +872,7 @@ namespace cw case SND_PCM_STATE_DRAINING: case SND_PCM_STATE_PAUSED: case SND_PCM_STATE_DISCONNECTED: -#if defined(OS_64) // SND_PCM_STATE_PRIVATE1 is not defined on Rasp. Pi. which also happens to be 32bit OS. - case SND_PCM_STATE_PRIVATE1: -#endif + case SND_PCM_STATE_PRIVATE1: continue; case SND_PCM_STATE_RUNNING: