along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cstdio> // for sprintf, grrr
#include "tempo_dialog.h"
#include "rgb_macros.h"
#include "gui_thread.h"
-#include "color.h"
+#include "ardour_ui.h"
+#include "time_axis_view.h"
#include "i18n.h"
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
- metric_marks.push_back (new MeterMarker (*this, *meter_group, color_map[cMeterMarker], buf,
+ metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
*(const_cast<MeterSection*>(ms))));
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
- metric_marks.push_back (new TempoMarker (*this, *tempo_group, color_map[cTempoMarker], buf,
+ metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
*(const_cast<TempoSection*>(ts))));
}
void
Editor::tempo_map_changed (Change ignored)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
+ if (!session) {
+ return;
+ }
+
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
+
+ redisplay_tempo (false); // redraw rulers and measures
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+}
+
+/**
+ * This code was originally in tempo_map_changed, but this is called every time the canvas scrolls horizontally.
+ * That's why this is moved in here. The new tempo_map_changed is called when the ARDOUR::TempoMap actually changed.
+ */
+void
+Editor::redisplay_tempo (bool immediate_redraw)
+{
+ if (!session) {
+ return;
+ }
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);
+ session->bbt_time(leftmost_frame + current_page_frames(), next_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);
+ previous_beat.ticks = 0;
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;
+ next_beat.beats += 1;
} else {
- next_beat.bars += 1;
- next_beat.beats = 1;
- next_beat.ticks = 0;
+ next_beat.bars += 1;
+ next_beat.beats = 1;
}
-
+ next_beat.ticks = 0;
+
if (current_bbt_points) {
delete current_bbt_points;
current_bbt_points = 0;
if (session) {
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;
- */
-
+ update_tempo_based_rulers ();
} else {
current_bbt_points = 0;
}
- redisplay_tempo ();
-}
+ if (immediate_redraw) {
-void
-Editor::redisplay_tempo ()
-{
+ hide_measures ();
- hide_measures ();
+ if (session && current_bbt_points) {
+ draw_measures ();
+ }
- if (session && current_bbt_points) {
- Glib::signal_idle().connect (mem_fun (*this, &Editor::draw_measures));
- update_tempo_based_rulers ();
+ } else {
+
+ if (session && current_bbt_points) {
+ Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
+ } else {
+ hide_measures ();
+ }
}
}
Editor::hide_measures ()
{
for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) {
- (*i)->hide();
+ (*i)->hide();
free_measure_lines.push_back (*i);
}
used_measure_lines.clear ();
}
bool
+Editor::lazy_hide_and_draw_measures ()
+{
+ hide_measures ();
+ draw_measures ();
+ return false;
+}
+
+void
Editor::draw_measures ()
{
if (session == 0 || _show_measures == false) {
- return false;
+ return;
}
TempoMap::BBTPointList::iterator i;
ArdourCanvas::SimpleLine *line;
- gdouble xpos, last_xpos;
- uint32_t cnt;
+ gdouble xpos;
+ double x1, x2, y1, y2, beat_density;
+
+ uint32_t beats = 0;
+ uint32_t bars = 0;
uint32_t color;
if (current_bbt_points == 0 || current_bbt_points->empty()) {
- return false;
+ return;
}
- cnt = 0;
- last_xpos = 0;
+ track_canvas->get_scroll_region (x1, y1, x2, y2);
+ y2 = TimeAxisView::hLargest*5000; // five thousand largest tracks should be enough.. :)
/* get the first bar spacing */
- gdouble last_beat = DBL_MAX;
- gdouble beat_spacing = 0;
-
- for (i = current_bbt_points->begin(); i != current_bbt_points->end() && beat_spacing == 0; ++i) {
- TempoMap::BBTPoint& p = (*i);
-
- switch (p.type) {
- case TempoMap::Bar:
- break;
+ i = current_bbt_points->end();
+ i--;
+ bars = (*i).bar - (*current_bbt_points->begin()).bar;
+ beats = current_bbt_points->size() - bars;
- case TempoMap::Beat:
- xpos = frame_to_unit (p.frame);
- if (last_beat < xpos) {
- beat_spacing = xpos - last_beat;
- }
- last_beat = xpos;
- }
- }
+ beat_density = (beats * 10.0f) / track_canvas->get_width ();
- if (beat_spacing < 12.0) {
- /*
- if the lines are too close together,
- they become useless
- */
- return false;
+ if (beat_density > 4.0f) {
+ /* if the lines are too close together, they become useless
+ */
+ return;
}
- double x1, x2, y1, y2;
- track_canvas.get_scroll_region (x1, y1, x2, y2);
-
for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
- TempoMap::BBTPoint& p = (*i);
-
- switch (p.type) {
+ switch ((*i).type) {
case TempoMap::Bar:
break;
case TempoMap::Beat:
- xpos = frame_to_unit (p.frame);
- if (p.beat == 1) {
- color = color_map[cMeasureLineBeat];
+ if ((*i).beat == 1) {
+ color = ARDOUR_UI::config()->canvasvar_MeasureLineBar.get();
} else {
- color = color_map[cMeasureLineBar];
+ color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get();
- /* only draw beat lines if the gaps between beats
- are large.
- */
-
- if (beat_spacing < 25.0) {
+ if (beat_density > 2.0) {
+ /* only draw beat lines if the gaps between beats are large.
+ */
break;
}
}
-
- if (cnt == 0 || xpos - last_xpos > 4.0) {
- line = get_time_line ();
- line->property_x1() = xpos;
- line->property_x2() = xpos;
- line->property_y2() = y2;
- line->property_color_rgba() = color;
- line->raise_to_top();
- line->show();
- last_xpos = xpos;
- ++cnt;
- }
+
+ xpos = frame_to_unit ((nframes64_t) (*i).frame);
+ line = get_time_line ();
+ line->property_x1() = xpos;
+ line->property_x2() = xpos;
+ line->property_y2() = y2;
+ line->property_color_rgba() = color;
+ //line->raise_to_top();
+ line->show();
break;
}
}
cursor_group->raise_to_top();
time_line_group->lower_to_bottom();
- return false;
+ if (logo_item) {
+ logo_item->lower_to_bottom ();
+ }
+ return;
}
void
-Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes64_t frame)
{
if (session == 0) {
return;
TempoDialog tempo_dialog (map, frame, _("add"));
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+ //this causes compiz to display no border.
+ //tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
ensure_float (tempo_dialog);
BBT_Time requested;
bpm = tempo_dialog.get_bpm ();
+ double nt = tempo_dialog.get_note_type();
bpm = max (0.01, bpm);
tempo_dialog.get_bbt_time (requested);
begin_reversible_command (_("add tempo mark"));
XMLNode &before = map.get_state();
- map.add_tempo (Tempo (bpm), requested);
+ map.add_tempo (Tempo (bpm,nt), requested);
XMLNode &after = map.get_state();
session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
commit_reversible_command ();
- map.dump (cerr);
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
+ //map.dump (cerr);
}
void
-Editor::mouse_add_new_meter_event (jack_nframes_t frame)
+Editor::mouse_add_new_meter_event (nframes64_t frame)
{
if (session == 0) {
return;
MeterDialog meter_dialog (map, frame, _("add"));
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
- meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+
+ //this causes compiz to display no border..
+ //meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
ensure_float (meter_dialog);
double note_type = meter_dialog.get_note_type ();
BBT_Time requested;
-
+
meter_dialog.get_bbt_time (requested);
-
+
begin_reversible_command (_("add meter mark"));
XMLNode &before = map.get_state();
map.add_meter (Meter (bpb, note_type), requested);
session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
commit_reversible_command ();
- map.dump (cerr);
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
+ //map.dump (cerr);
}
void
XMLNode &after = session->tempo_map().get_state();
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
}
double bpm = tempo_dialog.get_bpm ();
+ double nt = tempo_dialog.get_note_type ();
BBT_Time when;
tempo_dialog.get_bbt_time(when);
bpm = max (0.01, bpm);
+ cerr << "Editing tempo section to be at " << when << endl;
+ session->tempo_map().dump (cerr);
begin_reversible_command (_("replace tempo mark"));
XMLNode &before = session->tempo_map().get_state();
- session->tempo_map().replace_tempo (*section, Tempo (bpm));
+ session->tempo_map().replace_tempo (*section, Tempo (bpm,nt));
+ session->tempo_map().dump (cerr);
session->tempo_map().move_tempo (*section, when);
+ session->tempo_map().dump (cerr);
XMLNode &after = session->tempo_map().get_state();
session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
return FALSE;
}
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
return FALSE;
}
projects / ardour.git / blobdiff