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 52f31cba15ad2e0631eb1429b75f5fa6bfb53f24..c31f032ce092fad67954a0138fc9b6e4567fc2da 100644 (file)
--- 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 2f8e4b24cff36f12789e4d9a47126d139f3bb615..7b720dc8052e2391b9afb6801c9ce42e08d77d0c 100644 (file)
--- 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 (file)
index 0000000..789d0fb
--- /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();
+}