open un-writable sessions without complaining, and desensitize all/most actions that...

[ardour.git] / gtk2_ardour / region_view.cc

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 49b7894d11fd815c45fc1ecb3d2f9da442be6d36..47d0c38ef91a553d56b87b2be0e4a73afb3ab9b2 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -75,7 +75,6 @@ RegionView::RegionView (ArdourCanvas::Group* parent,
          , current_visible_sync_position(0.0)
          , valid(false)
          , _pixel_width(1.0)
-         , _height(1.0)
          , in_destructor(false)
          , wait_for_data(false)
 {
@@ -90,7 +89,6 @@ RegionView::RegionView (const RegionView& other)
        current_visible_sync_position = other.current_visible_sync_position;
        valid = false;
        _pixel_width = other._pixel_width;
-       _height = other._height;
 }
 
 RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region)
@@ -106,7 +104,6 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other
        current_visible_sync_position = other.current_visible_sync_position;
        valid = false;
        _pixel_width = other._pixel_width;
-       _height = other._height;
 }
 
 RegionView::RegionView (ArdourCanvas::Group*         parent, 
@@ -124,7 +121,6 @@ RegionView::RegionView (ArdourCanvas::Group*         parent,
        , current_visible_sync_position(0.0)
        , valid(false)
        , _pixel_width(1.0)
-       , _height(1.0)
        , in_destructor(false)
        , wait_for_data(false)
 {
@@ -136,7 +132,6 @@ RegionView::init (Gdk::Color& basic_color, bool wfd)
        editor        = 0;
        valid         = true;
        in_destructor = false;
-       _height       = 0;
        wait_for_data = wfd;
        sync_mark     = 0;
        sync_line     = 0;
@@ -148,8 +143,8 @@ RegionView::init (Gdk::Color& basic_color, bool wfd)
                name_highlight->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
        }
 
-       if (name_text) {
-               name_text->set_data ("regionview", this);
+       if (name_pixbuf) {
+               name_pixbuf->set_data ("regionview", this);
        }
 
        reset_width_dependent_items ((double) _region->length() / samples_per_unit);