Stop crossfades disappearing on region view drags.

[ardour.git] / gtk2_ardour / automation_streamview.h

diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h
index c5eac370217aa30ff291aba3488fdb23b02b470c..0ab0086315023510ffd3655ea433a520d678b530 100644 (file)
--- a/gtk2_ardour/automation_streamview.h
+++ b/gtk2_ardour/automation_streamview.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001, 2007 Paul Davis 
+    Copyright (C) 2001, 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
@@ -22,7 +22,7 @@
 #include <list>
 #include <cmath>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "enums.h"
 #include "simplerect.h"
 #include "streamview.h"
@@ -45,27 +45,26 @@ class AutomationStreamView : public StreamView
        AutomationStreamView (AutomationTimeAxisView& tv);
        ~AutomationStreamView ();
 
-       void set_selected_regionviews (RegionSelection&);
-       void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
-       void get_inverted_selectables (Selection&, list<Selectable* >& results);
+       void set_automation_state (ARDOUR::AutoState state);
 
        void redisplay_diskstream ();
-       
-       inline double contents_height() const
-               { return (_trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
-       
+
+       inline double contents_height() const {
+               return (_trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2);
+       }
+
   private:
        void setup_rec_box ();
-       void rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur); 
+       void rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur);
        void update_rec_regions (jack_nframes_t start, jack_nframes_t dur);
-       
-       RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_data);
+
+       RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_data, bool recording = false);
        void        display_region(AutomationRegionView* region_view);
-       
+
        void color_handler ();
-       
+
        boost::shared_ptr<AutomationController> _controller;
-       
+
        AutomationTimeAxisView& _automation_view;
 };