make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

[ardour.git] / libs / ardour / ardour / auditioner.h

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index e6091cfba0dd7852c11b93a59c1a40a84c287ee4..aa525b68c9dee35b9d6de3ac9814c2d709cf1a29 100644 (file)
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 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
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_auditioner_h__
@@ -25,8 +24,8 @@
 
 #include <glibmm/thread.h>
 
-#include <ardour/ardour.h>
-#include <ardour/audio_track.h>
+#include "ardour/ardour.h"
+#include "ardour/audio_track.h"
 
 namespace ARDOUR {
 
@@ -47,7 +46,7 @@ class Auditioner : public AudioTrack
 
        int  play_audition (nframes_t nframes);
 
-       void cancel_audition () { 
+       void cancel_audition () {
                g_atomic_int_set (&_active, 0);
        }
 
@@ -64,7 +63,7 @@ class Auditioner : public AudioTrack
        static void *_drop_ports (void *);
        void actually_drop_ports ();
        void output_changed (IOChange, void*);
-};     
+};
 
 }; /* namespace ARDOUR */