diff --git a/Controller.cpp b/Controller.cpp index 59bbb72..4a28d6d 100644 --- a/Controller.cpp +++ b/Controller.cpp @@ -147,29 +147,17 @@ void CController::ReadReflectorThread() add_dst_mux.lock(); dstar_device.AddPacket(packet); add_dst_mux.unlock(); -#ifdef DEBUG - if (0 == packet->GetSequence()) - Dump(packet, "DStar from reflect to decode:"); -#endif break; case ECodecType::dmr: add_dmr_mux.lock(); dmr_device.AddPacket(packet); add_dmr_mux.unlock(); -#ifdef DEBUG - if (0 == packet->GetSequence()) - Dump(packet, "DMR from reflect to decode:"); -#endif break; case ECodecType::c2_1600: case ECodecType::c2_3200: c2_mux.lock(); codec2_queue.push(packet); c2_mux.unlock(); -#ifdef DEBUG - if (0 == packet->GetSequence()) - Dump(packet, "M17 from reflect to decode:"); -#endif break; default: Dump(packet, "ERROR: Received a reflector packet with unknown Codec:"); @@ -305,13 +293,6 @@ void CController::SendToReflector(std::shared_ptr packet) // send the packet over the socket socket.Send(packet->GetTCPacket()); // the socket will automatically close after sending -#ifdef DEBUG - AppendWave(packet); - if (packet->IsSecond()) - AppendM17(packet); - if (0 == packet->GetSequence()) - Dump(packet, "Complete:"); -#endif } void CController::RouteDstPacket(std::shared_ptr packet) diff --git a/DV3003.cpp b/DV3003.cpp index 869ab75..ad69655 100644 --- a/DV3003.cpp +++ b/DV3003.cpp @@ -501,7 +501,7 @@ void CDV3003::AddPacket(const std::shared_ptr packet) unsigned int s = inq.size(); if (s > maxsize) { - std::cout << "inq size=" << s << std::endl; + std::cout << "input queue size for " << ((type==Encoding::dstar) ? "dstar" : "dmr") << " is " << s << std::endl; maxsize = s; } #endif diff --git a/Main.cpp b/Main.cpp index 2e58b81..2c0910a 100644 --- a/Main.cpp +++ b/Main.cpp @@ -27,7 +27,7 @@ int main() if (Controller.Start()) return EXIT_FAILURE; - std::cout << "Hybrid Transcoder version #211227 successfully started" << std::endl; + std::cout << "Hybrid Transcoder version #211228 successfully started" << std::endl; pause();