ardour/livetrax
13
0
Fork 0
Code

maybe fix race condition for peaks; fix % appearing in region names; allow crossfades to work by fixing erroneous variable increment

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1077 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-11-06 17:45:00 +00:00
parent 0673a5d93e
commit 4f5af6d062
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/audio_region_view.cc
View File

@ -864,10 +864,6 @@ void
AudioRegionView::peaks_ready_handler (uint32_t which)
{
Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &AudioRegionView::create_one_wave), which, false));
if (!waves.empty()) {
/* all waves created, don't hook into peaks ready anymore */
data_ready_connection.disconnect ();
}
}
void

8
libs/ardour/audio_diskstream.cc
View File

@ -1535,6 +1535,9 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
} else {
string whole_file_region_name;
whole_file_region_name = region_name_from_path (channels[0].write_source->name());
/* Register a new region with the Session that
describes the entire source. Do this first
so that any sub-regions will obviously be
@ -1543,7 +1546,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
try {
boost::shared_ptr<Region> rx (RegionFactory::create (srcs, channels[0].write_source->last_capture_start_frame(), total_capture,
region_name_from_path (channels[0].write_source->name()),
whole_file_region_name,
0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile)));
region = boost::dynamic_pointer_cast<AudioRegion> (rx);
@ -1566,7 +1569,8 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
for (buffer_position = channels[0].write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
string region_name;
_session.region_name (region_name, channels[0].write_source->name(), false);
_session.region_name (region_name, whole_file_region_name, false);
// cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add region " << region_name << endl;

2
libs/ardour/audio_playlist.cc
View File

@ -531,7 +531,7 @@ AudioPlaylist::set_state (const XMLNode& node)
}
thaw ();
in_set_state++;
in_set_state--;
return 0;
}