File guitarix_static_instance.diff of Package guitarix

Overview Repositories Revisions Requests Users Attributes Meta

File guitarix_static_instance.diff of Package guitarix (Revision 69f3ea91216201b13e0b542adba48e39)

Currently displaying revision 69f3ea91216201b13e0b542adba48e39 , Show latest

Index: guitarix-0.05.2-1/src/gx_engine.cpp
===================================================================
--- guitarix-0.05.2-1.orig/src/gx_engine.cpp
+++ guitarix-0.05.2-1/src/gx_engine.cpp
@@ -49,13 +49,6 @@ namespace gx_engine
   // static member
   GxMidiState dsp::midistate = kMidiOff;
 
-  // instanciation
-  inline GxEngine* GxEngine::instance()
-  {
-    static GxEngine engine;
-    return &engine;
-  }
-
   void GxEngine::metadata(Meta* m)
   {
     m->declare("name", "guitarix");
Index: guitarix-0.05.2-1/src/gx_jconv_settings.cpp
===================================================================
--- guitarix-0.05.2-1.orig/src/gx_jconv_settings.cpp
+++ guitarix-0.05.2-1/src/gx_jconv_settings.cpp
@@ -125,15 +125,6 @@ namespace gx_jconv
       fValidSettings = false;
     }
 
-    // --------------- instanciation of jconv handler
-    inline GxJConvSettings* GxJConvSettings::instance()
-    {
-      static GxJConvSettings jcset;
-
-      // return static instance
-      return &jcset;
-    }
-
     // --------------- configure JConv handler from file
     void GxJConvSettings::configureJConvSettings(string& presname)
     {
Index: guitarix-0.05.2-1/src/headers/gx_engine.h
===================================================================
--- guitarix-0.05.2-1.orig/src/headers/gx_engine.h
+++ guitarix-0.05.2-1/src/headers/gx_engine.h
@@ -577,7 +577,11 @@ namespace gx_engine
   public:
     float fskin;
     // unique instance : use this instead of constructor
-    static GxEngine* instance();
+    static GxEngine* instance()
+    {
+        static GxEngine engine;
+        return &engine;
+    }
 
     static void metadata(Meta* m);
 
Index: guitarix-0.05.2-1/src/headers/gx_jconv_settings.h
===================================================================
--- guitarix-0.05.2-1.orig/src/headers/gx_jconv_settings.h
+++ guitarix-0.05.2-1/src/headers/gx_jconv_settings.h
@@ -134,7 +134,12 @@ namespace gx_jconv
     void resetSetting();
 
     // instance getter / creation
-    static GxJConvSettings* instance();
+    static GxJConvSettings* instance()
+    {
+      static GxJConvSettings jcset;
+      // return static instance
+      return &jcset;
+    }
 
     // checkbutton state
     static float checkbutton7;

Places

File guitarix_static_instance.diff of Package guitarix (Revision 69f3ea91216201b13e0b542adba48e39)

Places