Skip to content

Commit 37e2891

Browse files
apatel859aishwariya15
authored andcommitted
LLAMA-14031: Moved getHdmiArcPortID away from Initialize
Signed-off-by: apatel859 <[email protected]>
1 parent c43ff88 commit 37e2891

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

HdmiCecSink/HdmiCecSink.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static std::vector<DeviceFeatures> deviceFeatures = {DEVICE_FEATURES_TV};
174174

175175
#define API_VERSION_NUMBER_MAJOR 1
176176
#define API_VERSION_NUMBER_MINOR 3
177-
#define API_VERSION_NUMBER_PATCH 7
177+
#define API_VERSION_NUMBER_PATCH 8
178178

179179
using PowerState = WPEFramework::Exchange::IPowerManager::PowerState;
180180

@@ -745,22 +745,21 @@ namespace WPEFramework
745745
Register(HDMICECSINK_METHOD_SET_LATENCY_INFO, &HdmiCecSink::setLatencyInfoWrapper, this);
746746
logicalAddressDeviceType = "None";
747747
logicalAddress = 0xFF;
748+
// load persistence setting
749+
loadSettings();
750+
751+
int err;
752+
dsHdmiInGetNumberOfInputsParam_t hdmiInput;
753+
InitializeIARM();
748754
m_sendKeyEventThreadExit = false;
749755
m_sendKeyEventThread = std::thread(threadSendKeyEvent);
750756

751757
m_currentArcRoutingState = ARC_STATE_ARC_TERMINATED;
752758
m_semSignaltoArcRoutingThread.acquire();
753759
m_arcRoutingThread = std::thread(threadArcRouting);
754760

755-
756761
m_arcStartStopTimer.connect( std::bind( &HdmiCecSink::arcStartStopTimerFunction, this ) );
757762
m_arcStartStopTimer.setSingleShot(true);
758-
// load persistence setting
759-
loadSettings();
760-
761-
int err;
762-
dsHdmiInGetNumberOfInputsParam_t hdmiInput;
763-
InitializeIARM();
764763
// get power state:
765764
uint32_t res = Core::ERROR_GENERAL;
766765
PowerState pwrStateCur = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
@@ -812,7 +811,7 @@ namespace WPEFramework
812811
}
813812
}
814813
getCecVersion();
815-
getHdmiArcPortID();
814+
LOGINFO(" HdmiCecSink plugin Initialize completed \n");
816815
return (std::string());
817816

818817
}
@@ -3340,7 +3339,7 @@ namespace WPEFramework
33403339
return;
33413340

33423341
LOGINFO("Running threadArcRouting");
3343-
3342+
_instance->getHdmiArcPortID();
33443343

33453344
while(1)
33463345
{

HdmiCecSink/HdmiCecSink.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,9 +573,8 @@ namespace WPEFramework {
573573
void sendKeyReleaseEvent(const int logicalAddress);
574574
void sendUserControlPressed(const int logicalAddress, int keyCode);
575575
void sendUserControlReleased(const int logicalAddress);
576-
void sendGiveAudioStatusMsg();
577-
void onPowerModeChanged(const PowerState &currentState, const PowerState &newState);
578-
void registerEventHandlers();
576+
void sendGiveAudioStatusMsg();
577+
void getHdmiArcPortID();
579578
int m_numberOfDevices; /* Number of connected devices othethan own device */
580579
bool m_audioDevicePowerStatusRequested;
581580

@@ -733,7 +732,6 @@ namespace WPEFramework {
733732
void Send_Request_Arc_Termination_Message();
734733
void Send_Report_Arc_Terminated_Message();
735734
void arcStartStopTimerFunction();
736-
void getHdmiArcPortID();
737735
void getCecVersion();
738736
};
739737
} // namespace Plugin

0 commit comments

Comments
 (0)