2005-09-25 14:42:24 -04:00
|
|
|
/*
|
|
|
|
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
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
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 <cstdlib>
|
|
|
|
#include <cmath>
|
|
|
|
#include <string>
|
|
|
|
#include <climits>
|
|
|
|
|
2005-11-12 22:53:51 -05:00
|
|
|
#include <libgnomecanvasmm/libgnomecanvasmm.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include <pbd/error.h>
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
#include <gtkmm2ext/utils.h>
|
|
|
|
#include <gtkmm2ext/gtk_ui.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include <ardour/session.h>
|
|
|
|
#include <ardour/tempo.h>
|
2005-09-25 16:33:00 -04:00
|
|
|
#include <gtkmm2ext/doi.h>
|
2005-12-08 13:53:43 -05:00
|
|
|
#include <gtkmm2ext/utils.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include "editor.h"
|
|
|
|
#include "marker.h"
|
2005-11-27 17:35:04 -05:00
|
|
|
#include "simpleline.h"
|
2005-09-25 14:42:24 -04:00
|
|
|
#include "tempo_dialog.h"
|
|
|
|
#include "rgb_macros.h"
|
|
|
|
#include "gui_thread.h"
|
|
|
|
|
|
|
|
#include "i18n.h"
|
|
|
|
|
|
|
|
using namespace std;
|
2005-09-25 16:33:00 -04:00
|
|
|
using namespace sigc;
|
2005-09-25 14:42:24 -04:00
|
|
|
using namespace ARDOUR;
|
|
|
|
using namespace Gtk;
|
2005-12-08 13:53:43 -05:00
|
|
|
using namespace Gtkmm2ext;
|
2005-09-25 14:42:24 -04:00
|
|
|
using namespace Editing;
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::remove_metric_marks ()
|
|
|
|
{
|
|
|
|
/* don't delete these while handling events, just punt till the GUI is idle */
|
|
|
|
|
|
|
|
for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
|
|
|
|
delete_when_idle (*x);
|
|
|
|
}
|
|
|
|
metric_marks.clear ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::draw_metric_marks (const Metrics& metrics)
|
|
|
|
{
|
|
|
|
for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
|
|
|
|
const MeterSection *ms;
|
|
|
|
const TempoSection *ts;
|
|
|
|
char buf[64];
|
|
|
|
|
|
|
|
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
|
|
|
|
snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
|
2005-11-12 22:53:51 -05:00
|
|
|
metric_marks.push_back (new MeterMarker (*this, *meter_group, color_map[cMeterMarker], buf,
|
2005-11-24 09:59:36 -05:00
|
|
|
*(const_cast<MeterSection*>(ms))));
|
2005-09-25 14:42:24 -04:00
|
|
|
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
|
|
|
|
snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
|
2005-11-12 22:53:51 -05:00
|
|
|
metric_marks.push_back (new TempoMarker (*this, *tempo_group, color_map[cTempoMarker], buf,
|
2005-11-24 09:59:36 -05:00
|
|
|
*(const_cast<TempoSection*>(ts))));
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::tempo_map_changed (Change ignored)
|
|
|
|
{
|
2005-09-25 17:19:23 -04:00
|
|
|
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
redisplay_tempo ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::redisplay_tempo ()
|
|
|
|
{
|
|
|
|
update_tempo_based_rulers ();
|
|
|
|
|
|
|
|
remove_metric_marks ();
|
|
|
|
hide_measures ();
|
|
|
|
|
|
|
|
if (session && current_bbt_points) {
|
|
|
|
session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
|
|
|
|
draw_measures ();
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::hide_measures ()
|
|
|
|
{
|
|
|
|
for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) {
|
2005-11-12 22:53:51 -05:00
|
|
|
(*i)->hide();
|
2005-09-25 14:42:24 -04:00
|
|
|
free_measure_lines.push_back (*i);
|
|
|
|
}
|
|
|
|
used_measure_lines.clear ();
|
|
|
|
}
|
|
|
|
|
2005-11-27 17:35:04 -05:00
|
|
|
ArdourCanvas::SimpleLine *
|
2005-09-25 14:42:24 -04:00
|
|
|
Editor::get_time_line ()
|
|
|
|
{
|
2005-11-27 17:35:04 -05:00
|
|
|
ArdourCanvas::SimpleLine *line;
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
if (free_measure_lines.empty()) {
|
2005-11-27 17:35:04 -05:00
|
|
|
line = new ArdourCanvas::SimpleLine (*time_line_group);
|
2005-09-25 14:42:24 -04:00
|
|
|
// cerr << "measure line @ " << line << endl;
|
|
|
|
used_measure_lines.push_back (line);
|
|
|
|
} else {
|
|
|
|
line = free_measure_lines.front();
|
|
|
|
free_measure_lines.erase (free_measure_lines.begin());
|
|
|
|
used_measure_lines.push_back (line);
|
|
|
|
}
|
|
|
|
|
|
|
|
return line;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::draw_measures ()
|
|
|
|
{
|
|
|
|
if (session == 0 || _show_measures == false) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
TempoMap::BBTPointList::iterator i;
|
|
|
|
TempoMap::BBTPointList *all_bbt_points;
|
2005-11-27 17:35:04 -05:00
|
|
|
ArdourCanvas::SimpleLine *line;
|
2005-09-25 14:42:24 -04:00
|
|
|
gdouble xpos, last_xpos;
|
|
|
|
uint32_t cnt;
|
|
|
|
uint32_t color;
|
|
|
|
|
|
|
|
if (current_bbt_points == 0 || current_bbt_points->empty()) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
all_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
|
|
|
|
|
|
|
|
cnt = 0;
|
|
|
|
last_xpos = 0;
|
|
|
|
|
|
|
|
/* get the first bar spacing */
|
|
|
|
|
|
|
|
gdouble last_beat = DBL_MAX;
|
|
|
|
gdouble beat_spacing = 0;
|
|
|
|
|
|
|
|
for (i = all_bbt_points->begin(); i != all_bbt_points->end() && beat_spacing == 0; ++i) {
|
|
|
|
TempoMap::BBTPoint& p = (*i);
|
|
|
|
|
|
|
|
switch (p.type) {
|
|
|
|
case TempoMap::Bar:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TempoMap::Beat:
|
|
|
|
xpos = p.frame / (gdouble) frames_per_unit;
|
|
|
|
if (last_beat < xpos) {
|
|
|
|
beat_spacing = xpos - last_beat;
|
|
|
|
}
|
|
|
|
last_beat = xpos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) {
|
|
|
|
|
|
|
|
TempoMap::BBTPoint& p = (*i);
|
|
|
|
|
|
|
|
switch (p.type) {
|
|
|
|
case TempoMap::Bar:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TempoMap::Beat:
|
|
|
|
xpos = p.frame / (gdouble) frames_per_unit;
|
|
|
|
|
|
|
|
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 < 25.0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cnt == 0 || xpos - last_xpos > 4.0) {
|
|
|
|
line = get_time_line ();
|
2005-11-27 17:35:04 -05:00
|
|
|
line->property_x1() = xpos;
|
|
|
|
line->property_x2() = xpos;
|
2005-12-07 12:15:37 -05:00
|
|
|
line->property_y2() = canvas_height;
|
2005-11-27 17:35:04 -05:00
|
|
|
line->property_color_rgba() = color;
|
2005-11-12 22:53:51 -05:00
|
|
|
line->raise_to_top();
|
|
|
|
line->show();
|
2005-09-25 14:42:24 -04:00
|
|
|
last_xpos = xpos;
|
|
|
|
++cnt;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete all_bbt_points;
|
|
|
|
|
|
|
|
/* the cursors are always on top of everything */
|
|
|
|
|
2005-10-28 18:19:45 -04:00
|
|
|
cursor_group->raise_to_top();
|
|
|
|
time_line_group->lower_to_bottom();
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
|
|
|
|
{
|
|
|
|
if (session == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
TempoMap& map(session->tempo_map());
|
|
|
|
TempoDialog tempo_dialog (map, frame, _("add"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2005-12-08 13:53:43 -05:00
|
|
|
tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (tempo_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (tempo_dialog.run()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
2005-11-27 16:17:41 -05:00
|
|
|
|
|
|
|
double bpm = 0;
|
|
|
|
BBT_Time requested;
|
|
|
|
|
|
|
|
bpm = tempo_dialog.get_bpm ();
|
|
|
|
bpm = max (0.01, bpm);
|
|
|
|
|
|
|
|
tempo_dialog.get_bbt_time (requested);
|
|
|
|
|
|
|
|
begin_reversible_command (_("add tempo mark"));
|
|
|
|
session->add_undo (map.get_memento());
|
|
|
|
map.add_tempo (Tempo (bpm), requested);
|
|
|
|
session->add_redo_no_execute (map.get_memento());
|
|
|
|
commit_reversible_command ();
|
|
|
|
|
|
|
|
map.dump (cerr);
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::mouse_add_new_meter_event (jack_nframes_t frame)
|
|
|
|
{
|
|
|
|
if (session == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TempoMap& map(session->tempo_map());
|
|
|
|
MeterDialog meter_dialog (map, frame, _("add"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2005-12-08 13:53:43 -05:00
|
|
|
meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (meter_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (meter_dialog.run ()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
2005-11-27 16:17:41 -05:00
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
meter_dialog.get_bbt_time (requested);
|
|
|
|
|
|
|
|
begin_reversible_command (_("add meter mark"));
|
|
|
|
session->add_undo (map.get_memento());
|
|
|
|
map.add_meter (Meter (bpb, note_type), requested);
|
|
|
|
session->add_redo_no_execute (map.get_memento());
|
|
|
|
commit_reversible_command ();
|
|
|
|
|
|
|
|
map.dump (cerr);
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::remove_tempo_marker (ArdourCanvas::Item* item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
TempoMarker* tempo_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
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*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tempo_marker->tempo().movable()) {
|
2005-10-06 00:59:20 -04:00
|
|
|
Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::edit_meter_section (MeterSection* section)
|
|
|
|
{
|
|
|
|
MeterDialog meter_dialog (*section, _("done"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2005-11-12 17:07:07 -05:00
|
|
|
// GTK2FIX
|
|
|
|
// meter_dialog.realize ();
|
|
|
|
// meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (meter_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (meter_dialog.run()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
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 ();
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
begin_reversible_command (_("replace tempo mark"));
|
|
|
|
session->add_undo (session->tempo_map().get_memento());
|
|
|
|
session->tempo_map().replace_meter (*section, Meter (bpb, note_type));
|
|
|
|
session->add_redo_no_execute (session->tempo_map().get_memento());
|
|
|
|
commit_reversible_command ();
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Editor::edit_tempo_section (TempoSection* section)
|
|
|
|
{
|
|
|
|
TempoDialog tempo_dialog (*section, _("done"));
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
|
2005-11-12 17:07:07 -05:00
|
|
|
// GTK2FIX
|
|
|
|
// tempo_dialog.realize ();
|
|
|
|
// tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
ensure_float (tempo_dialog);
|
|
|
|
|
2005-11-27 16:17:41 -05:00
|
|
|
switch (tempo_dialog.run ()) {
|
|
|
|
case RESPONSE_ACCEPT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
2005-11-27 16:17:41 -05:00
|
|
|
|
|
|
|
double bpm = tempo_dialog.get_bpm ();
|
|
|
|
BBT_Time when;
|
|
|
|
tempo_dialog.get_bbt_time(when);
|
|
|
|
bpm = max (0.01, bpm);
|
|
|
|
|
|
|
|
begin_reversible_command (_("replace tempo mark"));
|
|
|
|
session->add_undo (session->tempo_map().get_memento());
|
|
|
|
session->tempo_map().replace_tempo (*section, Tempo (bpm));
|
|
|
|
session->tempo_map().move_tempo (*section, when);
|
|
|
|
session->add_redo_no_execute (session->tempo_map().get_memento());
|
|
|
|
commit_reversible_command ();
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::edit_tempo_marker (ArdourCanvas::Item *item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
TempoMarker* tempo_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
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());
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::edit_meter_marker (ArdourCanvas::Item *item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
MeterMarker* meter_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
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());
|
|
|
|
}
|
|
|
|
|
|
|
|
gint
|
|
|
|
Editor::real_remove_tempo_marker (TempoSection *section)
|
|
|
|
{
|
|
|
|
begin_reversible_command (_("remove tempo mark"));
|
|
|
|
session->add_undo (session->tempo_map().get_memento());
|
|
|
|
session->tempo_map().remove_tempo (*section);
|
|
|
|
session->add_redo_no_execute (session->tempo_map().get_memento());
|
|
|
|
commit_reversible_command ();
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-11-23 12:21:12 -05:00
|
|
|
Editor::remove_meter_marker (ArdourCanvas::Item* item)
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
Marker* marker;
|
|
|
|
MeterMarker* meter_marker;
|
|
|
|
|
2005-11-28 17:36:26 -05:00
|
|
|
if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
|
2005-09-25 14:42:24 -04:00
|
|
|
fatal << _("programming error: meter 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*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if (meter_marker->meter().movable()) {
|
2005-10-06 00:59:20 -04:00
|
|
|
Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gint
|
|
|
|
Editor::real_remove_meter_marker (MeterSection *section)
|
|
|
|
{
|
|
|
|
begin_reversible_command (_("remove tempo mark"));
|
|
|
|
session->add_undo (session->tempo_map().get_memento());
|
|
|
|
session->tempo_map().remove_meter (*section);
|
|
|
|
session->add_redo_no_execute (session->tempo_map().get_memento());
|
|
|
|
commit_reversible_command ();
|
|
|
|
return FALSE;
|
|
|
|
}
|