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

Merge branch 'master' of gitea.larke.org:klarke/libcw

Browse Source
This commit is contained in:
kevin.larke 2020-04-09 21:07:58 -04:00
commit fb92ec15de
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cwAudioDeviceAlsa.cpp
View File

@ -166,9 +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";
#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"; case SND_PCM_STATE_PRIVATE1: return "private1";
#endif
} }
return "<invalid>"; return "<invalid>";
@ -493,10 +491,8 @@ 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:
#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:
case SND_PCM_STATE_PRIVATE1: //case SND_PCM_STATE_LAST:
#endif
//case SND_PCM_STATE_LAST:
break; break;
} }
@ -876,9 +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:
#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:
case SND_PCM_STATE_PRIVATE1:
#endif
continue; continue;
case SND_PCM_STATE_RUNNING: case SND_PCM_STATE_RUNNING:

4
cwObject.cpp
View File

@ -144,8 +144,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("%" PRIx64 ,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("%" PRIx64 ,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); }