ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into windows

This commit is contained in:
Paul Davis 2013-08-01 10:44:58 -04:00
parent 6a436fd826 6a18103800
commit bb8cb93789
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/meter_strip.cc
View File

@ -280,8 +280,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
MeterStrip::~MeterStrip ()
{
delete level_meter;
CatchDeletion (this);
if (level_meter) {
delete level_meter;
CatchDeletion (this);
}
}
void

2
gtk2_ardour/meterbridge.cc
View File

@ -632,6 +632,8 @@ Meterbridge::remove_strip (MeterStrip* strip)
break;
}
}
resync_order();
}
void

2
libs/ardour/playlist.cc
View File

@ -250,7 +250,7 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> 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);
}

4
wscript
View File

@ -363,8 +363,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')