Better method for redrawing gain meter pixmaps upon theme change

[ardour.git] / gtk2_ardour / audio_streamview.cc

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 398b9c404ba522e2e223b4b3c3203914295fdca3..09510e8d428c8a52bd6a65423f20288081a5c26a 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -79,23 +79,6 @@ AudioStreamView::~AudioStreamView ()
 {
 }
 
-int
-AudioStreamView::set_height (gdouble h)
-{
-       /* limit the values to something sane-ish */
-       if (h < 10.0 || h > 1000.0) {
-               return -1;
-       }
-
-       StreamView::set_height(h);
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               (*i)->set_height (h);
-       }
-
-       return 0;
-}
-
 int 
 AudioStreamView::set_samples_per_unit (gdouble spp)
 {
@@ -263,11 +246,23 @@ AudioStreamView::undisplay_diskstream ()
 }
 
 void
-AudioStreamView::playlist_modified ()
+AudioStreamView::playlist_modified_weak (boost::weak_ptr<Diskstream> ds)
+{
+       boost::shared_ptr<Diskstream> sp (ds.lock());
+       if (!sp) {
+               return;
+       }
+
+       playlist_modified (sp);
+}
+
+void
+AudioStreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
 {
-       ENSURE_GUI_THREAD (mem_fun (*this, &AudioStreamView::playlist_modified));
+       /* we do not allow shared_ptr<T> to be bound to slots */
+       ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::playlist_modified_weak), ds));
 
-       StreamView::playlist_modified();
+       StreamView::playlist_modified (ds);
        
        /* make sure xfades are on top and all the regionviews are stacked correctly. */
 
@@ -314,7 +309,7 @@ AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade)
 
        for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
                if ((*i)->crossfade == crossfade) {
-                       if (!crossfades_visible) {
+                       if (!crossfades_visible || layer_display == Stacked) {
                                (*i)->hide();
                        } else {
                                (*i)->show ();
@@ -347,15 +342,17 @@ AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade)
        crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade));
        crossfade_views.push_back (cv);
 
-       if (!Config->get_xfades_visible() || !crossfades_visible) {
+       if (!Config->get_xfades_visible() || !crossfades_visible || layer_display == Stacked) {
                cv->hide ();
        }
 }
 
 void
-AudioStreamView::remove_crossfade (boost::shared_ptr<Crossfade> xfade)
+AudioStreamView::remove_crossfade (boost::shared_ptr<Region> r)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), xfade));
+       ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), r));
+
+       boost::shared_ptr<Crossfade> xfade = boost::dynamic_pointer_cast<Crossfade> (r);
 
        for (list<CrossfadeView*>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
                if ((*i)->crossfade == xfade) {
@@ -378,7 +375,7 @@ AudioStreamView::redisplay_diskstream ()
 
        for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
                (*xi)->set_valid (false);
-               if ((*xi)->visible()) {
+               if ((*xi)->visible() && layer_display != Stacked) {
                        (*xi)->show ();
                }
        }
@@ -482,7 +479,7 @@ AudioStreamView::setup_rec_box ()
                                boost::shared_ptr<AudioDiskstream> ads = boost::dynamic_pointer_cast<AudioDiskstream>(_trackview.get_diskstream());
                                assert(ads);
 
-                               for (uint32_t n=0; n < ads->n_channels().get(DataType::AUDIO); ++n) {
+                               for (uint32_t n=0; n < ads->n_channels().n_audio(); ++n) {
                                        boost::shared_ptr<AudioFileSource> src = boost::static_pointer_cast<AudioFileSource> (ads->write_source (n));
                                        if (src) {
                                                sources.push_back (src);
@@ -638,7 +635,7 @@ AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::we
        
        rec_data_ready_map[src] = true;
        
-       if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().get(DataType::AUDIO)) {
+       if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_audio()) {
                this->update_rec_regions ();
                rec_data_ready_map.clear();
        }
@@ -755,7 +752,7 @@ void
 AudioStreamView::reveal_xfades_involving (AudioRegionView& rv)
 {
        for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible()) {
+               if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible() && layer_display != Stacked) {
                        (*i)->show ();
                }
        }
@@ -784,3 +781,17 @@ AudioStreamView::color_handler (ColorID id, uint32_t val)
        }
 }
 
+void
+AudioStreamView::update_contents_y_position_and_height ()
+{
+       StreamView::update_contents_y_position_and_height ();
+       
+       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
+               if (layer_display == Overlaid) {
+                       (*i)->show ();
+                       (*i)->set_y_position_and_height (0, height);
+               } else {
+                       (*i)->hide ();
+               }
+       }
+}