From 95bfedf518f075cd9961c5043ebdd87f2f0a0104 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Thu, 2 Mar 2023 14:39:56 -0700 Subject: [PATCH] fixed global reference --- DV3000.cpp | 14 +++++++------- DV3003.cpp | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DV3000.cpp b/DV3000.cpp index 1efc745..6c1e2b6 100644 --- a/DV3000.cpp +++ b/DV3000.cpp @@ -35,7 +35,7 @@ #include "DV3000.h" #include "Controller.h" -extern CController Controller; +extern CController g_Cont; CDV3000::CDV3000(Encoding t) : CDVDevice(t) {} @@ -143,15 +143,15 @@ void CDV3000::ProcessPacket(const SDV_Packet &p) } if (Encoding::dstar == type) // is this a DMR or a DStar device? { - Controller.dstar_mux.lock(); - Controller.RouteDstPacket(packet); - Controller.dstar_mux.unlock(); + g_Cont.dstar_mux.lock(); + g_Cont.RouteDstPacket(packet); + g_Cont.dstar_mux.unlock(); } else { - Controller.dmrst_mux.lock(); - Controller.RouteDmrPacket(packet); - Controller.dmrst_mux.unlock(); + g_Cont.dmrst_mux.lock(); + g_Cont.RouteDmrPacket(packet); + g_Cont.dmrst_mux.unlock(); } } } diff --git a/DV3003.cpp b/DV3003.cpp index 1b253ec..ea42bea 100644 --- a/DV3003.cpp +++ b/DV3003.cpp @@ -35,7 +35,7 @@ #include "DV3003.h" #include "Controller.h" -extern CController Controller; +extern CController g_Cont; CDV3003::CDV3003(Encoding t) : CDVDevice(t) {} @@ -147,15 +147,15 @@ void CDV3003::ProcessPacket(const SDV_Packet &p) } if (Encoding::dstar == type) // is this a DMR or a DStar device? { - Controller.dstar_mux.lock(); - Controller.RouteDstPacket(packet); - Controller.dstar_mux.unlock(); + g_Cont.dstar_mux.lock(); + g_Cont.RouteDstPacket(packet); + g_Cont.dstar_mux.unlock(); } else { - Controller.dmrst_mux.lock(); - Controller.RouteDmrPacket(packet); - Controller.dmrst_mux.unlock(); + g_Cont.dmrst_mux.lock(); + g_Cont.RouteDmrPacket(packet); + g_Cont.dmrst_mux.unlock(); } } }