diff options
| author | Thomas Brand <tom@trellis.ch> | 2017-07-01 18:42:24 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-07-01 19:28:26 +0200 |
| commit | 63ea7b6516dbd7554d1eff6c98de50cf61fc9a72 (patch) | |
| tree | 82fa339e009bc082dd8023916990800bea437081 /gtk2_ardour/editor_audio_import.cc | |
| parent | f413b83cb9fa50954969a3d849999e1890ce6690 (diff) | |
NO-OP whitespace (updated GH PR #357)
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index b7dabed698..1e8d157f14 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -629,7 +629,7 @@ Editor::embed_sndfiles (vector<string> paths, SoundFileInfo finfo; CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); - gdk_flush (); + gdk_flush (); for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) { @@ -913,33 +913,33 @@ Editor::add_sources (vector<string> paths, boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r); if (use_timestamp) { - if (ar) { - - /* get timestamp for this region */ - - const boost::shared_ptr<Source> s (ar->sources().front()); - const boost::shared_ptr<AudioSource> as = boost::dynamic_pointer_cast<AudioSource> (s); - - assert (as); - - if (as->natural_position() != 0) { - pos = as->natural_position(); - } else if (target_tracks == 1) { - /* hmm, no timestamp available, put it after the previous region - */ - if (n == 0) { - pos = get_preferred_edit_position (); - } else { - pos += rlen; - } - } else { - pos = get_preferred_edit_position (); - } - } else { - /* should really get first position in MIDI file, but for now, use edit position*/ - pos = get_preferred_edit_position (); - } - } + if (ar) { + + /* get timestamp for this region */ + + const boost::shared_ptr<Source> s (ar->sources().front()); + const boost::shared_ptr<AudioSource> as = boost::dynamic_pointer_cast<AudioSource> (s); + + assert (as); + + if (as->natural_position() != 0) { + pos = as->natural_position(); + } else if (target_tracks == 1) { + /* hmm, no timestamp available, put it after the previous region + */ + if (n == 0) { + pos = get_preferred_edit_position (); + } else { + pos += rlen; + } + } else { + pos = get_preferred_edit_position (); + } + } else { + /* should really get first position in MIDI file, but for now, use edit position*/ + pos = get_preferred_edit_position (); + } + } finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track, track_names[n], instrument); @@ -1029,7 +1029,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, } else if (mr) { list<boost::shared_ptr<MidiTrack> > mt ( _session->new_midi_track (ChanCount (DataType::MIDI, 1), - ChanCount (DataType::MIDI, 1), + ChanCount (DataType::MIDI, 1), Config->get_strict_io () || Profile->get_mixbus (), instrument, (Plugin::PresetRecord*) 0, (RouteGroup*) 0, |