From 77b8c122e3a386bcd9303ecb42d299cb099c2493 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Mon, 29 Apr 2013 12:12:40 +0100
Subject: [PATCH] Change toolbar actions

---
 resources/ui/carla.ui               | 19 +++++++++++++++----
 source/backend/plugin/Lv2Plugin.cpp |  4 ++--
 source/carla.py                     |  1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/resources/ui/carla.ui b/resources/ui/carla.ui
index 27b96dbf0..bcfeec5d8 100644
--- a/resources/ui/carla.ui
+++ b/resources/ui/carla.ui
@@ -401,12 +401,11 @@
    <addaction name="act_file_save"/>
    <addaction name="act_file_save_as"/>
    <addaction name="separator"/>
-   <addaction name="act_engine_start"/>
-   <addaction name="act_engine_stop"/>
-   <addaction name="separator"/>
-   <addaction name="act_plugin_add"/>
+   <addaction name="act_plugin_add2"/>
    <addaction name="act_plugin_remove_all"/>
    <addaction name="act_plugins_panic"/>
+   <addaction name="separator"/>
+   <addaction name="act_settings_configure"/>
   </widget>
   <action name="act_file_save">
    <property name="icon">
@@ -724,6 +723,18 @@
     <string>Panic</string>
    </property>
   </action>
+  <action name="act_plugin_add2">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
+   </property>
+   <property name="text">
+    <string>Add New Plugin...</string>
+   </property>
+   <property name="toolTip">
+    <string>Add New Plugin</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/source/backend/plugin/Lv2Plugin.cpp b/source/backend/plugin/Lv2Plugin.cpp
index f075a23ff..43675fcfd 100644
--- a/source/backend/plugin/Lv2Plugin.cpp
+++ b/source/backend/plugin/Lv2Plugin.cpp
@@ -3080,14 +3080,14 @@ public:
                 }
             }
 
-#if 0
+# if 0
             // Latency, save values for next callback, TODO
             if (kData->latency > 0 && kData->latency < frames)
             {
                 for (i=0; i < kData->audioIn.count; ++i)
                     carla_copyFloat(kData->latencyBuffers[i], inBuffer[i] + (frames - kData->latency), kData->latency);
             }
-#endif
+# endif
         } // End of Post-processing
 #else
         for (i=0; i < kData->audioOut.count; ++i)
diff --git a/source/carla.py b/source/carla.py
index 6dd0edafe..12f2a270e 100755
--- a/source/carla.py
+++ b/source/carla.py
@@ -769,6 +769,7 @@ class CarlaMainW(QMainWindow):
         self.connect(self.ui.act_engine_stop, SIGNAL("triggered()"), SLOT("slot_engineStop()"))
 
         self.connect(self.ui.act_plugin_add, SIGNAL("triggered()"), SLOT("slot_pluginAdd()"))
+        self.connect(self.ui.act_plugin_add2, SIGNAL("triggered()"), SLOT("slot_pluginAdd()"))
         #self.connect(self.ui.act_plugin_refresh, SIGNAL("triggered()"), SLOT("slot_pluginRefresh()"))
         self.connect(self.ui.act_plugin_remove_all, SIGNAL("triggered()"), SLOT("slot_pluginRemoveAll()"))