From ad8ffab5440985c6ef26ff707d869bfe90daacaf Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 1 Aug 2013 03:17:49 +0200 Subject: [PATCH 1/3] re-check meterbridge metric-area on route deletion fixes http://tracker.ardour.org/view.php?id=5616#c15204 --- gtk2_ardour/meter_strip.cc | 6 ++++-- gtk2_ardour/meterbridge.cc | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index ede9cc2074..703870ecef 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -280,8 +280,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) MeterStrip::~MeterStrip () { - delete level_meter; - CatchDeletion (this); + if (level_meter) { + delete level_meter; + CatchDeletion (this); + } } void diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index a0110365c1..4a4f1dd8dd 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -632,6 +632,8 @@ Meterbridge::remove_strip (MeterStrip* strip) break; } } + + resync_order(); } void From 0bd09a0e2375bc05cdddca14de8d810544d380fb Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 1 Aug 2013 10:10:21 -0400 Subject: [PATCH 2/3] add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs() --- wscript | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wscript b/wscript index 66d7c655e5..956925cb42 100644 --- a/wscript +++ b/wscript @@ -373,8 +373,12 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED') conf.env.append_value('CXXFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED') + # need ISOC9X for llabs() + conf.env.append_value('CFLAGS', '-D_ISOC9X_SOURCE') conf.env.append_value('CFLAGS', '-D_LARGEFILE64_SOURCE') conf.env.append_value('CFLAGS', '-D_FILE_OFFSET_BITS=64') + # need ISOC9X for llabs() + conf.env.append_value('CXXFLAGS', '-D_ISOC9X_SOURCE') conf.env.append_value('CXXFLAGS', '-D_LARGEFILE64_SOURCE') conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64') From 6a181038009ce0e6152af55645424a8582c34c78 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 1 Aug 2013 10:44:34 -0400 Subject: [PATCH 3/3] remove odd namespacing typo --- libs/ardour/playlist.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index c5d52f7345..60a04303a3 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -250,7 +250,7 @@ Playlist::Playlist (boost::shared_ptr other, framepos_t start, f plist.add (Properties::layer, region->layer()); plist.add (Properties::layering_index, region->layering_index()); - new_region = RegionFactory::RegionFactory::create (region, plist); + new_region = RegionFactory::create (region, plist); add_region_internal (new_region, position); }