Changeset 7765

Timestamp:

Dec 15, 2010, 3:27:22 PM (14 years ago)

Author:

smerkli

Message:

prepared MSC for singleton usage.

Location:

code/branches/presentation/src/libraries/network

Files:

• MasterServer.cc (modified) (1 diff)
• MasterServerComm.cc (modified) (1 diff)
• MasterServerComm.h (modified) (3 diffs)

code/branches/presentation/src/libraries/network/MasterServer.cc

@@ -194 +194 @@
 
         /* remove the server from the list it belongs to */
-        this->mainlist.delServerByName( name );
+        this->mainlist.delServerByAddress( name );
 
         /* tell the user */

code/branches/presentation/src/libraries/network/MasterServerComm.cc

@@ -31 +31 @@
 namespace orxonox
 {
+  ManageScopedSingleton(MasterServerComm, ScopeID::Root, true);
  
   MasterServerComm::MasterServerComm()

code/branches/presentation/src/libraries/network/MasterServerComm.h

@@ -36 +36 @@
 #include <enet/enet.h>
 
+// tolua_begin
 namespace orxonox
 {
-  class MasterServerComm
-  {
+  class _NetworkExport MasterServerComm 
+    : public Singleton<MasterServerComm>, public OrxonoxClass
+  { // tolua_export
+    friend class Singleton<MasterServerComm>;
     public: 
       /** constructor */
@@ -89 +92 @@
       int pollForReply( int (*callback)( char*, ENetEvent* ), int delayms );
 
+      /** \return an instance of WANDiscovery
+       * 
+       * Create and return an instance of WANDiscovery.
+       */
+      static MasterServerComm& getInstance() { return Singleton<MasterServerComm>::getInstance(); } // tolua_export
+
     private:
       /** client handle */
@@ -101 +110 @@
       /** peer data holder */
       ENetPeer *peer;
-  };
 
-}
+      /** Singleton pointer */
+      static MasterServerComm* singletonPtr_s;
+  }; // tolua_export
+
+} // tolua_export
 
 #endif /* MASTERSERVERCOMM_H */