use ustring more; handle embedding of "paired" files as per mantis #1362

[ardour.git] / gtk2_ardour / region_view.h

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index fdc69ea70e27bfe94c36ed53e6b5699635d21334..9f1f9679355ccaaf7315985a14047f4b7d39e220 100644 (file)
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -43,7 +43,7 @@ class RegionView : public TimeAxisViewItem
   public:
        RegionView (ArdourCanvas::Group* parent, 
                    TimeAxisView&        time_view,
-                   ARDOUR::Region&      region,
+                   boost::shared_ptr<ARDOUR::Region> region,
                    double               samples_per_unit,
                    Gdk::Color&          basic_color);
 
@@ -51,14 +51,14 @@ class RegionView : public TimeAxisViewItem
        
        virtual void init (Gdk::Color& base_color, bool wait_for_data);
     
-       ARDOUR::Region& region() const { return _region; }
+       boost::shared_ptr<ARDOUR::Region> region() const { return _region; }
        
        bool is_valid() const    { return valid; }
     void set_valid (bool yn) { valid = yn; }
 
     virtual void set_height (double) = 0;
     virtual void set_samples_per_unit (double);
-    virtual bool set_duration (jack_nframes_t, void*);
+    virtual bool set_duration (nframes_t, void*);
 
     void move (double xdelta, double ydelta);
 
@@ -67,7 +67,7 @@ class RegionView : public TimeAxisViewItem
     void lower ();
     void lower_to_bottom ();
 
-    bool set_position(jack_nframes_t pos, void* src, double* delta = 0);
+    bool set_position(nframes_t pos, void* src, double* delta = 0);
 
     virtual void show_region_editor () = 0;
     virtual void hide_region_editor();
@@ -91,11 +91,11 @@ class RegionView : public TimeAxisViewItem
      * to the TimeAxisViewItem parent class
         */
     RegionView (ArdourCanvas::Group *, 
-                   TimeAxisView&,
-                   ARDOUR::Region&,
-                   double      samples_per_unit,
-                   Gdk::Color& basic_color,
-                   TimeAxisViewItem::Visibility);
+               TimeAxisView&,
+               boost::shared_ptr<ARDOUR::Region>,
+               double      samples_per_unit,
+               Gdk::Color& basic_color,
+               TimeAxisViewItem::Visibility);
 
     virtual void region_resized (ARDOUR::Change);
     void         region_moved (void *);
@@ -116,7 +116,7 @@ class RegionView : public TimeAxisViewItem
     
     virtual void color_handler (ColorID, uint32_t) {}
        
-       ARDOUR::Region& _region;
+    boost::shared_ptr<ARDOUR::Region> _region;
     
     ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position 
     ArdourCanvas::Text*    no_wave_msg;
@@ -130,11 +130,11 @@ class RegionView : public TimeAxisViewItem
     double  _pixel_width;
     double  _height;
     bool    in_destructor;
-
+    
     bool             wait_for_data;
-       sigc::connection data_ready_connection;
+    sigc::connection data_ready_connection;
     
-       vector<GhostRegion*> ghosts;
+    vector<GhostRegion*> ghosts;
 };
 
 #endif /* __gtk_ardour_region_view_h__ */