X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=5f9293d4e249078bc95b52ebd2604b38a2a9f603;hb=24a29f61d9554d4924521d0967037cacd47545ca;hp=db1ee5e34ea689219d80b0ad7af5a6d9019ff63a;hpb=c7307c09b8584b15610f0b29a40f839d9183419a;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index db1ee5e34e..5f9293d4e2 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,10 +15,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ -#include // for sprintf, grrr +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + +#include // for sprintf, grrr #include #include #include @@ -26,14 +29,14 @@ #include -#include -#include +#include "pbd/error.h" +#include "pbd/memento_command.h" #include #include -#include -#include +#include "ardour/session.h" +#include "ardour/tempo.h" #include #include @@ -43,12 +46,14 @@ #include "tempo_dialog.h" #include "rgb_macros.h" #include "gui_thread.h" -#include "color.h" +#include "time_axis_view.h" +#include "ardour_ui.h" +#include "tempo_lines.h" +#include "utils.h" #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -64,200 +69,154 @@ Editor::remove_metric_marks () delete_when_idle (*x); } metric_marks.clear (); -} +} void Editor::draw_metric_marks (const Metrics& metrics) { - const MeterSection *ms; + const MeterSection *ms; const TempoSection *ts; char buf[64]; - + remove_metric_marks (); - + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { - + if ((ms = dynamic_cast(*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, + snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ()); + metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf, *(const_cast(ms)))); } else if ((ts = dynamic_cast(*i)) != 0) { - snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute()); - metric_marks.push_back (new TempoMarker (*this, *tempo_group, color_map[cTempoMarker], buf, + if (Config->get_allow_non_quarter_pulse()) { + snprintf (buf, sizeof (buf), "%.2f/%.0f", ts->beats_per_minute(), ts->note_type()); + } else { + snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute()); + } + metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, *(const_cast(ts)))); } - + } } void -Editor::tempo_map_changed (Change ignored) +Editor::tempo_map_changed (const PropertyChange& /*ignored*/) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored)); - - if (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()); - } else { - current_bbt_points = 0; + if (!_session) { + return; } - redisplay_tempo (); -} + ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored); -void -Editor::redisplay_tempo () -{ - hide_measures (); - - if (session && current_bbt_points) { - draw_measures (); - update_tempo_based_rulers (); + if (tempo_lines) { + tempo_lines->tempo_map_changed(); } + + compute_current_bbt_points(leftmost_frame, leftmost_frame + current_page_frames()); + _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers + redraw_measures (); + update_tempo_based_rulers (); } void -Editor::hide_measures () +Editor::redisplay_tempo (bool immediate_redraw) { - for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) { - (*i)->hide(); - free_measure_lines.push_back (*i); + if (!_session) { + return; } - used_measure_lines.clear (); -} -ArdourCanvas::SimpleLine * -Editor::get_time_line () -{ - ArdourCanvas::SimpleLine *line; + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures - if (free_measure_lines.empty()) { - line = new ArdourCanvas::SimpleLine (*time_line_group); - used_measure_lines.push_back (line); + if (immediate_redraw) { + redraw_measures (); } else { - line = free_measure_lines.front(); - free_measure_lines.erase (free_measure_lines.begin()); - used_measure_lines.push_back (line); +#ifdef GTKOSX + redraw_measures (); +#else + Glib::signal_idle().connect (sigc::mem_fun (*this, &Editor::redraw_measures)); +#endif } - - return line; + update_tempo_based_rulers (); // redraw rulers and measures } void -Editor::draw_measures () +Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost) { - if (session == 0 || _show_measures == false) { + if (!_session) { return; } - TempoMap::BBTPointList::iterator i = current_bbt_points->begin(); - TempoMap::BBTPoint& p = (*i); - ArdourCanvas::SimpleLine *line; - gdouble xpos, last_xpos; - uint32_t cnt; - uint32_t color; + Timecode::BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame - if (current_bbt_points == 0 || current_bbt_points->empty()) { - return; + _session->bbt_time(leftmost, previous_beat); + _session->bbt_time(rightmost, next_beat); + + if (previous_beat.beats > 1) { + previous_beat.beats -= 1; + } else if (previous_beat.bars > 1) { + previous_beat.bars--; + previous_beat.beats += 1; } + previous_beat.ticks = 0; - cnt = 0; - last_xpos = 0; + if (_session->tempo_map().meter_at(rightmost).divisions_per_bar () > next_beat.beats + 1) { + next_beat.beats += 1; + } else { + next_beat.bars += 1; + next_beat.beats = 1; + } + next_beat.ticks = 0; - /* get the first bar spacing */ + delete current_bbt_points; + current_bbt_points = 0; - gdouble last_beat = DBL_MAX; - gdouble beat_spacing = 0; + current_bbt_points = _session->tempo_map().get_points (_session->tempo_map().frame_time (previous_beat), _session->tempo_map().frame_time (next_beat) + 1); +} - for (i = current_bbt_points->begin(); i != current_bbt_points->end() && beat_spacing == 0; ++i) { - TempoMap::BBTPoint& p = (*i); +void +Editor::hide_measures () +{ + if (tempo_lines) + tempo_lines->hide(); +} - switch (p.type) { - case TempoMap::Bar: - break; +bool +Editor::redraw_measures () +{ + draw_measures (); + return false; +} - case TempoMap::Beat: - xpos = frame_to_unit (p.frame); - if (last_beat < xpos) { - beat_spacing = xpos - last_beat; - } - last_beat = xpos; - } - } - - if (beat_spacing < 3.0) { - /* if the lines are too close together, they become useless */ +void +Editor::draw_measures () +{ + if (_session == 0 || _show_measures == false || + !current_bbt_points || current_bbt_points->empty()) { return; } - 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); - - switch (p.type) { - case TempoMap::Bar: - break; - - case TempoMap::Beat: - xpos = frame_to_unit (p.frame); - - if (p.beat == 1) { - color = color_map[cMeasureLineBeat]; - } else { - color = color_map[cMeasureLineBar]; - - /* only draw beat lines if the gaps between beats - are large. - */ - - if (beat_spacing < 4.0) { - 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; - } - break; - } + if (tempo_lines == 0) { + tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height(get_window())); } - /* the cursors are always on top of everything */ - - cursor_group->raise_to_top(); - time_line_group->lower_to_bottom(); + tempo_lines->draw(*current_bbt_points, frames_per_unit); } void -Editor::mouse_add_new_tempo_event (jack_nframes_t frame) +Editor::mouse_add_new_tempo_event (framepos_t frame) { - if (session == 0) { + if (_session == 0) { return; } - TempoMap& map(session->tempo_map()); + TempoMap& map(_session->tempo_map()); 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 (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (tempo_dialog); @@ -269,41 +228,42 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame) } double bpm = 0; - BBT_Time requested; - + Timecode::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(map, &before, &after)); + _session->add_command(new MementoCommand(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 (framepos_t frame) { - if (session == 0) { + if (_session == 0) { return; } - TempoMap& map(session->tempo_map()); + TempoMap& map(_session->tempo_map()); 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 (sigc::bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (meter_dialog); - + switch (meter_dialog.run ()) { case RESPONSE_ACCEPT: break; @@ -313,21 +273,19 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame) double bpb = meter_dialog.get_bpb (); bpb = max (1.0, bpb); // XXX is this a reasonable limit? - + double note_type = meter_dialog.get_note_type (); - BBT_Time requested; - + Timecode::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(map, &before, &map.get_state())); + _session->add_command(new MementoCommand(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 @@ -344,10 +302,10 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item) if ((tempo_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg; /*NOTREACHED*/ - } + } if (tempo_marker->tempo().movable()) { - Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo())); + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo())); } } @@ -369,17 +327,15 @@ Editor::edit_meter_section (MeterSection* section) double bpb = meter_dialog.get_bpb (); bpb = max (1.0, bpb); // XXX is this a reasonable limit? - + double note_type = meter_dialog.get_note_type (); begin_reversible_command (_("replace tempo mark")); - XMLNode &before = session->tempo_map().get_state(); - session->tempo_map().replace_meter (*section, Meter (bpb, note_type)); - XMLNode &after = session->tempo_map().get_state(); - session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); + XMLNode &before = _session->tempo_map().get_state(); + _session->tempo_map().replace_meter (*section, Meter (bpb, note_type)); + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); commit_reversible_command (); - - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); } void @@ -390,7 +346,7 @@ Editor::edit_tempo_section (TempoSection* section) tempo_dialog.set_position (Gtk::WIN_POS_MOUSE); ensure_float (tempo_dialog); - + switch (tempo_dialog.run ()) { case RESPONSE_ACCEPT: break; @@ -399,19 +355,22 @@ Editor::edit_tempo_section (TempoSection* section) } double bpm = tempo_dialog.get_bpm (); - BBT_Time when; + double nt = tempo_dialog.get_note_type (); + Timecode::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().move_tempo (*section, when); - XMLNode &after = session->tempo_map().get_state(); - session->add_command (new MementoCommand(session->tempo_map(), &before, &after)); + XMLNode &before = _session->tempo_map().get_state(); + _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(_session->tempo_map(), &before, &after)); commit_reversible_command (); - - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); } void @@ -428,7 +387,7 @@ Editor::edit_tempo_marker (ArdourCanvas::Item *item) if ((tempo_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg; /*NOTREACHED*/ - } + } edit_tempo_section (&tempo_marker->tempo()); } @@ -447,8 +406,8 @@ Editor::edit_meter_marker (ArdourCanvas::Item *item) if ((meter_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for meter is not a meter marker!") << endmsg; /*NOTREACHED*/ - } - + } + edit_meter_section (&meter_marker->meter()); } @@ -456,14 +415,12 @@ gint Editor::real_remove_tempo_marker (TempoSection *section) { begin_reversible_command (_("remove tempo mark")); - XMLNode &before = session->tempo_map().get_state(); - session->tempo_map().remove_tempo (*section); - XMLNode &after = session->tempo_map().get_state(); - session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); + XMLNode &before = _session->tempo_map().get_state(); + _session->tempo_map().remove_tempo (*section); + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); commit_reversible_command (); - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); - return FALSE; } @@ -481,10 +438,10 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item) if ((meter_marker = dynamic_cast (marker)) == 0) { fatal << _("programming error: marker for meter is not a meter marker!") << endmsg; /*NOTREACHED*/ - } + } if (meter_marker->meter().movable()) { - Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter())); + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter())); } } @@ -492,13 +449,11 @@ gint Editor::real_remove_meter_marker (MeterSection *section) { begin_reversible_command (_("remove tempo mark")); - XMLNode &before = session->tempo_map().get_state(); - session->tempo_map().remove_meter (*section); - XMLNode &after = session->tempo_map().get_state(); - session->add_command(new MementoCommand(session->tempo_map(), &before, &after)); + XMLNode &before = _session->tempo_map().get_state(); + _session->tempo_map().remove_meter (*section); + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); commit_reversible_command (); - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); - return FALSE; }