fixed: send an active source message when a routing change has been r…

…eceived with libCEC's address as new route and no active source message has been sent yet. issue #309 #205 #233

src/libcec/devices/CECBusDevice.cpp

@@ -153,7 +153,8 @@ CCECBusDevice::CCECBusDevice(CCECProcessor *processor, cec_logical_address iLogi
   m_bAwaitingReceiveFailed(false),
   m_bVendorIdRequested    (false),
   m_waitForResponse       (new CWaitForResponse),
-  m_bImageViewOnSent      (false)
+  m_bImageViewOnSent      (false),
+  m_bActiveSourceSent     (false)
 {
   m_handler = new CCECCommandHandler(this);
   m_strDeviceName = ToString(m_iLogicalAddress);
@@ -685,6 +686,9 @@ void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
     m_iLastPowerStateUpdate = GetTimeMs();
     LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s (%X): power status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_powerStatus), ToString(powerStatus));
     m_powerStatus = powerStatus;
+
+    if (m_iLogicalAddress == CECDEVICE_TV)
+      m_processor->GetDevices()->ResetActiveSourceSent();
   }
 }
 
@@ -1141,6 +1145,7 @@ bool CCECBusDevice::TransmitActiveSource(bool bIsReply)
   if (bSendActiveSource)
   {
     MarkBusy();
+    SetActiveSourceSent(true);
     bActiveSourceSent = m_handler->TransmitActiveSource(m_iLogicalAddress, iPhysicalAddress, bIsReply);
     MarkReady();
   }
@@ -1215,7 +1220,7 @@ void CCECBusDevice::SetActiveRoute(uint16_t iRoute)
     return;
 
   CCECBusDevice* newRoute = m_processor->GetDeviceByPhysicalAddress(iRoute, true);
-  if (newRoute && newRoute->IsHandledByLibCEC() && !newRoute->IsActiveSource())
+  if (newRoute && newRoute->IsHandledByLibCEC() && (!ActiveSourceSent() || !newRoute->IsActiveSource()))
   {
     // we were made the active source, send notification
     newRoute->ActivateSource();
@@ -1498,3 +1503,13 @@ bool CCECBusDevice::TransmitMuteAudio(const cec_logical_address source)
   return TransmitKeypress(source, CEC_USER_CONTROL_CODE_MUTE) &&
       TransmitKeyRelease(source);
 }
+
+void CCECBusDevice::SetActiveSourceSent(bool setto = true)
+{
+  m_bActiveSource = setto;
+}
+
+bool CCECBusDevice::ActiveSourceSent(void) const
+{
+  return m_bActiveSourceSent;
+}

src/libcec/devices/CECBusDevice.h

@@ -199,6 +199,9 @@ namespace CEC
     void                          SignalOpcode(cec_opcode opcode);
     bool                          WaitForOpcode(cec_opcode opcode);
 
+    void                          SetActiveSourceSent(bool setto = true);
+    bool                          ActiveSourceSent(void) const;
+
            CCECAudioSystem *      AsAudioSystem(void);
     static CCECAudioSystem *      AsAudioSystem(CCECBusDevice *device);
            CCECPlaybackDevice *   AsPlaybackDevice(void);
@@ -243,5 +246,6 @@ namespace CEC
     bool                  m_bVendorIdRequested;
     CWaitForResponse     *m_waitForResponse;
     bool                  m_bImageViewOnSent;
+    bool                  m_bActiveSourceSent;
   };
 };

src/libcec/devices/CECDeviceMap.cpp

@@ -212,6 +212,12 @@ CCECBusDevice *CCECDeviceMap::GetActiveSource(void) const
   return NULL;
 }
 
+void CCECDeviceMap::ResetActiveSourceSent(void)
+{
+  for (CECDEVICEMAP::iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
+    it->second->SetActiveSourceSent(false);
+}
+
 void CCECDeviceMap::FilterLibCECControlled(CECDEVICEVEC &devices)
 {
   CECDEVICEVEC newDevices;

src/libcec/devices/CECDeviceMap.h

@@ -71,6 +71,7 @@ namespace CEC
     void GetWakeDevices(const libcec_configuration &configuration, CECDEVICEVEC &devices) const;
 
     CCECBusDevice *GetActiveSource(void) const;
+    void ResetActiveSourceSent(void);
 
     static void FilterLibCECControlled(CECDEVICEVEC &devices);
     static void FilterActive(CECDEVICEVEC &devices);