From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sat, 22 Mar 2014 01:28:25 +0000 (+0000)
Subject: Move all global variables into one file.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=d72e77c3ae5d5c3fc3be05d45f6924b10f5ebd10;p=freetel-svn-tracking.git

Move all global variables into one file.


git-svn-id: https://svn.code.sf.net/p/freetel/code@1472 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/freedv-server/source/big_main.cpp b/freedv-server/source/big_main.cpp
index 52f31cba..c31f032c 100644
--- a/freedv-server/source/big_main.cpp
+++ b/freedv-server/source/big_main.cpp
@@ -91,7 +91,7 @@ static const struct option options[] = {
 };
 
 namespace FreeDV {
-  const char * program_name = 0;
+  extern const char * program_name;
 }
 
 /// The main loop for large programs.
diff --git a/freedv-server/source/driver_manager.cpp b/freedv-server/source/driver_manager.cpp
index 2f8e4b24..7b720dc8 100644
--- a/freedv-server/source/driver_manager.cpp
+++ b/freedv-server/source/driver_manager.cpp
@@ -257,7 +257,8 @@ namespace FreeDV {
   DriverManager *
   driver_manager()
   {
-    static DriverManager * const d(new DriverManager());
-    return d;
+    extern DriverManager * _globalDriverManager;
+
+    return _globalDriverManager;
   }
 }
diff --git a/freedv-server/source/global.cpp b/freedv-server/source/global.cpp
new file mode 100644
index 00000000..789d0fbc
--- /dev/null
+++ b/freedv-server/source/global.cpp
@@ -0,0 +1,6 @@
+#include "drivers.h"
+
+namespace FreeDV {
+  const char * program_name = 0;
+  DriverManager * _globalDriverManager = new DriverManager();
+}