From 45bab425d1fd035c15c025cad4269c843bf34976 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 6 Mar 2013 11:57:38 +0000
Subject: [PATCH] More misc changes

---
 source/backend/CarlaPlugin.hpp  | 18 +++++++++---------
 source/utils/CarlaJuceUtils.hpp |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/backend/CarlaPlugin.hpp b/source/backend/CarlaPlugin.hpp
index 92dec5d2b..f6535e088 100644
--- a/source/backend/CarlaPlugin.hpp
+++ b/source/backend/CarlaPlugin.hpp
@@ -100,7 +100,7 @@ struct CarlaPluginProtectedData;
  */
 class CarlaPlugin
 {
-public:
+protected:
     /*!
      * This is the constructor of the base plugin class.
      *
@@ -109,6 +109,7 @@ public:
      */
     CarlaPlugin(CarlaEngine* const engine, const unsigned int id);
 
+public:
     /*!
      * This is the destructor of the base plugin class.
      */
@@ -312,9 +313,8 @@ public:
     /*!
      * Get the complete plugin chunk data into \a dataPtr.
      *
-     * \return The size of the chunk or 0 if invalid.
-     *
      * \note Make sure to verify the plugin supports chunks before calling this function!
+     * \return The size of the chunk or 0 if invalid.
      *
      * \see setChunkData()
      */
@@ -412,6 +412,11 @@ public:
     // -------------------------------------------------------------------
     // Set data (state)
 
+    /*!
+     * Tell the plugin to prepare for save.
+     */
+    virtual void prepareForSave();
+
     /*!
      * Get the plugin's save state.\n
      * The plugin will automatically call prepareForSave() as needed.
@@ -660,11 +665,6 @@ public:
      */
     virtual void reloadPrograms(const bool init);
 
-    /*!
-     * Tell the plugin to prepare for save.
-     */
-    virtual void prepareForSave();
-
     // -------------------------------------------------------------------
     // Plugin processing
 
@@ -863,7 +863,7 @@ protected:
 
     // Lock the plugin's own run/process call
     // Plugin will still work as normal, but output only silence
-    // On destructor needsReset flag is set, as the plugin might have missed some events
+    // On destructor needsReset flag might be set if the plugin might have missed some events
     class ScopedProcessLocker
     {
     public:
diff --git a/source/utils/CarlaJuceUtils.hpp b/source/utils/CarlaJuceUtils.hpp
index b3486a055..7b2cd098e 100644
--- a/source/utils/CarlaJuceUtils.hpp
+++ b/source/utils/CarlaJuceUtils.hpp
@@ -24,14 +24,14 @@
 #include <algorithm>
 
 #define CARLA_DECLARE_NON_COPYABLE(className) \
-    className (const className&);\
+private:                                      \
+    className (const className&);             \
     className& operator= (const className&);
 
 /** This is a shorthand way of writing both a CARLA_DECLARE_NON_COPYABLE and
     CARLA_LEAK_DETECTOR macro for a class.
 */
 #define CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(className) \
-private:                                                         \
     CARLA_DECLARE_NON_COPYABLE(className)                        \
     CARLA_LEAK_DETECTOR(className)