new fade in/fade out colors from chrisg

git-svn-id: svn://localhost/ardour2/branches/3.0@7272 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index bd311d7e06fb03931f39fcc57bb768b804e30f34..802d9230fbb7ba272f7dabef5506c676feba0d8d 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -308,40 +308,36 @@ AudioRegionView::fade_out_changed ()
 void
 AudioRegionView::fade_in_active_changed ()
 {
-       uint32_t r,g,b,a;
-       uint32_t col;
-       UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
+//     uint32_t r,g,b,a;
+//     uint32_t col;
+//     UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
 
        if (audio_region()->fade_in_active()) {
-               col = RGBA_TO_UINT(r,g,b,120);
-               fade_in_shape->property_fill_color_rgba() = col;
-               fade_in_shape->property_width_pixels() = 0;
-               fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,0);
+               fade_in_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,90);                          // FIXME make a themeable colour
+               fade_in_shape->property_width_pixels() = 1;
+               fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(180,180,180,190);                   // FIXME make a themeable colour
        } else {
-               col = RGBA_TO_UINT(r,g,b,0);
-               fade_in_shape->property_fill_color_rgba() = col;
+               fade_in_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,20);                          // FIXME make a themeable colour
                fade_in_shape->property_width_pixels() = 1;
-               fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,255);
+               fade_in_shape->property_outline_color_rgba() = RGBA_TO_UINT(45,45,45,150);                      // FIXME make a themeable colour
        }
 }
 
 void
 AudioRegionView::fade_out_active_changed ()
 {
-       uint32_t r,g,b,a;
-       uint32_t col;
-       UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
+//     uint32_t r,g,b,a;
+//     uint32_t col;
+//     UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
 
        if (audio_region()->fade_out_active()) {
-               col = RGBA_TO_UINT(r,g,b,120);
-               fade_out_shape->property_fill_color_rgba() = col;
-               fade_out_shape->property_width_pixels() = 0;
-               fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,0);
+               fade_out_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,90);                         // FIXME make a themeable colour
+               fade_out_shape->property_width_pixels() = 1;
+               fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(180,180,180,200);                  // FIXME make a themeable colour
        } else {
-               col = RGBA_TO_UINT(r,g,b,0);
-               fade_out_shape->property_fill_color_rgba() = col;
+               fade_out_shape->property_fill_color_rgba() = RGBA_TO_UINT(45,45,45,20);                         // FIXME make a themeable colour
                fade_out_shape->property_width_pixels() = 1;
-               fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(r,g,b,255);
+               fade_out_shape->property_outline_color_rgba() = RGBA_TO_UINT(45,45,45,200);                     // FIXME make a themeable colour
        }
 }
 

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 7f95feb0a8258fa4b76b66d585aecb148316f0d7..d49f60c9ca8ef302a6abec69b3c1e90853059d1f 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -2184,6 +2184,7 @@ FadeInDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 
        _pointer_frame_offset = grab_frame() - ((nframes64_t) r->fade_in()->back()->when + r->position());
        _editor->show_verbose_duration_cursor (r->position(), r->position() + r->fade_in()->back()->when, 10);
+       
 }
 
 void

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index be564d3dcbfb3c31fc6587d733a436d5f51fe43c..bbe854a6a34044b03d1ba23dc508d08bbb95b42d 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -375,8 +375,8 @@ RegionView::set_colors ()
        TimeAxisViewItem::set_colors ();
 
        if (sync_mark) {
-               sync_mark->property_fill_color_rgba() = fill_color;
-               sync_line->property_fill_color_rgba() = fill_color;
+               sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour
+               sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour
        }
 }
 
@@ -481,10 +481,10 @@ RegionView::region_sync_changed ()
                /* points set below */
 
                sync_mark = new ArdourCanvas::Polygon (*group);
-               sync_mark->property_fill_color_rgba() = fill_color;
+               sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour
 
                sync_line = new ArdourCanvas::Line (*group);
-               sync_line->property_fill_color_rgba() = fill_color;
+               sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;                   // FIXME make a themeable colour        
                sync_line->property_width_pixels() = 1;
        }
 

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index d25a70d819d03822005eb8e0bb7afea684c1baf3..a104336c9eba24db0f633b6b6d9740da7941f59d 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -564,6 +564,7 @@ MidiTrack::MidiControl::set_value(float val)
 void
 MidiTrack::set_step_editing (bool yn)
 {
+        cerr << name() << " IS NOW STEP EDITING\n";
        _step_editing = yn;
 }
 

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 7c990bd6547356b064693b0c80b4dd2dbcca77c1..8aa91542dc15c1e1719e121e064de3ccf535cba3 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -470,6 +470,9 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
 
        DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::speed_and_position FINAL %1 %2\n", last.speed, pos));
 
+       
+       DEBUG_TRACE (DEBUG::MTC, string_compose ("last = %1 elapsed = %2 pos = %3 speed = %4\n", last.position, elapsed, pos, speed));
+       
        return true;
 }