diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/automation_list.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/location.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/plugin.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 1 |
6 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 98e65b43e3..abc4163d5e 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -884,7 +884,6 @@ ARDOUR_UI::editor_realized () Config->map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed)); set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2); - const guint32 FUDGE = 25; // Combo's are stupid - they steal space from the entry for the button cerr << "I commented out line line 889 in ardour_ui2.cc, because it made ardour crash somewhere in Gnome::Canvas::Text" << endl; //reset_dpi(); } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index de5bd7a979..52af1c09a6 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1180,7 +1180,6 @@ MixerStrip::name_button_button_press (GdkEventButton* ev) if (ev->button == 1 || ev->button == 3) { list_route_operations (); - Menu_Helpers::MenuList& items = route_ops_menu->items(); /* do not allow rename if the track is record-enabled */ rename_menu_item->set_sensitive (!_route->record_enabled()); route_ops_menu->popup (1, ev->time); diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index ed804d1b2c..08cf69308f 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -64,7 +64,8 @@ AutomationList::AutomationList (Evoral::Parameter id) } AutomationList::AutomationList (const AutomationList& other) - : ControlList(other) + : StatefulDestructible() + , ControlList(other) { _style = other._style; _state = other._state; diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index ca0a56972e..dd32da2628 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -43,7 +43,8 @@ using namespace sigc; using namespace PBD; Location::Location (const Location& other) - : _name (other._name), + : StatefulDestructible(), + _name (other._name), _start (other._start), _end (other._end), _flags (other._flags) diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index b9db471ced..44b2d96532 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -65,7 +65,9 @@ Plugin::Plugin (AudioEngine& e, Session& s) } Plugin::Plugin (const Plugin& other) - : _engine (other._engine) + : StatefulDestructible() + , Latent() + , _engine (other._engine) , _session (other._session) , _info (other._info) , _cycles (0) diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 497ac04896..c0c854180f 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -313,7 +313,6 @@ PluginManager::ladspa_discover (string path) const LADSPA_Descriptor *descriptor; LADSPA_Descriptor_Function dfunc; const char *errstr; - bool first = true; if ((module = dlopen (path.c_str(), RTLD_NOW)) == 0) { error << string_compose(_("LADSPA: cannot load module \"%1\" (%2)"), path, dlerror()) << endmsg; |