fix incorrect accumulation of export video options each time the dialog is used

[ardour.git] / gtk2_ardour / au_pluginui.mm

diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm
index f2153aec6a9c98158e57ece5aafe5627ede21832..00bbcbda1bc5f61ec7ce6a0b99792648617941bd 100644 (file)
--- a/gtk2_ardour/au_pluginui.mm
+++ b/gtk2_ardour/au_pluginui.mm
@@ -3,6 +3,7 @@
 
 #include <sys/time.h>
 #include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
 #include <gdk/gdkquartz.h>
 
 #include "pbd/convert.h"
@@ -37,14 +38,17 @@
 #import <AudioUnit/AUCocoaUIView.h>
 #import <CoreAudioKit/AUGenericView.h>
 #import <objc/runtime.h>
+
+#ifndef __ppc__
 #include <dispatch/dispatch.h>
+#endif
 
 #undef Marker
 
 #include "keyboard.h"
 #include "utils.h"
 #include "public_editor.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "gtk2ardour-config.h"
 
@@ -210,7 +214,7 @@ static uint32_t block_plugin_redraws = 0;
 static const uint32_t minimum_redraw_rate = 30; /* frames per second */
 static const uint32_t block_plugin_redraw_count = 15; /* number of combined plugin redraws to block, if blocking */
 
-#ifdef __ppc
+#ifdef __ppc__
 
 /* PowerPC versions of OS X do not support libdispatch, which we use below when swizzling objective C. But they also don't have Retina
  * which is the underlying reason for this code. So just skip it on those CPUs.
@@ -277,7 +281,7 @@ static void interposed_drawIfNeeded (id receiver, SEL selector, NSRect rect)
 
 @end
 
-#endif /* __ppc */
+#endif /* __ppc__ */
 
 /* END OF THE PLUGIN REDRAW HACK */
 
@@ -400,6 +404,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
        HBox* smaller_hbox = manage (new HBox);
 
        smaller_hbox->set_spacing (6);
+       smaller_hbox->pack_start (pin_management_button, false, false, 4);
        smaller_hbox->pack_start (preset_label, false, false, 4);
        smaller_hbox->pack_start (_preset_modified, false, false);
        smaller_hbox->pack_start (_preset_combo, false, false);
@@ -415,7 +420,9 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
        smaller_hbox->pack_start (automation_mode_label, false, false);
        smaller_hbox->pack_start (automation_mode_selector, false, false);
 #endif
-       smaller_hbox->pack_start (reset_button, false, false);
+       if (insert->controls().size() > 0) {
+               smaller_hbox->pack_start (reset_button, false, false);
+       }
        smaller_hbox->pack_start (bypass_button, false, true);
 
        VBox* v1_box = manage (new VBox);