/*
- 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
*/
-#include <cstdio> // for sprintf, grrr
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
+#include <cstdio> // for sprintf, grrr
#include <cstdlib>
#include <cmath>
#include <string>
#include <climits>
-#include <libgnomecanvasmm.h>
-
-#include <pbd/error.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/memento_command.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/gtk_ui.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
+#include "ardour/session.h"
+#include "ardour/tempo.h"
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/utils.h>
+#include "canvas/canvas.h"
+#include "canvas/item.h"
+#include "canvas/line_set.h"
+
#include "editor.h"
#include "marker.h"
-#include "simpleline.h"
#include "tempo_dialog.h"
#include "rgb_macros.h"
#include "gui_thread.h"
#include "time_axis_view.h"
-#include "ardour_ui.h"
#include "tempo_lines.h"
+#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
delete_when_idle (*x);
}
metric_marks.clear ();
-}
+
+ for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ++x) {
+ delete (*x);
+ }
+ tempo_curves.clear ();
+}
void
Editor::draw_metric_marks (const Metrics& metrics)
{
-
- const MeterSection *ms;
- const TempoSection *ts;
char buf[64];
-
- remove_metric_marks ();
-
+ double max_tempo = 0.0;
+ double min_tempo = DBL_MAX;
+
+ remove_metric_marks (); // also clears tempo curves
+
for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
-
+ const MeterSection *ms;
+ const TempoSection *ts;
+
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, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
+ snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ());
+ metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker"), 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, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
+ if (UIConfiguration::instance().get_allow_non_quarter_pulse()) {
+ snprintf (buf, sizeof (buf), "%.3f/%.0f", ts->beats_per_minute(), ts->note_type());
+ } else {
+ snprintf (buf, sizeof (buf), "%.3f", ts->beats_per_minute());
+ }
+
+ max_tempo = max (max_tempo, ts->beats_per_minute());
+ min_tempo = min (min_tempo, ts->beats_per_minute());
+
+ tempo_curves.push_back (new TempoCurve (*this, *tempo_group, UIConfiguration::instance().color ("tempo curve"),
+ *(const_cast<TempoSection*>(ts)), ts->frame(), false));
+ if (ts->position_lock_style() == MusicTime) {
+ metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker music"), buf,
+ *(const_cast<TempoSection*>(ts))));
+ } else {
+ metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf,
*(const_cast<TempoSection*>(ts))));
+ }
+
+ }
+
+ }
+
+ const double min_tempo_range = 5.0;
+ const double tempo_delta = fabs (max_tempo - min_tempo);
+
+ if (tempo_delta < min_tempo_range) {
+ max_tempo += min_tempo_range - tempo_delta;
+ min_tempo += tempo_delta - min_tempo_range;
+ }
+
+ for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ) {
+ Curves::iterator tmp = x;
+ (*x)->set_max_tempo (max_tempo);
+ (*x)->set_min_tempo (min_tempo);
+ ++tmp;
+ if (tmp != tempo_curves.end()) {
+ (*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame());
+ } else {
+ (*x)->set_position ((*x)->tempo().frame(), UINT32_MAX);
}
-
+ ++x;
}
+ for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+ TempoMarker* tempo_marker;
+
+ if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
+ tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (10.0, max_tempo - min_tempo));
+ }
+ }
}
+
void
-Editor::tempo_map_changed (Change ignored)
+Editor::tempo_map_changed (const PropertyChange& /*ignored*/)
{
- if (!session) {
+ if (!_session) {
return;
}
- ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
+ ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored);
- compute_current_bbt_points(leftmost_frame, leftmost_frame + (nframes_t)(edit_packer.get_width() * frames_per_unit));
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
- update_tempo_based_rulers ();
- if (tempo_map_change_idle_handler_id < 0) {
- tempo_map_change_idle_handler_id = Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
+ if (tempo_lines) {
+ tempo_lines->tempo_map_changed();
}
+
+ std::vector<TempoMap::BBTPoint> grid;
+ compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples());
+ _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+ draw_measures (grid);
+ update_tempo_based_rulers (grid);
}
+struct CurveComparator {
+ bool operator() (TempoCurve const * a, TempoCurve const * b) {
+ return a->position() < b->position();
+ }
+};
+
void
-Editor::redisplay_tempo (bool immediate_redraw)
+Editor::marker_position_changed ()
{
- if (!session) {
+ if (!_session) {
return;
}
-
- compute_current_bbt_points (leftmost_frame, leftmost_frame + (nframes_t)(edit_packer.get_width() * frames_per_unit)); // redraw rulers and measures
- if (immediate_redraw) {
+ ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed);
+
+ if (tempo_lines) {
+ tempo_lines->tempo_map_changed();
+ }
- hide_measures ();
+ double max_tempo = 0.0;
+ double min_tempo = DBL_MAX;
- if (current_bbt_points) {
- draw_measures ();
+ for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+ TempoMarker* tempo_marker;
+ MeterMarker* meter_marker;
+ const TempoSection *ts;
+ const MeterSection *ms;
+
+ if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
+ if ((ts = &tempo_marker->tempo()) != 0) {
+ tempo_marker->set_position (ts->frame ());
+ char buf[64];
+ snprintf (buf, sizeof (buf), "%.3f", ts->beats_per_minute());
+ tempo_marker->set_name (buf);
+
+ max_tempo = max (max_tempo, ts->beats_per_minute());
+ min_tempo = min (min_tempo, ts->beats_per_minute());
+ }
}
+ if ((meter_marker = dynamic_cast<MeterMarker*> (*x)) != 0) {
+ if ((ms = &meter_marker->meter()) != 0) {
+ meter_marker->set_position (ms->frame ());
+ }
+ }
+ }
+
+ tempo_curves.sort (CurveComparator());
- } else if (tempo_map_change_idle_handler_id < 0) {
+ const double min_tempo_range = 5.0;
+ const double tempo_delta = fabs (max_tempo - min_tempo);
- tempo_map_change_idle_handler_id = Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
+ if (tempo_delta < min_tempo_range) {
+ max_tempo += min_tempo_range - tempo_delta;
+ min_tempo += tempo_delta - min_tempo_range;
+ }
+ for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ) {
+ Curves::iterator tmp = x;
+ (*x)->set_max_tempo (max_tempo);
+ (*x)->set_min_tempo (min_tempo);
+ ++tmp;
+ if (tmp != tempo_curves.end()) {
+ (*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame());
+ } else {
+ (*x)->set_position ((*x)->tempo().frame(), UINT32_MAX);
+ }
+ ++x;
}
- update_tempo_based_rulers ();
+ for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+ TempoMarker* tempo_marker;
+ if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
+ tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (max_tempo - min_tempo, 10.0));
+ }
+ }
+
+ std::vector<TempoMap::BBTPoint> grid;
+ compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples());
+ draw_measures (grid);
+ update_tempo_based_rulers (grid);
}
void
-Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
+Editor::redisplay_tempo (bool immediate_redraw)
{
- if (!session) {
+ 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, previous_beat);
- session->bbt_time(rightmost, next_beat);
+ if (immediate_redraw) {
+ std::vector<TempoMap::BBTPoint> grid;
- 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;
+ compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples());
+ draw_measures (grid);
+ update_tempo_based_rulers (grid); // redraw rulers and measure lines
- if (session->tempo_map().meter_at(rightmost).beats_per_bar () > next_beat.beats + 1) {
- next_beat.beats += 1;
} else {
- next_beat.bars += 1;
- next_beat.beats = 1;
+ Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::mem_fun (*this, &Editor::redisplay_tempo), true), false));
}
- next_beat.ticks = 0;
-
- if (current_bbt_points) {
- delete current_bbt_points;
- current_bbt_points = 0;
+}
+
+/* computes a grid starting a beat before and ending a beat after leftmost and rightmost respectively */
+void
+Editor::compute_current_bbt_points (std::vector<TempoMap::BBTPoint>& grid, framepos_t leftmost, framepos_t rightmost)
+{
+ if (!_session) {
+ return;
}
- current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
+ /* prevent negative values of leftmost from creeping into tempomap
+ */
+ const double lower_beat = floor (_session->tempo_map().beat_at_frame (leftmost)) - 1.0;
+ _session->tempo_map().get_grid (grid, max (_session->tempo_map().frame_at_beat (lower_beat), (framepos_t) 0), rightmost);
}
void
Editor::hide_measures ()
{
- if (tempo_lines)
+ if (tempo_lines) {
tempo_lines->hide();
-}
-
-bool
-Editor::redraw_measures ()
-{
- hide_measures ();
- draw_measures ();
- tempo_map_change_idle_handler_id = -1;
- return false;
+ }
}
void
-Editor::draw_measures ()
+Editor::draw_measures (std::vector<ARDOUR::TempoMap::BBTPoint>& grid)
{
- if (session == 0 || _show_measures == false ||
- !current_bbt_points || current_bbt_points->empty()) {
- return;
- }
-
- if (current_bbt_points == 0 || current_bbt_points->empty()) {
+ if (_session == 0 || _show_measures == false || distance (grid.begin(), grid.end()) == 0) {
return;
}
if (tempo_lines == 0) {
- tempo_lines = new TempoLines(*track_canvas, time_line_group);
+ tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical);
}
- tempo_lines->draw(*current_bbt_points, frames_per_unit);
+ const unsigned divisions = get_grid_beat_divisions(leftmost_frame);
+ tempo_lines->draw (grid, divisions, leftmost_frame, _session->frame_rate());
}
void
-Editor::mouse_add_new_tempo_event (nframes64_t frame)
+Editor::mouse_add_new_tempo_event (framepos_t frame)
{
- if (session == 0) {
+ if (_session == 0) {
return;
}
- TempoMap& map(session->tempo_map());
- TempoDialog tempo_dialog (map, frame, _("add"));
-
- tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- //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)));
+ TempoMap& map(_session->tempo_map());
- ensure_float (tempo_dialog);
+ begin_reversible_command (_("add tempo mark"));
+ const double pulse = map.pulse_at_frame (frame);
- switch (tempo_dialog.run()) {
- case RESPONSE_ACCEPT:
- break;
- default:
- return;
+ if (pulse > 0.0) {
+ XMLNode &before = map.get_state();
+ /* add music-locked ramped (?) tempo using the bpm/note type at frame*/
+ map.add_tempo (map.tempo_at_frame (frame), pulse, 0, TempoSection::Ramp, MusicTime);
+
+ XMLNode &after = map.get_state();
+ _session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
+ commit_reversible_command ();
}
- double bpm = 0;
- 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,nt), requested);
- XMLNode &after = map.get_state();
- session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
- commit_reversible_command ();
-
//map.dump (cerr);
}
void
-Editor::mouse_add_new_meter_event (nframes64_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);
-
- //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);
-
switch (meter_dialog.run ()) {
case RESPONSE_ACCEPT:
break;
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);
+ const double beat = map.beat_at_bbt (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()));
+
+ if (meter_dialog.get_lock_style() == MusicTime) {
+ map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), MusicTime);
+ } else {
+ map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), AudioTime);
+ }
+
+ _session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
commit_reversible_command ();
-
+
//map.dump (cerr);
}
void
Editor::remove_tempo_marker (ArdourCanvas::Item* item)
{
- Marker* marker;
+ ArdourMarker* marker;
TempoMarker* tempo_marker;
- if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) {
fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
}
if ((tempo_marker = dynamic_cast<TempoMarker*> (marker)) == 0) {
fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg;
- /*NOTREACHED*/
- }
+ abort(); /*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()));
}
}
void
Editor::edit_meter_section (MeterSection* section)
{
- MeterDialog meter_dialog (*section, _("done"));
-
- meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-
- ensure_float (meter_dialog);
+ MeterDialog meter_dialog (_session->tempo_map(), *section, _("done"));
switch (meter_dialog.run()) {
case RESPONSE_ACCEPT:
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<TempoMap>(session->tempo_map(), &before, &after));
+ double const note_type = meter_dialog.get_note_type ();
+ const Meter meter (bpb, note_type);
+
+ Timecode::BBT_Time when;
+ meter_dialog.get_bbt_time (when);
+
+ framepos_t const frame = _session->tempo_map().frame_at_bbt (when);
+ const PositionLockStyle pls = (meter_dialog.get_lock_style() == AudioTime) ? AudioTime : MusicTime;
+
+ begin_reversible_command (_("replace meter mark"));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ _session->tempo_map().replace_meter (*section, meter, when, frame, pls);
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
commit_reversible_command ();
}
void
Editor::edit_tempo_section (TempoSection* section)
{
- TempoDialog tempo_dialog (*section, _("done"));
-
- tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
+ TempoDialog tempo_dialog (_session->tempo_map(), *section, _("done"));
- ensure_float (tempo_dialog);
-
switch (tempo_dialog.run ()) {
case RESPONSE_ACCEPT:
break;
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);
+ const Tempo tempo (bpm, nt);
+
+ Timecode::BBT_Time when;
+ tempo_dialog.get_bbt_time (when);
+
+ const TempoSection::Type ttype (tempo_dialog.get_tempo_type());
+
begin_reversible_command (_("replace tempo mark"));
- 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<TempoMap>(session->tempo_map(), &before, &after));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ if (tempo_dialog.get_lock_style() == AudioTime) {
+ framepos_t const f = _session->tempo_map().predict_tempo_position (section, when).second;
+ _session->tempo_map().replace_tempo (*section, tempo, 0.0, f, ttype, AudioTime);
+ } else {
+ double const p = _session->tempo_map().predict_tempo_position (section, when).first;
+ _session->tempo_map().replace_tempo (*section, tempo, p, 0, ttype, MusicTime);
+ }
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
commit_reversible_command ();
}
void
-Editor::edit_tempo_marker (ArdourCanvas::Item *item)
+Editor::edit_tempo_marker (TempoMarker& tm)
{
- Marker* marker;
- TempoMarker* tempo_marker;
-
- if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
- fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
- /*NOTREACHED*/
- }
-
- if ((tempo_marker = dynamic_cast<TempoMarker*> (marker)) == 0) {
- fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg;
- /*NOTREACHED*/
- }
-
- edit_tempo_section (&tempo_marker->tempo());
+ edit_tempo_section (&tm.tempo());
}
void
-Editor::edit_meter_marker (ArdourCanvas::Item *item)
+Editor::edit_meter_marker (MeterMarker& mm)
{
- Marker* marker;
- MeterMarker* meter_marker;
-
- if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
- fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
- /*NOTREACHED*/
- }
-
- if ((meter_marker = dynamic_cast<MeterMarker*> (marker)) == 0) {
- fatal << _("programming error: marker for meter is not a meter marker!") << endmsg;
- /*NOTREACHED*/
- }
-
- edit_meter_section (&meter_marker->meter());
+ edit_meter_section (&mm.meter());
}
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<TempoMap>(session->tempo_map(), &before, &after));
+ XMLNode &before = _session->tempo_map().get_state();
+ _session->tempo_map().remove_tempo (*section, true);
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
commit_reversible_command ();
return FALSE;
void
Editor::remove_meter_marker (ArdourCanvas::Item* item)
{
- Marker* marker;
+ ArdourMarker* marker;
MeterMarker* meter_marker;
- if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) {
fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
}
if ((meter_marker = dynamic_cast<MeterMarker*> (marker)) == 0) {
fatal << _("programming error: marker for meter is not a meter marker!") << endmsg;
- /*NOTREACHED*/
- }
+ abort(); /*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()));
}
}
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<TempoMap>(session->tempo_map(), &before, &after));
+ XMLNode &before = _session->tempo_map().get_state();
+ _session->tempo_map().remove_meter (*section, true);
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
commit_reversible_command ();
return FALSE;
projects / ardour.git / blobdiff