fix mistaken "do not roll" conclusion in TransportFSM::compute_should_roll()

[ardour.git] / gtk2_ardour / time_selection.h

diff --git a/gtk2_ardour/time_selection.h b/gtk2_ardour/time_selection.h
index 1783e160468076f4054793b847be17ded3099e97..f3ca6e076e22fb534221a0c32c55968cf696ceef 100644 (file)
--- a/gtk2_ardour/time_selection.h
+++ b/gtk2_ardour/time_selection.h
@@ -1,56 +1,43 @@
 /*
-    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.
-
-*/
+ * Copyright (C) 2006-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2009-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2009 Carl Hetherington <carl@carlh.net>
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_gtk_time_selection_h__
 #define __ardour_gtk_time_selection_h__
 
 #include <list>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 namespace ARDOUR {
        class RouteGroup;
 }
 
-class TimeAxisView;
-
-struct TimeSelection : public std::list<ARDOUR::AudioRange> {
-    
-    /* if (track == 0 && group == 0) then it applies to all
-       tracks.
-
-       if (track != 0 && group == 0) then it applies just to 
-       that track.
-
-       if (group != 0) then it applies to all tracks in 
-       the group.
-    */
-    
-    TimeAxisView*               track;
-    ARDOUR::RouteGroup*         group;
-
-    ARDOUR::AudioRange& operator[](uint32_t);
+class TimeSelection : public std::list<ARDOUR::AudioRange>
+{
+public:
+       ARDOUR::AudioRange& operator[](uint32_t);
 
-    nframes_t start();
-    nframes_t end_frame();
-    nframes_t length();
+       ARDOUR::samplepos_t start();
+       ARDOUR::samplepos_t end_sample();
+       ARDOUR::samplepos_t length();
 
-    bool consolidate ();
+       bool consolidate ();
 };