Changeset 109 for trunk

Timestamp:

06/06/13 17:29:27 (12 years ago)

Author:

epyon

Message:

• prevent multiple loadings of the same library

Location:

trunk

Files:

• nv/library.hh (modified) (2 diffs)
• src/lib/freetype2.cc (modified) (1 diff)
• src/lib/gl.cc (modified) (1 diff)
• src/lib/lua.cc (modified) (1 diff)
• src/lib/sdl12.cc (modified) (1 diff)
• src/lib/sdl_image.cc (modified) (1 diff)
• src/library.cc (modified) (2 diffs)

trunk/nv/library.hh

@@ -29 +29 @@
                 /**
                  * Library constructor
-                 *
-                 * Opens the library
                  */
-                library( const std::string& name );
+                library();
 
                 /**
@@ -38 +36 @@
                  */
                 void open( const std::string& name );
+
+                /**
+                 * Returns true if the library is open, false otherwise
+                 */
+                bool is_open() const;
 
                 /**

trunk/src/lib/freetype2.cc

@@ -148 +148 @@
 {
 #       define NV_FREETYPE_LOAD( symbol ) *(void **) (&symbol) = freetype_library.get(#symbol);
-        static nv::library freetype_library( path );
+        static nv::library freetype_library;
+        if ( freetype_library.is_open() ) return true;
+        freetype_library.open( path );
 
         NV_FREETYPE_LOAD( FT_Init_FreeType );

trunk/src/lib/gl.cc

@@ -203 +203 @@
 #               define NV_GL_LOAD_EXT( symbol ) *(void **) (&symbol) = SDL_GL_GetProcAddress(#symbol);
 #else
-        static nv::library gl_library( path );
+        static nv::library gl_library;
+        if ( gl_library.is_open() ) return true;
+        gl_library.open( path );
+
         void * (NV_GL_APIENTRY *ext_loader) (const char* proc) = nullptr;
 #       if NV_PLATFORM == NV_WINDOWS 

trunk/src/lib/lua.cc

@@ -185 +185 @@
 #       define NV_LUA_LOAD( symbol ) *(void **) (&symbol) = lua_library.get(#symbol);
 
-        static nv::library lua_library( path );
+        static nv::library lua_library;
+        if ( lua_library.is_open() ) return true;
+        lua_library.open( path );
+
 
 /* State manipulation */

trunk/src/lib/sdl12.cc

@@ -191 +191 @@
 {
 #       define NV_SDL_LOAD( symbol ) *(void **) (&symbol) = sdl_library.get(#symbol);
-        static nv::library sdl_library( path );
+        static nv::library sdl_library;
+        if ( sdl_library.is_open() ) return true;
+        sdl_library.open( path );
 
 /* SDL.h functions */

trunk/src/lib/sdl_image.cc

@@ -37 +37 @@
 {
 #       define NV_SDL_IMAGE_LOAD( symbol ) *(void **) (&symbol) = sdl_image_library.get(#symbol);
-        static nv::library sdl_image_library( path );
+        static nv::library sdl_image_library;
+        if ( sdl_image_library.is_open() ) return true;
+        sdl_image_library.open( path );
 
         NV_SDL_IMAGE_LOAD( IMG_Linked_Version );

trunk/src/library.cc

@@ -36 +36 @@
 using namespace nv;
 
-library::library( const std::string& name ) 
-    : m_name( name )
+library::library() 
+    : m_name(), m_handle( nullptr )
 {
-    m_handle = NULL;
-    open();
 }
 
@@ -90 +88 @@
 }
 
-
+bool library::is_open() const
+{
+        return m_handle != nullptr;
+}
 
 void library::close()