send control now has working metering, and switches back and forth between busses...

[ardour.git] / gtk2_ardour / editor_audio_import.cc

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index ab5cea3f7b1908a21f7231e55bc55d6e7e3d36ce..4301e1ac34202fc7c1c2a467274a97e82efe1577 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -26,28 +26,28 @@
 
 #include <sndfile.h>
 
-#include <pbd/pthread_utils.h>
-#include <pbd/basename.h>
-#include <pbd/shortpath.h>
+#include "pbd/pthread_utils.h"
+#include "pbd/basename.h"
+#include "pbd/shortpath.h"
 
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/midi_track.h>
-#include <ardour/midi_region.h>
-#include <ardour/utils.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/region_factory.h>
-#include <ardour/source_factory.h>
-#include <ardour/session.h>
-#include <pbd/memento_command.h>
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/midi_track.h"
+#include "ardour/midi_region.h"
+#include "ardour/utils.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/region_factory.h"
+#include "ardour/source_factory.h"
+#include "ardour/session.h"
+#include "pbd/memento_command.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -732,8 +732,8 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64
 
                region_name = region_name_from_path (paths.front(), (sources.size() > 1), false);
                
-               regions.push_back (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
-                                                          Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
+               regions.push_back (RegionFactory::create (sources, 0, sources[0]->length(pos), region_name, 0,
+                               Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
                
        } else if (target_regions == -1 || target_regions > 1) {
 
@@ -750,8 +750,8 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64
                        
                        region_name = region_name_from_path ((*x)->path(), false, false, sources.size(), n);
 
-                       regions.push_back (RegionFactory::create (just_one, 0, (*x)->length(), region_name, 0,
-                                                                  Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
+                       regions.push_back (RegionFactory::create (just_one, 0, (*x)->length(pos), region_name, 0,
+                                       Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
 
                }
        }