double tbpos = 0.0;
double old_unit_pos ;
- GtkArg args[1] ;
- args[0].name = "y";
if (ruler_shown[ruler_time_meter]) {
lab_children.push_back (Element(meter_label, PACK_SHRINK, PACK_START));
- gtk_object_get (GTK_OBJECT(meter_group), "y", &old_unit_pos);
+ old_unit_pos = meter_group->property_y();
if (tbpos != old_unit_pos) {
meter_group->move ( 0.0, tbpos - old_unit_pos);
}
-
- //gnome_canvas_item_set (meter_group, "y", tbpos, NULL);
meter_group->show();
tbpos += timebar_height;
visible_timebars++;
if (tbpos != old_unit_pos) {
tempo_group->move(0.0, tbpos - old_unit_pos);
}
- //gnome_canvas_item_set (tempo_group, "y", tbpos, NULL);
tempo_group->show();
tbpos += timebar_height;
visible_timebars++;
if (ruler_shown[ruler_time_marker]) {
lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START));
- gtk_object_getv (GTK_OBJECT(marker_group), 1, args) ;
- old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
- gtk_object_get (GTK_OBJECT(marker_group), "y", &old_unit_pos);
+ old_unit_pos = marker_group->property_y();
if (tbpos != old_unit_pos) {
marker_group->move ( 0.0, tbpos - old_unit_pos);
}
- //gnome_canvas_item_set (marker_group, "y", tbpos, NULL);
marker_group->show();
tbpos += timebar_height;
visible_timebars++;
if (ruler_shown[ruler_time_range_marker]) {
lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START));
- gtk_object_getv (GTK_OBJECT(range_marker_group), 1, args) ;
- old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
+ old_unit_pos = range_marker_group->property_y();
if (tbpos != old_unit_pos) {
range_marker_group->move (0.0, tbpos - old_unit_pos);
}
- //gnome_canvas_item_set (marker_group, "y", tbpos, NULL);
range_marker_group->show();
tbpos += timebar_height;
visible_timebars++;
if (ruler_shown[ruler_time_transport_marker]) {
lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START));
- gtk_object_get (GTK_OBJECT(transport_marker_group), "y", &old_unit_pos);
+ old_unit_pos = transport_marker_group->property_y();
if (tbpos != old_unit_pos) {
transport_marker_group->move ( 0.0, tbpos - old_unit_pos);
}
- //gnome_canvas_item_set (marker_group, "y", tbpos, NULL);
transport_marker_group->show();
tbpos += timebar_height;
visible_timebars++;
/* Mark generation */
gint
-Editor::_metric_get_smpte (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::_metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
return ruler_editor->metric_get_smpte (marks, lower, upper, maxchars);
}
gint
-Editor::_metric_get_bbt (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::_metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
return ruler_editor->metric_get_bbt (marks, lower, upper, maxchars);
}
gint
-Editor::_metric_get_frames (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::_metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
return ruler_editor->metric_get_frames (marks, lower, upper, maxchars);
}
gint
-Editor::_metric_get_minsec (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::_metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
return ruler_editor->metric_get_minsec (marks, lower, upper, maxchars);
}
gint
-Editor::metric_get_smpte (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
jack_nframes_t range;
jack_nframes_t pos;
upper = upper + spacer - lower;
lower = 0;
}
- range = upper - lower;
+ range = (jack_nframes_t) floor (upper - lower);
if (range < (2 * session->frames_per_smpte_frame())) { /* 0 - 2 frames */
show_bits = true;
nmarks = 1 + 24;
}
- pos = lower;
-
+ pos = (jack_nframes_t) floor (lower);
+
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
if (show_bits) {
gint
-Editor::metric_get_bbt (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
if (session == 0) {
return 0;
BBT_Time previous_beat;
BBT_Time next_beat;
jack_nframes_t next_beat_pos;
+ jack_nframes_t ilower = (jack_nframes_t) floor (lower);
+ jack_nframes_t iupper = (jack_nframes_t) floor (upper);
if ((desirable_marks = maxchars / 6) == 0) {
return 0;
/* First find what a beat's distance is, so we can start plotting stuff before the beginning of the ruler */
- session->bbt_time(lower,previous_beat);
+ session->bbt_time(ilower,previous_beat);
previous_beat.ticks = 0;
next_beat = previous_beat;
- if (session->tempo_map().meter_at(lower).beats_per_bar() < (next_beat.beats + 1)) {
+ if (session->tempo_map().meter_at(ilower).beats_per_bar() < (next_beat.beats + 1)) {
next_beat.bars += 1;
next_beat.beats = 1;
} else {
frame_one_beats_worth = session->tempo_map().frame_time(next_beat) - session->tempo_map().frame_time(previous_beat);
- zoomed_bbt_points = session->tempo_map().get_points((lower >= frame_one_beats_worth) ? lower - frame_one_beats_worth : 0, upper);
+ zoomed_bbt_points = session->tempo_map().get_points((ilower >= frame_one_beats_worth) ? ilower - frame_one_beats_worth : 0, iupper);
if (current_bbt_points == 0 || zoomed_bbt_points == 0 || zoomed_bbt_points->empty()) {
return 0;
bool i_am_accented = false;
bool we_need_ticks = false;
- position_of_helper = lower + (30 * Editor::get_current_zoom ());
+ position_of_helper = ilower + (30 * Editor::get_current_zoom ());
if (desirable_marks >= (beats * 2)) {
nmarks = (zoomed_beats * bbt_beat_subdivision) + 1;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
(*marks)[0].label = g_strdup(" ");
- (*marks)[0].position = lower;
+ (*marks)[0].position = ilower;
(*marks)[0].style = GtkCustomRulerMarkMicro;
for (n = 1, i = zoomed_bbt_points->begin(); i != zoomed_bbt_points->end() && n < nmarks; ++i) {
- if ((*i).frame <= lower && (bar_helper_on)) {
+ if ((*i).frame <= ilower && (bar_helper_on)) {
snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
(*marks)[0].label = g_strdup (buf);
snprintf (buf, sizeof(buf), "too many bars... (currently %" PRIu32 ")", zoomed_bars );
(*marks)[0].style = GtkCustomRulerMarkMajor;
(*marks)[0].label = g_strdup (buf);
- (*marks)[0].position = lower;
+ (*marks)[0].position = ilower;
} else if (desirable_marks < (uint32_t) (nmarks = (gint) (zoomed_bars / 64))) {
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
for (n = 0, i = zoomed_bbt_points->begin(); i != zoomed_bbt_points->end() && n < nmarks; i++) {
}
gint
-Editor::metric_get_frames (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
jack_nframes_t mark_interval;
jack_nframes_t pos;
+ jack_nframes_t ilower = (jack_nframes_t) floor (lower);
+ jack_nframes_t iupper = (jack_nframes_t) floor (upper);
gchar buf[16];
gint nmarks;
gint n;
return 0;
}
- mark_interval = (upper - lower) / 5;
+ mark_interval = (iupper - ilower) / 5;
if (mark_interval > session->frame_rate()) {
mark_interval -= mark_interval % session->frame_rate();
} else {
}
nmarks = 5;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- for (n = 0, pos = lower; n < nmarks; pos += mark_interval, ++n) {
+ for (n = 0, pos = ilower; n < nmarks; pos += mark_interval, ++n) {
snprintf (buf, sizeof(buf), "%u", pos);
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
}
gint
-Editor::metric_get_minsec (GtkCustomRulerMark **marks, gulong lower, gulong upper, gint maxchars)
+Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
jack_nframes_t range;
jack_nframes_t fr;
bool show_seconds = false;
bool show_minutes = false;
bool show_hours = false;
+ jack_nframes_t ilower = (jack_nframes_t) floor (lower);
+ jack_nframes_t iupper = (jack_nframes_t) floor (upper);
if (session == 0) {
return 0;
upper = upper + spacer;
lower = 0;
}
- range = upper - lower;
+ range = iupper - ilower;
if (range < (fr / 50)) {
mark_interval = fr / 100; /* show 1/100 seconds */
nmarks = 1 + (range / mark_interval);
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- pos = ((lower + (mark_interval/2))/mark_interval) * mark_interval;
+ pos = ((ilower + (mark_interval/2))/mark_interval) * mark_interval;
if (show_seconds) {
for (n = 0; n < nmarks; pos += mark_interval, ++n) {