projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged with trunk R992.
[ardour.git]
/
gtk2_ardour
/
editor_audiotrack.cc
diff --git
a/gtk2_ardour/editor_audiotrack.cc
b/gtk2_ardour/editor_audiotrack.cc
index b9ae734bde59f589f30a1f5c07266b2e8477ed29..f524dcdd40d1ce4167ddcb4db4f9a60a4f4cac2c 100644
(file)
--- a/
gtk2_ardour/editor_audiotrack.cc
+++ b/
gtk2_ardour/editor_audiotrack.cc
@@
-1,13
+1,14
@@
#include <ardour/location.h>
#include <ardour/location.h>
-#include <ardour/diskstream.h>
+#include <ardour/
audio_
diskstream.h>
#include "editor.h"
#include "editing.h"
#include "audio_time_axis.h"
#include "editor.h"
#include "editing.h"
#include "audio_time_axis.h"
-#include "
region
view.h"
+#include "
audio_region_
view.h"
#include "selection.h"
using namespace ARDOUR;
#include "selection.h"
using namespace ARDOUR;
+using namespace PBD;
void
Editor::set_route_loop_selection ()
void
Editor::set_route_loop_selection ()
@@
-16,8
+17,8
@@
Editor::set_route_loop_selection ()
return;
}
return;
}
-
jack_
nframes_t start = selection->time[clicked_selection].start;
-
jack_
nframes_t end = selection->time[clicked_selection].end;
+ nframes_t start = selection->time[clicked_selection].start;
+ nframes_t end = selection->time[clicked_selection].end;
Location* loc = transport_loop_location();
Location* loc = transport_loop_location();
@@
-26,7
+27,7
@@
Editor::set_route_loop_selection ()
loc->set (start, end);
// enable looping, reposition and start rolling
loc->set (start, end);
// enable looping, reposition and start rolling
- session->request_
auto
_loop (true);
+ session->request_
play
_loop (true);
session->request_locate (loc->start(), true);
}
session->request_locate (loc->start(), true);
}