diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:28:32 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:29:00 -0400 |
commit | ce08ec0de0b0b077d9b28533c23886607991d144 (patch) | |
tree | 031a01c89075fbf90733da202ce8b19f6f048a6c /gtk2_ardour/audio_region_view.h | |
parent | 438179d278559bcb41a8abdadfb5e6b2e1e89d2d (diff) |
substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring.
Group tabs now also get the text drawn in an appropriately contrast-y color
Diffstat (limited to 'gtk2_ardour/audio_region_view.h')
-rw-r--r-- | gtk2_ardour/audio_region_view.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index a80dc5a7b6..20caea17c1 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -55,13 +55,13 @@ class AudioRegionView : public RegionView RouteTimeAxisView&, boost::shared_ptr<ARDOUR::AudioRegion>, double initial_samples_per_pixel, - Gdk::Color const & basic_color); + uint32_t base_color); AudioRegionView (ArdourCanvas::Group *, RouteTimeAxisView&, boost::shared_ptr<ARDOUR::AudioRegion>, double samples_per_pixel, - Gdk::Color const & basic_color, + uint32_t base_color, bool recording, TimeAxisViewItem::Visibility); @@ -69,7 +69,7 @@ class AudioRegionView : public RegionView ~AudioRegionView (); - virtual void init (Gdk::Color const & base_color, bool wait_for_data); + void init (bool wait_for_data); boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const; @@ -173,8 +173,6 @@ class AudioRegionView : public RegionView double _amplitude_above_axis; - uint32_t fade_color; - void reset_fade_shapes (); void reset_fade_in_shape (); void reset_fade_out_shape (); @@ -193,7 +191,6 @@ class AudioRegionView : public RegionView void set_colors (); void set_waveform_colors (); - void compute_colors (Gdk::Color const &); void reset_width_dependent_items (double pixel_width); void set_frame_color (); |