mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix hdmi cec

Browse Source
This commit is contained in:
TangoCash
2022-11-19 13:25:46 +01:00
committed by Thilo Graf
parent 47727e504a
commit d58a4144aa
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/hdmi_cec.cpp
View File

@@ -247,13 +247,9 @@ void hdmi_cec::SendAnnounce()
message.data[0] = CEC_OPCODE_GET_CEC_VERSION; message.data[0] = CEC_OPCODE_GET_CEC_VERSION;
message.length = 1; message.length = 1;
SendCECMessage(message); SendCECMessage(message);
SendActiveSource();
message.initiator = logicalAddress; SendActiveSource(true);
message.destination = CECDEVICE_BROADCAST;
message.data[0] = CEC_OPCODE_SET_OSD_NAME;
memcpy(message.data + 1, osdname, strlen(osdname));
message.length = strlen(osdname) + 1;
SendCECMessage(message);
message.initiator = logicalAddress; message.initiator = logicalAddress;
message.destination = CECDEVICE_TV; message.destination = CECDEVICE_TV;
message.data[0] = CEC_OPCODE_GIVE_OSD_NAME; message.data[0] = CEC_OPCODE_GIVE_OSD_NAME;
@@ -262,7 +258,7 @@ void hdmi_cec::SendAnnounce()
request_audio_status(); request_audio_status();
} }
void hdmi_cec::SendActiveSource() void hdmi_cec::SendActiveSource(bool force)
{ {
struct cec_message message; struct cec_message message;
message.destination = CECDEVICE_BROADCAST; message.destination = CECDEVICE_BROADCAST;
@@ -272,7 +268,7 @@ void hdmi_cec::SendActiveSource()
message.data[2] = physicalAddress[1]; message.data[2] = physicalAddress[1];
message.length = 3; message.length = 3;
if (CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_standby && active_source) if ((CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_standby && active_source) || force)
SendCECMessage(message); SendCECMessage(message);
} }
@@ -581,7 +577,7 @@ void hdmi_cec::run()
case CEC_OPCODE_GIVE_OSD_NAME: case CEC_OPCODE_GIVE_OSD_NAME:
{ {
txmessage.initiator = logicalAddress; txmessage.initiator = logicalAddress;
txmessage.destination = CECDEVICE_BROADCAST; txmessage.destination = rxmessage.initiator;
txmessage.data[0] = CEC_OPCODE_SET_OSD_NAME; txmessage.data[0] = CEC_OPCODE_SET_OSD_NAME;
memcpy(txmessage.data + 1, osdname, strlen(osdname)); memcpy(txmessage.data + 1, osdname, strlen(osdname));
txmessage.length = strlen(osdname) + 1; txmessage.length = strlen(osdname) + 1;
@@ -715,7 +711,7 @@ void hdmi_cec::run()
long code = translateKey(pressedkey); long code = translateKey(pressedkey);
dprintf(DEBUG_NORMAL, GREEN"[CEC] decoded key %s (%ld)\n"NORMAL, ToString((cec_user_control_code)pressedkey), code); dprintf(DEBUG_NORMAL, GREEN"[CEC] decoded key %s (%ld)\n"NORMAL, ToString((cec_user_control_code)pressedkey), code);
if (code == KEY_POWER) if (code == KEY_POWER || code == KEY_POWERON)
{ {
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_standby) if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_standby)
g_RCInput->postMsg(NeutrinoMessages::STANDBY_OFF, (neutrino_msg_data_t)"cec"); g_RCInput->postMsg(NeutrinoMessages::STANDBY_OFF, (neutrino_msg_data_t)"cec");

2
src/driver/hdmi_cec.h
View File

@@ -104,7 +104,7 @@ class hdmi_cec : public OpenThreads::Thread
void SendAnnounce(); void SendAnnounce();
void SendViewOn(); void SendViewOn();
void SendStandBy(); void SendStandBy();
void SendActiveSource(); void SendActiveSource(bool force = false);
void RequestTVPowerStatus(); void RequestTVPowerStatus();
void GetCECAddressInfo(); void GetCECAddressInfo();
void SendCECMessage(struct cec_message &message, int sleeptime = 250); void SendCECMessage(struct cec_message &message, int sleeptime = 250);