diff options
author | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
commit | bb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch) | |
tree | e52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/ardour/filter.cc | |
parent | 8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff) |
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent...
git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/filter.cc')
-rw-r--r-- | libs/ardour/filter.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc index 88a6e1d253..53a28c8691 100644 --- a/libs/ardour/filter.cc +++ b/libs/ardour/filter.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2004-2007 Paul Davis + Copyright (C) 2004-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ Filter::make_new_sources (boost::shared_ptr<Region> region, SourceList& nsrcs, s PBD::basename_nosuffix (names[i]), string ("")); if (path.length() == 0) { - error << string_compose (_("filter: error creating name for new file based on %1"), region->name()) + error << string_compose (_("filter: error creating name for new file based on %1"), region->name()) << endmsg; return -1; } @@ -72,7 +72,7 @@ Filter::make_new_sources (boost::shared_ptr<Region> region, SourceList& nsrcs, s SourceFactory::createWritable (region->data_type(), session, path, true, false, session.frame_rate()))); - } + } catch (failed_constructor& err) { error << string_compose (_("filter: error creating new file %1 (%2)"), path, strerror (errno)) << endmsg; @@ -102,15 +102,15 @@ Filter::finish (boost::shared_ptr<Region> region, SourceList& nsrcs, string regi afs->update_header (region->position(), *now, xnow); afs->mark_immutable (); } - + boost::shared_ptr<SMFSource> smfs = boost::dynamic_pointer_cast<SMFSource>(*si); if (smfs) { smfs->set_timeline_position (region->position()); smfs->flush (); } - + /* now that there is data there, requeue the file for analysis */ - + Analyser::queue_source_for_analysis (*si, false); } @@ -121,7 +121,7 @@ Filter::finish (boost::shared_ptr<Region> region, SourceList& nsrcs, string regi } results.clear (); - boost::shared_ptr<Region> r = RegionFactory::create (nsrcs, 0, region->length(), region_name, 0, + boost::shared_ptr<Region> r = RegionFactory::create (nsrcs, 0, region->length(), region_name, 0, Region::Flag (Region::WholeFile|Region::DefaultFlags)); r->set_position (region->position(), 0); @@ -131,7 +131,7 @@ Filter::finish (boost::shared_ptr<Region> region, SourceList& nsrcs, string regi audio_r->set_scale_amplitude (audio_region->scale_amplitude()); } results.push_back (r); - + return 0; } |