Changeset 44:f5222044879c in xplra for src/plugin/src/xplra/plugin.cc

Timestamp:

02/15/13 18:51:58 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Created the Globals class

File:

• src/plugin/src/xplra/plugin.cc (modified) (6 diffs)

src/plugin/src/xplra/plugin.cc

@@ -31 +31 @@
 #include "ListenThread.h"
 
-#include "MessageWindow.h"
-#include "Menu.h"
+#include "Globals.h"
 
 #include <hu/varadiistvan/xplcommon/Util.h>
@@ -38 +37 @@
 
 #include <XPLMDefs.h>
-#include <XPLMUtilities.h>
 #include <XPLMProcessing.h>
 #include <XPLMMenus.h>
@@ -53 +51 @@
 
 using xplra::ListenThread;
-using xplra::MessageWindow;
-using xplra::Menu;
+using xplra::Globals;
 
 using hu::varadiistvan::xplcommon::Util;
@@ -61 +58 @@
 
 /**
- * The window to display messages from the clients.
+ * The global objects.
  */
-static MessageWindow* messageWindow = 0;
-
-/**
- * The menu.
- */
-static Menu* menu = 0;
+static Globals* globals = 0;
 
 /**
@@ -100 +92 @@
     // XPLMRegisterFlightLoopCallback(&callback, 5.0, 0);
 
-    int xplaneVersion = 0;
-    int xplmVersion = 0;
-    XPLMHostApplicationID hostID = 0;
-    XPLMGetVersions(&xplaneVersion, &xplmVersion, &hostID);
+    globals = new Globals();
 
-    messageWindow = new MessageWindow();
-    menu = new Menu(*messageWindow);
-
-    listenThread = new ListenThread(xplaneVersion, xplmVersion,
-                                    *messageWindow);
+    listenThread = new ListenThread(*globals);
     listenThread->start();
 }
@@ -134 +119 @@
     }
 
-    delete menu; menu = 0;
-    delete messageWindow; messageWindow = 0;
+    delete globals; globals = 0;
 }