Comment out excessive terminal output.
[ardour.git] / gtk2_ardour / crossfade_view.cc
index f5fc40a39d4e8e0423d9b60e97215f779396706e..22119721ffaf4fe7e3b7819c1809c24ba18167a2 100644 (file)
@@ -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$
 */
 
 #include <algorithm>
 #include "rgb_macros.h"
 #include "audio_time_axis.h"
 #include "public_editor.h"
-#include "regionview.h"
+#include "audio_region_view.h"
 #include "utils.h"
+#include "canvas_impl.h"
+#include "ardour_ui.h"
 
 using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Editing;
+using namespace Gnome;
+using namespace Canvas;
 
 sigc::signal<void,CrossfadeView*> CrossfadeView::GoingAway;
 
-CrossfadeView::CrossfadeView (GnomeCanvasGroup *parent, 
-                             AudioTimeAxisView &tv, 
-                             Crossfade& xf, 
+CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, 
+                             RouteTimeAxisView &tv, 
+                             boost::shared_ptr<Crossfade> xf, 
                              double spu,
                              Gdk::Color& basic_color,
                              AudioRegionView& lview,
                              AudioRegionView& rview)
                              
 
-       : TimeAxisViewItem ("xf.name()", parent, tv, spu, basic_color, xf.position(), 
-                           xf.overlap_length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
+       : TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(), 
+                           xf->length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
          crossfade (xf),
          left_view (lview),
          right_view (rview)
@@ -57,37 +61,31 @@ CrossfadeView::CrossfadeView (GnomeCanvasGroup *parent,
        _valid = true;
        _visible = true;
 
-       fade_in = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
-                                      gnome_canvas_line_get_type(),
-                                      "fill_color_rgba", color_map[cCrossfadeLine],
-                                       "width_pixels", (guint) 1,
-                                      NULL);
-
-       fade_out = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
-                                       gnome_canvas_line_get_type(),
-                                       "fill_color_rgba", color_map[cCrossfadeLine],
-                                       "width_pixels", (guint) 1,
-                                       NULL);
+       fade_in = new Line (*group);
+       fade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
+       fade_in->property_width_pixels() = 1;
+
+       fade_out = new Line (*group);
+       fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
+       fade_out->property_width_pixels() = 1;
        
-       set_height (get_time_axis_view().height);
+       set_y_position_and_height (0, get_time_axis_view().height);
 
        /* no frame around the xfade or overlap rects */
 
-       gnome_canvas_item_set (frame, "outline_what", 0, NULL);
+       frame->property_outline_what() = 0;
 
        /* never show the vestigial frame */
 
-       gnome_canvas_item_hide (vestigial_frame);
+       vestigial_frame->hide();
        show_vestigial = false;
-
-       gtk_object_set_data (GTK_OBJECT(group), "crossfadeview", this);
-       gtk_signal_connect (GTK_OBJECT(group), "event",
-                           (GtkSignalFunc) PublicEditor::canvas_crossfade_view_event,
-                           this);
-
+       
+       group->signal_event().connect (bind (mem_fun (tv.editor, &PublicEditor::canvas_crossfade_view_event), group, this));
+       
        crossfade_changed (Change (~0));
 
-       crossfade.StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed));
+       crossfade->StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed));
+       ColorsChanged.connect (mem_fun (*this, &CrossfadeView::color_handler));
 }
 
 CrossfadeView::~CrossfadeView ()
@@ -95,13 +93,6 @@ CrossfadeView::~CrossfadeView ()
         GoingAway (this) ; /* EMIT_SIGNAL */
 }
 
-std::string
-CrossfadeView::get_item_name ()
-{
-       return "xfade";
-//     return crossfade.name();
-}
-
 void
 CrossfadeView::reset_width_dependent_items (double pixel_width)
 {
@@ -110,19 +101,22 @@ CrossfadeView::reset_width_dependent_items (double pixel_width)
        active_changed ();
 
        if (pixel_width < 5) {
-               gnome_canvas_item_hide (fade_in);
-               gnome_canvas_item_hide (fade_out);
+               fade_in->hide();
+               fade_out->hide();
        }
 }
 
 void
-CrossfadeView::set_height (double height)
+CrossfadeView::set_y_position_and_height (double y, double h)
 {
-       if (height == TimeAxisView::Smaller ||
-               height == TimeAxisView::Small)
-               TimeAxisViewItem::set_height (height - 3 );
-       else
-               TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 );
+       if (h == TimeAxisView::hSmaller || h == TimeAxisView::hSmall) {
+               TimeAxisViewItem::set_y_position_and_height (y, h - 3 );
+       } else {
+               TimeAxisViewItem::set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE - 3 );
+       }
+
+       _y_position = y;
+       _height = h;
 
        redraw_curves ();
 }
@@ -133,8 +127,12 @@ CrossfadeView::crossfade_changed (Change what_changed)
        bool need_redraw_curves = false;
 
        if (what_changed & BoundsChanged) {
-               set_position (crossfade.position(), this);
-               set_duration (crossfade.overlap_length(), this);
+               set_position (crossfade->position(), this);
+               set_duration (crossfade->length(), this);
+               need_redraw_curves = true;
+       }
+
+       if (what_changed & Crossfade::FollowOverlapChanged) {
                need_redraw_curves = true;
        }
        
