return 0;
}
- TempoMap::BBTPointList::iterator i;
- TempoMap::BBTPointList *zoomed_bbt_points;
+ TempoMap::BBTPointList::iterator i;
+
uint32_t beats = 0;
uint32_t bars = 0;
- uint32_t tick = 0;
- uint32_t skip;
- uint32_t t;
- uint32_t zoomed_beats = 0;
- uint32_t zoomed_bars = 0;
uint32_t desirable_marks;
uint32_t magic_accent_number = 1;
gint nmarks;
char buf[64];
gint n;
jack_nframes_t pos;
- jack_nframes_t frame_one_beats_worth;
- jack_nframes_t frame_skip;
- double frame_skip_error;
- double accumulated_error;
- bool bar_helper_on = true;
-
+ bool bar_helper_on = true;
- 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) {
+ if ((desirable_marks = maxchars / 7) == 0) {
return 0;
}
/* align the tick marks to whatever we're snapping to... */
-
- if (snap_type == SnapToAThirdBeat) {
+
+ switch (snap_type) {
+ case SnapToAThirdBeat:
bbt_beat_subdivision = 3;
- } else if (snap_type == SnapToAQuarterBeat) {
+ break;
+ case SnapToAQuarterBeat:
bbt_beat_subdivision = 4;
- } else if (snap_type == SnapToAEighthBeat) {
+ break;
+ case SnapToAEighthBeat:
bbt_beat_subdivision = 8;
magic_accent_number = 2;
- } else if (snap_type == SnapToASixteenthBeat) {
+ break;
+ case SnapToASixteenthBeat:
bbt_beat_subdivision = 16;
magic_accent_number = 4;
- } else if (snap_type == SnapToAThirtysecondBeat) {
+ break;
+ case SnapToAThirtysecondBeat:
bbt_beat_subdivision = 32;
magic_accent_number = 8;
- } else {
+ break;
+ default:
bbt_beat_subdivision = 4;
+ break;
}
- /* First find what a beat's distance is, so we can start plotting stuff before the beginning of the ruler */
-
- session->bbt_time(ilower,previous_beat);
- previous_beat.ticks = 0;
- next_beat = previous_beat;
-
- if (session->tempo_map().meter_at(ilower).beats_per_bar() < (next_beat.beats + 1)) {
- next_beat.bars += 1;
- next_beat.beats = 1;
- } else {
- next_beat.beats += 1;
- }
-
- 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((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()) {
+ if (current_bbt_points == 0 || current_bbt_points->empty()) {
return 0;
}
- for (i = current_bbt_points->begin(); i != current_bbt_points->end(); i++) {
- if ((*i).type == TempoMap::Beat) {
- beats++;
- } else if ((*i).type == TempoMap::Bar) {
- bars++;
- }
- }
+ i = current_bbt_points->end();
+ i--;
+ bars = (*i).bar - (*current_bbt_points->begin()).bar;
+ beats = current_bbt_points->size() - bars;
+
/*Only show the bar helper if there aren't many bars on the screen */
- if (bars > 1) {
+ if (bars > 2) {
bar_helper_on = false;
}
- for (i = zoomed_bbt_points->begin(); i != zoomed_bbt_points->end(); i++) {
- if ((*i).type == TempoMap::Beat) {
- zoomed_beats++;
- } else if ((*i).type == TempoMap::Bar) {
- zoomed_bars++;
- }
- }
-
if (desirable_marks > (beats / 4)) {
/* we're in beat land...*/
+ uint32_t tick = 0;
+ uint32_t skip;
+ uint32_t t;
+ jack_nframes_t frame_skip;
+ double frame_skip_error;
+ double accumulated_error;
double position_of_helper;
bool i_am_accented = false;
bool we_need_ticks = false;
position_of_helper = ilower + (30 * Editor::get_current_zoom ());
- if (desirable_marks >= (beats * 2)) {
- nmarks = (zoomed_beats * bbt_beat_subdivision) + 1;
+ if (desirable_marks >= (beats / 2)) {
+ nmarks = ((beats + 4) * bbt_beat_subdivision) + 1;
we_need_ticks = true;
} else {
- nmarks = zoomed_beats + 1;
+ nmarks = beats + 1;
}
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
(*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 <= ilower && (bar_helper_on)) {
-
+ for (n = 1, i = current_bbt_points->begin(); n < nmarks && i != current_bbt_points->end(); i++) {
+
+ if ((*i).frame < ilower && (bar_helper_on)) {
snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
(*marks)[0].label = g_strdup (buf);
} else {
-
if ((*i).type == TempoMap::Bar) {
- tick = 0;
(((*i).frame < position_of_helper) && bar_helper_on) ?
snprintf (buf, sizeof(buf), " ") : snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
(*marks)[n].label = g_strdup (buf);
n++;
} else if (((*i).type == TempoMap::Beat) && ((*i).beat > 1)) {
- tick = 0;
((((*i).frame < position_of_helper) && bar_helper_on) || !we_need_ticks) ?
snprintf (buf, sizeof(buf), " ") : snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat);
if (((*i).beat % 2 == 1) || we_need_ticks) {
}
}
- /* Find the next beat */
-
- session->bbt_time((*i).frame, next_beat);
- if (session->tempo_map().meter_at((*i).frame).beats_per_bar() > (next_beat.beats + 1)) {
- next_beat.beats += 1;
- } else {
- next_beat.bars += 1;
- next_beat.beats = 1;
- }
-
- next_beat_pos = session->tempo_map().frame_time(next_beat);
/* Add the tick marks */
if (we_need_ticks) {
- frame_skip = (jack_nframes_t) floor ((session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
- frame_skip_error = ((session->frame_rate() * 60.0f) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())) - frame_skip;
+ /* Find the next beat */
+
+ next_beat.beats = (*i).beat;
+ next_beat.bars = (*i).bar;
+
+ if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
+ next_beat.beats += 1;
+ } else {
+ next_beat.bars += 1;
+ next_beat.beats = 1;
+ }
+
+ next_beat_pos = session->tempo_map().frame_time(next_beat);
+
+ frame_skip = (jack_nframes_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+ frame_skip_error -= frame_skip;
skip = (uint32_t) (Meter::ticks_per_beat / bbt_beat_subdivision);
pos = (*i).frame + frame_skip;
accumulated_error = frame_skip_error;
- tick += skip;
+ tick = skip;
- for (t = 0; tick < Meter::ticks_per_beat && pos <= next_beat_pos ; pos += frame_skip, tick += skip, ++t) {
+ for (t = 0; (tick < Meter::ticks_per_beat) && (n < nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
if (t % magic_accent_number == (magic_accent_number - 1)) {
i_am_accented = true;
}
}
}
- delete zoomed_bbt_points;
return n; //return the actual number of marks made, since we might have skipped some fro fractional time signatures
} else {
/* we're in bar land */
- if (desirable_marks < (uint32_t) (zoomed_bars / 256)) {
+ if (desirable_marks < (uint32_t) (bars / 256)) {
nmarks = 1;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- snprintf (buf, sizeof(buf), "too many bars... (currently %" PRIu32 ")", zoomed_bars );
+ snprintf (buf, sizeof(buf), "too many bars... (currently %" PRIu32 ")", bars );
(*marks)[0].style = GtkCustomRulerMarkMajor;
(*marks)[0].label = g_strdup (buf);
(*marks)[0].position = ilower;
- } else if (desirable_marks < (uint32_t) (nmarks = (gint) (zoomed_bars / 64))) {
+ } else if (desirable_marks < (uint32_t) (nmarks = (gint) (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++) {
+ for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; i++) {
if ((*i).type == TempoMap::Bar) {
if ((*i).bar % 64 == 1) {
if ((*i).bar % 256 == 1) {
}
}
}
- } else if (desirable_marks < (uint32_t) (nmarks = (gint)(zoomed_bars / 16))) {
+ } else if (desirable_marks < (uint32_t) (nmarks = (gint)(bars / 16))) {
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- for (n = 0, i = zoomed_bbt_points->begin(); i != zoomed_bbt_points->end() && n < nmarks; i++) {
+ for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; i++) {
if ((*i).type == TempoMap::Bar) {
if ((*i).bar % 16 == 1) {
if ((*i).bar % 64 == 1) {
}
}
}
- } else if (desirable_marks < (uint32_t) (nmarks = (gint)(zoomed_bars / 4))){
+ } else if (desirable_marks < (uint32_t) (nmarks = (gint)(bars / 4))){
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- for (n = 0, i = zoomed_bbt_points->begin(); i != zoomed_bbt_points->end() && n < nmarks; ++i) {
+ for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; ++i) {
if ((*i).type == TempoMap::Bar) {
if ((*i).bar % 4 == 1) {
if ((*i).bar % 16 == 1) {
}
}
} else {
- nmarks = zoomed_bars;
+ nmarks = bars;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- for (n = 0, i = zoomed_bbt_points->begin(); i != zoomed_bbt_points->end() && n < nmarks; i++) {
+ for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; i++) {
if ((*i).type == TempoMap::Bar) {
if ((*i).bar % 4 == 1) {
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
}
}
}
- delete zoomed_bbt_points;
return nmarks;
}
}
Editor::tempo_map_changed (Change ignored)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
-
+
+ BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
+
+ session->bbt_time(leftmost_frame, previous_beat);
+
+ previous_beat.ticks = 0;
+ if (previous_beat.beats > 1) {
+ previous_beat.beats -= 1;
+ } else if (previous_beat.bars > 1) {
+ previous_beat.bars--;
+ previous_beat.beats += 1;
+ }
+
+ session->bbt_time(leftmost_frame + current_page_frames(), next_beat);
+
+ if (session->tempo_map().meter_at(leftmost_frame + current_page_frames()).beats_per_bar () > next_beat.beats + 1) {
+ next_beat.beats += 1;
+ next_beat.ticks = 0;
+ } else {
+ next_beat.bars += 1;
+ next_beat.beats = 1;
+ next_beat.ticks = 0;
+ }
+
if (current_bbt_points) {
- delete current_bbt_points;
+ delete current_bbt_points;
current_bbt_points = 0;
}
if (session) {
- current_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
+ current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat));
+
+ /*
+ TempoMap::BBTPointList::iterator i;
+ cerr << "******************" << endl << "current bbt points dump: " << endl;
+ for (i = current_bbt_points->begin(); i != current_bbt_points->end(); i++) {
+ cerr << (*i).bar << " : " << (*i).beat << endl;
+ }
+ cerr << "******************" << endl;
+ */
+
} else {
current_bbt_points = 0;
}
void
Editor::redisplay_tempo ()
{
+
hide_measures ();
if (session && current_bbt_points) {
- draw_measures ();
+ Glib::signal_idle().connect (mem_fun (*this, &Editor::draw_measures));
update_tempo_based_rulers ();
}
}
return line;
}
-void
+bool
Editor::draw_measures ()
{
if (session == 0 || _show_measures == false) {
- return;
+ return false;
}
- TempoMap::BBTPointList::iterator i = current_bbt_points->begin();
- TempoMap::BBTPoint& p = (*i);
+ TempoMap::BBTPointList::iterator i;
ArdourCanvas::SimpleLine *line;
gdouble xpos, last_xpos;
uint32_t cnt;
uint32_t color;
if (current_bbt_points == 0 || current_bbt_points->empty()) {
- return;
+ return false;
}
cnt = 0;
gdouble beat_spacing = 0;
for (i = current_bbt_points->begin(); i != current_bbt_points->end() && beat_spacing == 0; ++i) {
- TempoMap::BBTPoint& p = (*i);
+ TempoMap::BBTPoint& p = (*i);
switch (p.type) {
case TempoMap::Bar:
}
}
+ if (beat_spacing < 12.0) {
+ /*
+ if the lines are too close together,
+ they become useless
+ */
+ return false;
+ }
+
double x1, x2, y1, y2;
track_canvas.get_scroll_region (x1, y1, x2, y2);
- //y2 = 1000000000.0f;
for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
- p = (*i);
+ TempoMap::BBTPoint& p = (*i);
switch (p.type) {
case TempoMap::Bar:
cursor_group->raise_to_top();
time_line_group->lower_to_bottom();
+ return false;
}
void
hide_button.add (*(manage (new Image (get_xpm("small_x.xpm")))));
- /* XXX is this incomplete? i don't think its very useful atm
-
- solo_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
- mute_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
- playlist_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
- automation_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
- size_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
- visual_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
- hide_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
- */
-
- solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
- solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
- mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
- mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
edit_group_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::edit_click), false);
playlist_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::playlist_click));
automation_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::automation_click));
_route->name_changed.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
_route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+
if (is_track()) {
track()->FreezeChange.connect (mem_fun(*this, &RouteTimeAxisView::map_frozen));
editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
ColorChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+
}
RouteTimeAxisView::~RouteTimeAxisView ()
show_name_entry ();
hide_name_label ();
- mute_button->show_all();
- solo_button->show_all();
+ mute_button->show();
+ solo_button->show();
if (rec_enable_button)
- rec_enable_button->show_all();
+ rec_enable_button->show();
- edit_group_button.show_all();
- hide_button.show_all();
- visual_button.show_all();
- size_button.show_all();
- automation_button.show_all();
+ edit_group_button.show();
+ hide_button.show();
+ visual_button.show();
+ size_button.show();
+ automation_button.show();
if (is_track() && track()->mode() == ARDOUR::Normal) {
- playlist_button.show_all();
+ playlist_button.show();
}
break;
show_name_entry ();
hide_name_label ();
- mute_button->show_all();
- solo_button->show_all();
+ mute_button->show();
+ solo_button->show();
if (rec_enable_button)
- rec_enable_button->show_all();
+ rec_enable_button->show();
edit_group_button.hide ();
hide_button.hide ();
}
}
-bool
-RouteTimeAxisView::select_me (GdkEventButton* ev)
-{
- editor.get_selection().add (this);
- return false;
-}
-
void
RouteTimeAxisView::show_all_automation ()
{
projects / ardour.git / commitdiff