merge with 2.0-ongoing @ rev 3147

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

1 files changed, 21 insertions, 7 deletions

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 787f70a993..e1b80cc073 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -500,15 +500,21 @@ AudioClock::set_frames (nframes_t when, bool force)
 			sprintf (buf, "%.3fK", rate/1000.0f);
 		}
 		
-		frames_upper_info_label->set_text (buf);
+		if (frames_upper_info_label->get_text() != buf) {
+			frames_upper_info_label->set_text (buf);
+		}
 		
 		float vid_pullup = Config->get_video_pullup();
 		
 		if (vid_pullup == 0.0) {
-			frames_lower_info_label->set_text(_("none"));
+			if (frames_lower_info_label->get_text () != _("none")) {
+				frames_lower_info_label->set_text(_("none"));
+			}
 		} else {
 			sprintf (buf, "%-6.4f", vid_pullup);
-			frames_lower_info_label->set_text (buf);
+			if (frames_lower_info_label->get_text() != buf) {
+				frames_lower_info_label->set_text (buf);
+			}
 		}
 	}
 }	
@@ -598,7 +604,9 @@ AudioClock::set_smpte (nframes_t when, bool force)
 			sprintf (buf, "%.2f", smpte_frames);
 		}
 		
-		smpte_upper_info_label->set_text (buf);
+		if (smpte_upper_info_label->get_text() != buf) {
+			smpte_upper_info_label->set_text (buf);
+		}
 		
 		if ((fabs(smpte_frames - 29.97) < 0.0001) || smpte_frames == 30) {
 			if (session->smpte_drop_frames()) {
@@ -611,7 +619,9 @@ AudioClock::set_smpte (nframes_t when, bool force)
 			buf[0] = '\0';
 		}
 		
-		smpte_lower_info_label->set_text (buf);
+		if (smpte_lower_info_label->get_text() != buf) {
+			smpte_lower_info_label->set_text (buf);
+		}
 	}
 }
 
@@ -632,9 +642,13 @@ AudioClock::set_bbt (nframes_t when, bool force)
 	if (bbt_upper_info_label) {
 		TempoMap::Metric m (session->tempo_map().metric_at (when));
 		sprintf (buf, "%-5.2f", m.tempo().beats_per_minute());
-		bbt_lower_info_label->set_text (buf);
+		if (bbt_lower_info_label->get_text() != buf) {
+			bbt_lower_info_label->set_text (buf);
+		}
 		sprintf (buf, "%g|%g", m.meter().beats_per_bar(), m.meter().note_divisor());
-		bbt_upper_info_label->set_text (buf);
+		if (bbt_upper_info_label->get_text() != buf) {
+			bbt_upper_info_label->set_text (buf);
+		}
 	}
 }