carl's patch for split/region-drag crash

[ardour.git] / gtk2_ardour / route_time_axis.h

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 37404cdc4002366b2df87c46ab4546a863502bde..75862965aba81b199a09ba39cf40f7314f8c26a9 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -33,6 +33,7 @@
 #include <gtkmm2ext/slider_controller.h>
 #include <list>
 
+#include <ardour/playlist.h>
 #include <ardour/types.h>
 
 #include "ardour_dialog.h"
@@ -40,7 +41,7 @@
 #include "enums.h"
 #include "time_axis_view.h"
 #include "canvas.h"
-#include "level_meter.h"
+#include "gain_meter.h"
 
 
 namespace ARDOUR {
@@ -93,9 +94,13 @@ public:
        list<TimeAxisView*> get_child_list();
 
        /* The editor calls these when mapping an operation across multiple tracks */
-       void use_new_playlist (bool prompt);
-       void use_copy_playlist (bool prompt);
+       void use_new_playlist (bool prompt, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+       void use_copy_playlist (bool prompt, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
        void clear_playlist ();
+
+       /* group playlist name resolving */
+       std::string resolve_new_group_playlist_name(std::string &, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
+
        
        void build_playlist_menu (Gtk::Menu *);
        
@@ -110,7 +115,9 @@ public:
        void clear_meter ();
        void io_changed (ARDOUR::IOChange, void *);
        void meter_changed (void *);
-       void effective_gain_display ();
+       void effective_gain_display () { gm.effective_gain_display(); }
+
+       static void setup_slider_pix ();
 
 protected:
        friend class StreamView;
@@ -257,18 +264,9 @@ protected:
 
        void post_construct ();
        
-       LevelMeter      lm;
+       GainMeterBase gm;
 
-       Gtkmm2ext::HSliderController *gain_slider;
-       Gtk::Adjustment              gain_adjustment;
-       bool                         ignore_gain_adjustment;
        static Glib::RefPtr<Gdk::Pixbuf> slider;
-       static int setup_slider_pix ();
-       void gain_adjusted();
-
-       gint start_gain_touch (GdkEventButton*);
-       gint end_gain_touch (GdkEventButton*);
-       void gain_changed (void *);
 };
 
 #endif /* __ardour_route_time_axis_h__ */