@@ -149,24 +147,27 @@ CrossfadeView::crossfade_changed (Change what_changed)
 void
 CrossfadeView::redraw_curves ()
 {
-       GnomeCanvasPoints* points; 
+       Points* points; 
        int32_t npoints;
        float* vec;
-       
        double h;
 
+       if (!crossfade->following_overlap()) {
+               /* curves should not be visible */
+               fade_in->hide ();
+               fade_out->hide ();
+               return;
+       }
+
        /*
         At "height - 3.0" the bottom of the crossfade touches the name highlight or the bottom of the track (if the
         track is either Small or Smaller.
         */
-       switch(get_time_axis_view().height) {
-               case TimeAxisView::Smaller:
-               case TimeAxisView::Small:
-                       h = get_time_axis_view().height - 3.0;
-                       break;
-
-               default:
-                       h = get_time_axis_view().height - NAME_HIGHLIGHT_SIZE - 3.0;
+       double const tav_height = get_time_axis_view().height;
+       if (tav_height == TimeAxisView::hSmaller || tav_height == TimeAxisView::hSmall) {
+               h = tav_height - 3.0;
+       } else {
+               h = tav_height - NAME_HIGHLIGHT_SIZE - 3.0;
        }
 
        if (h < 0) {
@@ -174,58 +175,66 @@ CrossfadeView::redraw_curves ()
                return;
        }
 
-       npoints = get_time_axis_view().editor.frame_to_pixel (crossfade.length());
+       npoints = get_time_axis_view().editor.frame_to_pixel (crossfade->length());
        npoints = std::min (gdk_screen_width(), npoints);
 
-       if (!_visible || !crossfade.active() || npoints < 3) {
-               gnome_canvas_item_hide (fade_in);
-               gnome_canvas_item_hide (fade_out);
+       if (!_visible || !crossfade->active() || npoints < 3) {
+               fade_in->hide();
+               fade_out->hide();
                return;
        } else {
-               gnome_canvas_item_show (fade_in);
-               gnome_canvas_item_show (fade_out);
+               fade_in->show();
+               fade_out->show();
        } 
 
        points = get_canvas_points ("xfade edit redraw", npoints);
        vec = new float[npoints];
 
-       crossfade.fade_in().get_vector (0, crossfade.length(), vec, npoints);
+       crossfade->fade_in().curve().get_vector (0, crossfade->length(), vec, npoints);
        for (int i = 0, pci = 0; i < npoints; ++i) {
-               points->coords[pci++] = i;
-               points->coords[pci++] = 2.0 + h - (h * vec[i]);
+               Art::Point &p = (*points)[pci++];
+               p.set_x(i);
+               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
        }
-       gnome_canvas_item_set (fade_in, "points", points, NULL);
+       fade_in->property_points() = *points;
 
-       crossfade.fade_out().get_vector (0, crossfade.length(), vec, npoints);
+       crossfade->fade_out().curve().get_vector (0, crossfade->length(), vec, npoints);
        for (int i = 0, pci = 0; i < npoints; ++i) {
-               points->coords[pci++] = i;
-               points->coords[pci++] = 2.0 + h - (h * vec[i]);
+               Art::Point &p = (*points)[pci++];
+               p.set_x(i);
+               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
        }
-       gnome_canvas_item_set (fade_out, "points", points, NULL);
+       fade_out->property_points() = *points;
 
        delete [] vec;
 
-       gnome_canvas_points_unref (points);
+       delete points;
 
        /* XXX this is ugly, but it will have to wait till Crossfades are reimplented
           as regions. This puts crossfade views on top of a track, above all regions.
        */
 
-       gnome_canvas_item_raise_to_top (group);
+       group->raise_to_top();
 }
 
 void
 CrossfadeView::active_changed ()
 {
-       if (crossfade.active()) {
-               gnome_canvas_item_set (frame, "fill_color_rgba", color_map[cActiveCrossfade], NULL);
+       if (crossfade->active()) {
+               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
        } else {
-               gnome_canvas_item_set (frame, "fill_color_rgba", color_map[cInactiveCrossfade], NULL);
+               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_InactiveCrossfade.get();
        }
 
        redraw_curves ();
 }
 
+void
+CrossfadeView::color_handler ()
+{
+       active_changed ();
+}
+
 void
 CrossfadeView::set_valid (bool yn)
 {
@@ -235,7 +244,7 @@ CrossfadeView::set_valid (bool yn)
 AudioRegionView&
 CrossfadeView::upper_regionview () const
 {
-       if (left_view.region.layer() > right_view.region.layer()) {
+       if (left_view.region()->layer() > right_view.region()->layer()) {
                return left_view;
        } else {
                return right_view;
@@ -245,19 +254,20 @@ CrossfadeView::upper_regionview () const
 void
 CrossfadeView::show ()
 {
-       gnome_canvas_item_show (group);
+       group->show();
        _visible = true;
 }
 
 void
 CrossfadeView::hide ()
 {
-       gnome_canvas_item_hide (group);
+       group->hide();
        _visible = false;
 }
 
 void
 CrossfadeView::fake_hide ()
 {
-       gnome_canvas_item_hide (group);
+       group->hide();
 }
+