From: Dave Chapman Date: Sat, 29 Dec 2012 10:01:06 +0000 (+0000) Subject: Rename cec_audio_status() to cec_audio_get_status() to avoid conflict with the cec_au... X-Git-Tag: upstream/2.2.0~1^2~6^2~21^2 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=aa76c1161ba67de43c8b6de473b487f7b5d37fb5;p=deb_libcec.git Rename cec_audio_status() to cec_audio_get_status() to avoid conflict with the cec_audio_status enum. This makes the C API compile again. --- diff --git a/include/cecc.h b/include/cecc.h index 2e1f9a8..074a348 100644 --- a/include/cecc.h +++ b/include/cecc.h @@ -282,7 +282,7 @@ extern DECLSPEC uint8_t cec_audio_mute(void); extern DECLSPEC uint8_t cec_audio_unmute(void); -extern DECLSPEC uint8_t cec_audio_status(void); +extern DECLSPEC uint8_t cec_audio_get_status(void); #ifdef __cplusplus }; diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp index b53dc05..433bef7 100644 --- a/src/lib/LibCECC.cpp +++ b/src/lib/LibCECC.cpp @@ -403,7 +403,7 @@ uint8_t cec_audio_unmute(void) return cec_parser ? cec_parser->AudioUnmute() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN; } -uint8_t cec_audio_status(void) +uint8_t cec_audio_get_status(void) { return cec_parser ? cec_parser->AudioStatus() : (uint8_t)CEC_AUDIO_VOLUME_STATUS_UNKNOWN; }