fixed global reference

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();
+			g_Cont.dstar_mux.lock();
-			Controller.RouteDstPacket(packet);
+			g_Cont.RouteDstPacket(packet);
-			Controller.dstar_mux.unlock();
+			g_Cont.dstar_mux.unlock();
 		}
 		else
 		{
-			Controller.dmrst_mux.lock();
+			g_Cont.dmrst_mux.lock();
-			Controller.RouteDmrPacket(packet);
+			g_Cont.RouteDmrPacket(packet);
-			Controller.dmrst_mux.unlock();
+			g_Cont.dmrst_mux.unlock();
 		}
 	}
 }

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();
+			g_Cont.dstar_mux.lock();
-			Controller.RouteDstPacket(packet);
+			g_Cont.RouteDstPacket(packet);
-			Controller.dstar_mux.unlock();
+			g_Cont.dstar_mux.unlock();
 		}
 		else
 		{
-			Controller.dmrst_mux.lock();
+			g_Cont.dmrst_mux.lock();
-			Controller.RouteDmrPacket(packet);
+			g_Cont.RouteDmrPacket(packet);
-			Controller.dmrst_mux.unlock();
+			g_Cont.dmrst_mux.unlock();
 		}
 	}
 }