mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

hdmi_cec: fix warning: invalid suffix on literal; C++11 requires a space between literal and string macro

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 360a9a58db
Author: max_10 <max_10@gmx.de>
Date: 2020-06-19 (Fri, 19 Jun 2020)

Origin message was:
------------------
- hdmi_cec: fix warning: invalid suffix on literal; C++11 requires a space between literal and string macro

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2020-06-19 23:51:54 +02:00
committed by vanhofen
parent d47a9b20b6
commit 28b5a58b9c
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libarmbox/hdmi_cec.cpp
View File

@@ -97,7 +97,7 @@ hdmi_cec* hdmi_cec::getInstance()
if (hdmi_cec_instance == NULL) if (hdmi_cec_instance == NULL)
{ {
hdmi_cec_instance = new hdmi_cec(); hdmi_cec_instance = new hdmi_cec();
hal_info_c(GREEN"[CEC] new instance created \n"NORMAL); hal_info_c(GREEN "[CEC] new instance created \n" NORMAL);
} }
return hdmi_cec_instance; return hdmi_cec_instance;
} }
@@ -111,13 +111,13 @@ bool hdmi_cec::SetCECMode(VIDEO_HDMI_CEC_MODE _deviceType)
if (_deviceType == VIDEO_HDMI_CEC_MODE_OFF) if (_deviceType == VIDEO_HDMI_CEC_MODE_OFF)
{ {
Stop(); Stop();
hal_info(GREEN"[CEC] switch off %s\n"NORMAL, __func__); hal_info(GREEN "[CEC] switch off %s\n" NORMAL, __func__);
return false; return false;
} }
else else
deviceType = _deviceType; deviceType = _deviceType;
hal_info(GREEN"[CEC] switch on %s\n"NORMAL, __func__); hal_info(GREEN "[CEC] switch on %s\n" NORMAL, __func__);
#if BOXMODEL_VUPLUS_ALL #if BOXMODEL_VUPLUS_ALL
if (hdmiFd == -1) if (hdmiFd == -1)
@@ -138,21 +138,21 @@ bool hdmi_cec::SetCECMode(VIDEO_HDMI_CEC_MODE _deviceType)
{ {
fallback = true; fallback = true;
#if BOXMODEL_VUPLUS_ALL #if BOXMODEL_VUPLUS_ALL
hal_info(RED"[CEC] fallback on %s\n"NORMAL, __func__); hal_info(RED "[CEC] fallback on %s\n" NORMAL, __func__);
#endif #endif
__u32 monitor = CEC_MODE_INITIATOR | CEC_MODE_FOLLOWER; __u32 monitor = CEC_MODE_INITIATOR | CEC_MODE_FOLLOWER;
struct cec_caps caps = {}; struct cec_caps caps = {};
if (ioctl(hdmiFd, CEC_ADAP_G_CAPS, &caps) < 0) if (ioctl(hdmiFd, CEC_ADAP_G_CAPS, &caps) < 0)
hal_info(RED"[CEC] %s: get caps failed (%m)\n"NORMAL, __func__); hal_info(RED "[CEC] %s: get caps failed (%m)\n" NORMAL, __func__);
if (caps.capabilities & CEC_CAP_LOG_ADDRS) if (caps.capabilities & CEC_CAP_LOG_ADDRS)
{ {
struct cec_log_addrs laddrs = {}; struct cec_log_addrs laddrs = {};
if (ioctl(hdmiFd, CEC_ADAP_S_LOG_ADDRS, &laddrs) < 0) if (ioctl(hdmiFd, CEC_ADAP_S_LOG_ADDRS, &laddrs) < 0)
hal_info(RED"[CEC] %s: reset log addr failed (%m)\n"NORMAL, __func__); hal_info(RED "[CEC] %s: reset log addr failed (%m)\n" NORMAL, __func__);
memset(&laddrs, 0, sizeof(laddrs)); memset(&laddrs, 0, sizeof(laddrs));
@@ -202,11 +202,11 @@ bool hdmi_cec::SetCECMode(VIDEO_HDMI_CEC_MODE _deviceType)
laddrs.num_log_addrs++; laddrs.num_log_addrs++;
if (ioctl(hdmiFd, CEC_ADAP_S_LOG_ADDRS, &laddrs) < 0) if (ioctl(hdmiFd, CEC_ADAP_S_LOG_ADDRS, &laddrs) < 0)
hal_info(RED"[CEC] %s: et log addr failed (%m)\n"NORMAL, __func__); hal_info(RED "[CEC] %s: et log addr failed (%m)\n" NORMAL, __func__);
} }
if (ioctl(hdmiFd, CEC_S_MODE, &monitor) < 0) if (ioctl(hdmiFd, CEC_S_MODE, &monitor) < 0)
hal_info(RED"[CEC] %s: monitor failed (%m)\n"NORMAL, __func__); hal_info(RED "[CEC] %s: monitor failed (%m)\n" NORMAL, __func__);
} }
} }
@@ -281,7 +281,7 @@ void hdmi_cec::GetCECAddressInfo()
logicalAddress = addressinfo.logical; logicalAddress = addressinfo.logical;
if (memcmp(physicalAddress, addressinfo.physical, sizeof(physicalAddress))) if (memcmp(physicalAddress, addressinfo.physical, sizeof(physicalAddress)))
{ {
hal_info(GREEN"[CEC] %s: detected physical address change: %02X%02X --> %02X%02X\n"NORMAL, __func__, physicalAddress[0], physicalAddress[1], addressinfo.physical[0], addressinfo.physical[1]); hal_info(GREEN "[CEC] %s: detected physical address change: %02X%02X --> %02X%02X\n" NORMAL, __func__, physicalAddress[0], physicalAddress[1], addressinfo.physical[0], addressinfo.physical[1]);
memcpy(physicalAddress, addressinfo.physical, sizeof(physicalAddress)); memcpy(physicalAddress, addressinfo.physical, sizeof(physicalAddress));
ReportPhysicalAddress(); ReportPhysicalAddress();
} }
@@ -312,7 +312,7 @@ void hdmi_cec::SendCECMessage(struct cec_message &txmessage, int sleeptime)
{ {
sprintf(str+(i*6),"[0x%02X]", txmessage.data[i]); sprintf(str+(i*6),"[0x%02X]", txmessage.data[i]);
} }
hal_info(GREEN"[CEC] send message %s to %s (0x%02X>>0x%02X) '%s' (%s)\n"NORMAL,ToString((cec_logical_address)txmessage.initiator), txmessage.destination == 0xf ? "all" : ToString((cec_logical_address)txmessage.destination), txmessage.initiator, txmessage.destination, ToString((cec_opcode)txmessage.data[0]), str); hal_info(GREEN "[CEC] send message %s to %s (0x%02X>>0x%02X) '%s' (%s)\n" NORMAL,ToString((cec_logical_address)txmessage.initiator), txmessage.destination == 0xf ? "all" : ToString((cec_logical_address)txmessage.destination), txmessage.initiator, txmessage.destination, ToString((cec_opcode)txmessage.data[0]), str);
if (fallback) if (fallback)
{ {
@@ -648,7 +648,7 @@ void hdmi_cec::Receive(int what)
{ {
sprintf(str+(i*6),"[0x%02X]", rxmessage.data[i]); sprintf(str+(i*6),"[0x%02X]", rxmessage.data[i]);
} }
hal_info(GREEN"[CEC] received message %s to %s (0x%02X>>0x%02X) '%s' (%s)\n"NORMAL,ToString((cec_logical_address)rxmessage.initiator), rxmessage.destination == 0xf ? "all" : ToString((cec_logical_address)rxmessage.destination), rxmessage.initiator, rxmessage.destination, ToString((cec_opcode)rxmessage.opcode), str); hal_info(GREEN "[CEC] received message %s to %s (0x%02X>>0x%02X) '%s' (%s)\n" NORMAL,ToString((cec_logical_address)rxmessage.initiator), rxmessage.destination == 0xf ? "all" : ToString((cec_logical_address)rxmessage.destination), rxmessage.initiator, rxmessage.destination, ToString((cec_opcode)rxmessage.opcode), str);
switch (rxmessage.opcode) switch (rxmessage.opcode)
{ {
@@ -669,9 +669,9 @@ void hdmi_cec::Receive(int what)
muted = ((rxmessage.data[1] & 0x80) == 0x80); muted = ((rxmessage.data[1] & 0x80) == 0x80);
volume = ((rxmessage.data[1] & 0x7F) / 127.0) * 100.0; volume = ((rxmessage.data[1] & 0x7F) / 127.0) * 100.0;
if (muted) if (muted)
hal_info(GREEN"[CEC] %s volume muted\n"NORMAL, ToString((cec_logical_address)rxmessage.initiator)); hal_info(GREEN "[CEC] %s volume muted\n" NORMAL, ToString((cec_logical_address)rxmessage.initiator));
else else
hal_info(GREEN"[CEC] %s volume %d \n"NORMAL, ToString((cec_logical_address)rxmessage.initiator), volume); hal_info(GREEN "[CEC] %s volume %d \n" NORMAL, ToString((cec_logical_address)rxmessage.initiator), volume);
break; break;
} }
case CEC_OPCODE_DEVICE_VENDOR_ID: case CEC_OPCODE_DEVICE_VENDOR_ID:
@@ -680,7 +680,7 @@ void hdmi_cec::Receive(int what)
uint64_t iVendorId = ((uint64_t)rxmessage.data[1] << 16) + uint64_t iVendorId = ((uint64_t)rxmessage.data[1] << 16) +
((uint64_t)rxmessage.data[2] << 8) + ((uint64_t)rxmessage.data[2] << 8) +
(uint64_t)rxmessage.data[3]; (uint64_t)rxmessage.data[3];
hal_info(GREEN"[CEC] decoded message '%s' (%s)\n"NORMAL, ToString((cec_opcode)rxmessage.opcode), ToString((cec_vendor_id)iVendorId)); hal_info(GREEN "[CEC] decoded message '%s' (%s)\n" NORMAL, ToString((cec_opcode)rxmessage.opcode), ToString((cec_vendor_id)iVendorId));
break; break;
} }
case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS: case CEC_OPCODE_GIVE_DEVICE_POWER_STATUS:
@@ -697,11 +697,11 @@ void hdmi_cec::Receive(int what)
{ {
if ((rxmessage.data[1] == CEC_POWER_STATUS_ON) || (rxmessage.data[1] == CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON)) if ((rxmessage.data[1] == CEC_POWER_STATUS_ON) || (rxmessage.data[1] == CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON))
{ {
hal_info(GREEN"[CEC] %s reporting state on (%d)\n"NORMAL, ToString((cec_logical_address)rxmessage.initiator), rxmessage.data[1]); hal_info(GREEN "[CEC] %s reporting state on (%d)\n" NORMAL, ToString((cec_logical_address)rxmessage.initiator), rxmessage.data[1]);
if (rxmessage.initiator == CEC_OP_PRIM_DEVTYPE_TV) if (rxmessage.initiator == CEC_OP_PRIM_DEVTYPE_TV)
tv_off = false; tv_off = false;
} else { } else {
hal_info(GREEN"[CEC] %s reporting state off (%d)\n"NORMAL, ToString((cec_logical_address)rxmessage.initiator), rxmessage.data[1]); hal_info(GREEN "[CEC] %s reporting state off (%d)\n" NORMAL, ToString((cec_logical_address)rxmessage.initiator), rxmessage.data[1]);
if (rxmessage.initiator == CEC_OP_PRIM_DEVTYPE_TV) if (rxmessage.initiator == CEC_OP_PRIM_DEVTYPE_TV)
tv_off = true; tv_off = true;
} }
@@ -721,7 +721,7 @@ void hdmi_cec::Receive(int what)
case CEC_OPCODE_USER_CONTROL_RELEASE: /* key released */ case CEC_OPCODE_USER_CONTROL_RELEASE: /* key released */
{ {
long code = translateKey(pressedkey); long code = translateKey(pressedkey);
hal_info(GREEN"[CEC] decoded key %s (%ld)\n"NORMAL,ToString((cec_user_control_code)pressedkey), code); hal_info(GREEN "[CEC] decoded key %s (%ld)\n" NORMAL,ToString((cec_user_control_code)pressedkey), code);
handleCode(code,keypressed); handleCode(code,keypressed);
break; break;
} }
@@ -735,14 +735,14 @@ void hdmi_cec::handleCode(long code, bool keypressed)
int evd = open(RC_DEVICE, O_RDWR); int evd = open(RC_DEVICE, O_RDWR);
if (evd < 0) if (evd < 0)
{ {
hal_info(RED"[CEC] opening " RC_DEVICE " failed"NORMAL); hal_info(RED "[CEC] opening " RC_DEVICE " failed" NORMAL);
return; return;
} }
if (keypressed) if (keypressed)
{ {
if (rc_send(evd, code, CEC_KEY_PRESSED) < 0) if (rc_send(evd, code, CEC_KEY_PRESSED) < 0)
{ {
hal_info(RED"[CEC] writing 'KEY_PRESSED' event failed"NORMAL); hal_info(RED "[CEC] writing 'KEY_PRESSED' event failed" NORMAL);
close(evd); close(evd);
return; return;
} }
@@ -752,7 +752,7 @@ void hdmi_cec::handleCode(long code, bool keypressed)
{ {
if (rc_send(evd, code, CEC_KEY_RELEASED) < 0) if (rc_send(evd, code, CEC_KEY_RELEASED) < 0)
{ {
hal_info(RED"[CEC] writing 'KEY_RELEASED' event failed"NORMAL); hal_info(RED "[CEC] writing 'KEY_RELEASED' event failed" NORMAL);
close(evd); close(evd);
return; return;
} }