r4008 - in trunk: . beast-gtk

[stw svn gnome org]

Author: stw
Date: 2006-10-21 20:04:30 -0400 (Sat, 21 Oct 2006)
New Revision: 4008

Modified:
   trunk/ChangeLog
   trunk/beast-gtk/bsttrackroll.c
Log:
Sun Oct 22 01:54:54 2006  Stefan Westerfeld  <stefan space twc de>

	* beast-gtk/bsttrackroll.c: Fix tact numbers in TrackRoll view,
	fixes bug #346916. Instead of printing (more or less) useless
	numbers, the tacts in the TrackRoll view are now numbered 1 2 3 4 and
	so on, and only every fourth of these numbers is shown if there is not
	enough screenspace. This change only works for 4/4 tacts, so this is a
	temporary fix, until the tact handling of beast is rewritten.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-21 23:42:08 UTC (rev 4007)
+++ trunk/ChangeLog	2006-10-22 00:04:30 UTC (rev 4008)
@@ -1,3 +1,12 @@
+Sun Oct 22 01:54:54 2006  Stefan Westerfeld  <stefan space twc de>
+
+	* beast-gtk/bsttrackroll.c: Fix tact numbers in TrackRoll view,
+	fixes bug #346916. Instead of printing (more or less) useless
+	numbers, the tacts in the TrackRoll view are now numbered 1 2 3 4 and
+	so on, and only every fourth of these numbers is shown if there is not
+	enough screenspace. This change only works for 4/4 tacts, so this is a
+	temporary fix, until the tact handling of beast is rewritten.
+
 Sun Oct 22 01:30:05 2006  Stefan Westerfeld  <stefan space twc de>
 
 	* tests/audio/Makefile.am: Pass --bse-disable-randomization to BSE2WAV

Modified: trunk/beast-gtk/bsttrackroll.c
===================================================================
--- trunk/beast-gtk/bsttrackroll.c	2006-10-21 23:42:08 UTC (rev 4007)
+++ trunk/beast-gtk/bsttrackroll.c	2006-10-22 00:04:30 UTC (rev 4008)
@@ -716,7 +716,7 @@
 	  tact4 /= (self->tpt * 4);
 	  next_pixel = tick_to_coord (self, (tact4 + 1) * (self->tpt * 4));
 
-	  g_snprintf (buffer, 64, "%u", tact4 + 1);
+	  g_snprintf (buffer, 64, "%u", tact4 * 4 + 1);
           pango_layout_set_text (PLAYOUT_HPANEL (self), buffer, -1);
           pango_layout_get_pixel_extents (PLAYOUT_HPANEL (self), NULL, &rect);
           
@@ -732,11 +732,8 @@
 
 	  tact /= self->tpt;
 	  next_pixel = tick_to_coord (self, (tact + 1) * self->tpt);
-          tact = tact % 4 + 1;
-          if (tact == 1444)
-            continue;   /* would draw on top of tact4 number */
 
-	  g_snprintf (buffer, 64, ":%u", tact % 4 + 1);
+	  g_snprintf (buffer, 64, "%u", tact + 1);
           pango_layout_set_text (PLAYOUT_HPANEL (self), buffer, -1);
           pango_layout_get_pixel_extents (PLAYOUT_HPANEL (self), NULL, &rect);