Use boost::shared_ptr instead of raw pointers for RouteUI track (etc) accessors ...

[ardour.git] / gtk2_ardour / editor_audiotrack.cc

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index b9ae734bde59f589f30a1f5c07266b2e8477ed29..cdcbb43f76e81f593937e4e3741f0ae047e14edf 100644 (file)
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -1,13 +1,33 @@
+/*
+    Copyright (C) 2000-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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #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 "regionview.h"
+#include "audio_region_view.h"
 #include "selection.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 
 void
 Editor::set_route_loop_selection ()
@@ -16,8 +36,8 @@ Editor::set_route_loop_selection ()
                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();
 
@@ -26,7 +46,7 @@ Editor::set_route_loop_selection ()
                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);
        }
 
@@ -44,7 +64,6 @@ Editor::set_show_waveforms (bool yn)
                                atv->set_show_waveforms (yn);
                        }
                }
-               DisplayControlChanged (Editing::ShowWaveforms);
        }
 }
 
@@ -60,6 +79,5 @@ Editor::set_show_waveforms_recording (bool yn)
                                atv->set_show_waveforms_recording (yn);
                        }
                }
-               DisplayControlChanged (Editing::ShowWaveformsRecording);
        }
 }