reword some warning messages to be more verbose; reorder when embedded FNE will transmit parrot frames;

src/network/FNENetwork.cpp

@@ -170,27 +170,6 @@ void FNENetwork::clock(uint32_t ms)
         m_updateLookupTimer.start();
     }
 
-#if defined(ENABLE_DMR)
-    // if the DMR handler has parrot frames to playback, playback a frame
-    if (m_tagDMR->hasParrotFrames()) {
-        m_tagDMR->playbackParrot();
-    }
-#endif // defined(ENABLE_DMR)
-
-#if defined(ENABLE_P25)
-    // if the P25 handler has parrot frames to playback, playback a frame
-    if (m_tagP25->hasParrotFrames()) {
-        m_tagP25->playbackParrot();
-    }
-#endif // defined(ENABLE_P25)
-
-#if defined(ENABLE_NXDN)
-    // if the NXDN handler has parrot frames to playback, playback a frame
-    if (m_tagNXDN->hasParrotFrames()) {
-        m_tagNXDN->playbackParrot();
-    }
-#endif // defined(ENABLE_NXDN)
-
     sockaddr_storage address;
     uint32_t addrLen;
     frame::RTPHeader rtpHeader;
@@ -586,6 +565,28 @@ void FNENetwork::clock(uint32_t ms)
             break;
         }
     }
+    else {
+#if defined(ENABLE_DMR)
+        // if the DMR handler has parrot frames to playback, playback a frame
+        if (m_tagDMR->hasParrotFrames()) {
+            m_tagDMR->playbackParrot();
+        }
+#endif // defined(ENABLE_DMR)
+
+#if defined(ENABLE_P25)
+        // if the P25 handler has parrot frames to playback, playback a frame
+        if (m_tagP25->hasParrotFrames()) {
+            m_tagP25->playbackParrot();
+        }
+#endif // defined(ENABLE_P25)
+
+#if defined(ENABLE_NXDN)
+        // if the NXDN handler has parrot frames to playback, playback a frame
+        if (m_tagNXDN->hasParrotFrames()) {
+            m_tagNXDN->playbackParrot();
+        }
+#endif // defined(ENABLE_NXDN)
+   }
 
     return;
 }

src/network/Network.cpp

@@ -303,7 +303,7 @@ void Network::clock(uint32_t ms)
                         else {
                             if (m_rxDMRStreamId[slotNo] == streamId) {
                                 if (m_pktLastSeq != 0U && m_pktSeq != m_pktLastSeq + 1) {
-                                    LogWarning(LOG_NET, "Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
+                                    LogWarning(LOG_NET, "DMR Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
                                 }
                             }
                             else {
@@ -330,7 +330,7 @@ void Network::clock(uint32_t ms)
                         else {
                             if (m_rxP25StreamId == streamId) {
                                 if (m_pktLastSeq != 0U && m_pktSeq != m_pktLastSeq + 1) {
-                                    LogWarning(LOG_NET, "Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
+                                    LogWarning(LOG_NET, "P25 Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
                                 }
                             }
                             else {
@@ -357,7 +357,7 @@ void Network::clock(uint32_t ms)
                         else {
                             if (m_rxNXDNStreamId == streamId) {
                                 if (m_pktLastSeq != 0U && m_pktSeq != m_pktLastSeq + 1) {
-                                    LogWarning(LOG_NET, "Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
+                                    LogWarning(LOG_NET, "NXDN Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
                                 }
                             }
                             else {