fix (?) handling of fake regions; use int cast before MeterFoo cast; use default...

git-svn-id: svn://localhost/ardour2/trunk@987 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 9f107633e157126c8b0e64ced59fc77ed4e31533..0b38e61c57adda0b282ccdcc439438a0e18068ec 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -271,7 +271,7 @@ rcu = gtkardour.Program(target = 'rcu', source = rcu_files)
 tt = gtkmmtests.Program(target = 'tt', source = tt_files)
 
 my_subst_dict = { }
-my_subst_dict['%INSTALL_PREFIX%'] = install_prefix
+my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
 
 ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 3674998189c791e4114ce6d8c3901f70df0c1311..82147f04ee2be550ea3e6d86cdb7e588f6d7f86f 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -585,12 +585,12 @@ ARDOUR_UI::map_output_auto_connect ()
 void
 ARDOUR_UI::map_meter_falloff ()
 {
-       const char* action = 0;
+       const char* action = X_("MeterFalloffMedium");
 
        /* XXX hack alert. Fix this. Please */
 
        float val = Config->get_meter_falloff ();
-       MeterFalloff code = (MeterFalloff) (floor (val));
+       MeterFalloff code = (MeterFalloff) (int) (floor (val));
 
        switch (code) {
        case MeterFalloffOff:
@@ -629,12 +629,12 @@ ARDOUR_UI::map_meter_falloff ()
 void
 ARDOUR_UI::map_meter_hold ()
 {
-       const char* action = 0;
+       const char* action = X_("MeterHoldMedium");
 
        /* XXX hack alert. Fix this. Please */
 
        float val = Config->get_meter_hold ();
-       MeterHold code = (MeterHold) (floor (val));
+       MeterHold code = (MeterHold) (int) (floor (val));
 
        switch (code) {
        case MeterHoldOff:

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index c24d393f533176c6ad14ccfece277f7ae0b7b940..97505d90f07aface9beb89d25e8823c71d5f2748 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -126,7 +126,7 @@ AudioStreamView::set_amplitude_above_axis (gdouble app)
 }
 
 void
-AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves)
+AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves, bool watch_death)
 {
        AudioRegionView *region_view;
 
@@ -167,9 +167,10 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
 
        region_view->set_waveform_visible(_trackview.editor.show_waveforms());
 
-       /* catch regionview going away */
-
-       region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr<Region> (r)));
+       if (watch_death) {
+               /* catch regionview going away */
+               region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr<Region> (r)));
+       }
 
        RegionViewAdded (region_view);
 }
@@ -604,7 +605,7 @@ AudioStreamView::update_rec_regions ()
 
                                                if (origlen == 1) {
                                                        /* our special initial length */
-                                                       add_region_view_internal (region, false);
+                                                       add_region_view_internal (region, false, false);
                                                }
 
                                                /* also update rect */
@@ -629,7 +630,7 @@ AudioStreamView::update_rec_regions ()
                                                
                                                if (origlen == 1) {
                                                        /* our special initial length */
-                                                       add_region_view_internal (region, false);
+                                                       add_region_view_internal (region, false, false);
                                                }
                                                
                                                /* also hide rect */

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index c6db40f336bd54837d5ad7a22a3af1ffcf25bfb7..b3bfb65c5c409e84e5b2826fa3bb75e16651fb89 100644 (file)
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -81,7 +81,7 @@ class AudioStreamView : public StreamView
        void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<ARDOUR::Source> src); 
        void update_rec_regions ();
        
-       void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves);
+       void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool watch_death);
        void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
        void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> );
 

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 10d409a9b0d9700a4d54ce6637ad151569174ea6..beed74c59f9e9681638af13901228aa05478ea60 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -160,7 +160,7 @@ StreamView::set_samples_per_unit (gdouble spp)
 void
 StreamView::add_region_view (boost::shared_ptr<Region> r)
 {
-       add_region_view_internal (r, true);
+       add_region_view_internal (r, true, true);
 }
 
 void

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index cc5f9cb41428399345a47aee9c439de310907224..197c854b7a91f8cb2ec4f6ef7d4c4d7a24fdc79c 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -107,7 +107,7 @@ protected:
        void         update_rec_box ();
        virtual void update_rec_regions () = 0;
        
-       virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0;
+       virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool watch_death) = 0;
        virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
        //void         remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused)