#include <string>
#include <climits>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <libgnomecanvasmm.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 <gtkmm2ext/doi.h>
+#include <gtkmm2ext/utils.h>
#include "editor.h"
#include "marker.h"
-#include "canvas-simpleline.h"
+#include "simpleline.h"
#include "tempo_dialog.h"
#include "rgb_macros.h"
#include "gui_thread.h"
+#include "color.h"
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
+using namespace Gtkmm2ext;
using namespace Editing;
void
void
Editor::draw_metric_marks (const Metrics& metrics)
{
+
+ const MeterSection *ms;
+ const TempoSection *ts;
+ char buf[64];
+
+ remove_metric_marks ();
+
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 ());
- metric_marks.push_back (new MeterMarker (*this, GNOME_CANVAS_GROUP(meter_group), color_map[cMeterMarker], buf,
- *(const_cast<MeterSection*>(ms)), PublicEditor::canvas_meter_marker_event));
+ metric_marks.push_back (new MeterMarker (*this, *meter_group, color_map[cMeterMarker], 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, GNOME_CANVAS_GROUP(tempo_group), color_map[cTempoMarker], buf,
- *(const_cast<TempoSection*>(ts)), PublicEditor::canvas_tempo_marker_event));
+ metric_marks.push_back (new TempoMarker (*this, *tempo_group, color_map[cTempoMarker], buf,
+ *(const_cast<TempoSection*>(ts))));
}
}
+
}
void
Editor::tempo_map_changed (Change ignored)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), 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);
+ session->bbt_time(leftmost_frame + current_page_frames(), 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;
+
+ if (session->tempo_map().meter_at(leftmost_frame + current_page_frames()).beats_per_bar () > next_beat.beats + 1) {
+ next_beat.beats += 1;
+ } 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));
+ update_tempo_based_rulers ();
} else {
current_bbt_points = 0;
}
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 ();
+ Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
+ } else {
+ hide_measures ();
}
-
}
void
Editor::hide_measures ()
{
for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) {
- gnome_canvas_item_hide (*i);
+ (*i)->hide();
free_measure_lines.push_back (*i);
}
used_measure_lines.clear ();
}
-GnomeCanvasItem *
+ArdourCanvas::SimpleLine *
Editor::get_time_line ()
{
- GnomeCanvasItem *line;
+ ArdourCanvas::SimpleLine *line;
if (free_measure_lines.empty()) {
- line = gnome_canvas_item_new (GNOME_CANVAS_GROUP(time_line_group),
- gnome_canvas_simpleline_get_type(),
- NULL);
- // cerr << "measure line @ " << line << endl;
+ line = new ArdourCanvas::SimpleLine (*time_line_group);
used_measure_lines.push_back (line);
} else {
line = free_measure_lines.front();
return line;
}
+bool
+Editor::lazy_hide_and_draw_measures ()
+{
+ hide_measures ();
+ draw_measures ();
+ return false;
+}
+
void
Editor::draw_measures ()
{
}
TempoMap::BBTPointList::iterator i;
- TempoMap::BBTPointList *all_bbt_points;
- GnomeCanvasItem *line;
- gdouble xpos, last_xpos;
- uint32_t cnt;
+ ArdourCanvas::SimpleLine *line;
+ 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;
}
- all_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
-
- cnt = 0;
- last_xpos = 0;
+ track_canvas.get_scroll_region (x1, y1, x2, y2);
/* get the first bar spacing */
- gdouble last_beat = DBL_MAX;
- gdouble beat_spacing = 0;
+ i = current_bbt_points->end();
+ i--;
+ bars = (*i).bar - (*current_bbt_points->begin()).bar;
+ beats = current_bbt_points->size() - bars;
- for (i = all_bbt_points->begin(); i != all_bbt_points->end() && beat_spacing == 0; ++i) {
- TempoMap::BBTPoint& p = (*i);
+ beat_density = (beats * 10.0f) / track_canvas.get_width ();
- 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;
- }
+ if (beat_density > 2.0f) {
+ /*
+ if the lines are too close together,
+ they become useless
+ */
+ return;
}
- for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) {
-
- TempoMap::BBTPoint& p = (*i);
+ for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
- switch (p.type) {
+ switch ((*i).type) {
case TempoMap::Bar:
break;
case TempoMap::Beat:
- xpos = p.frame / (gdouble) frames_per_unit;
-
- if (p.beat == 1) {
+
+ if ((*i).beat == 1) {
color = color_map[cMeasureLineBeat];
} else {
color = color_map[cMeasureLineBar];
are large.
*/
- if (beat_spacing < 25.0) {
- break;
+ if (beat_density > 0.25) {
+ break;
}
}
- if (cnt == 0 || xpos - last_xpos > 4.0) {
- line = get_time_line ();
- gtk_object_set (GTK_OBJECT(line),
- "x1", xpos,
- "x2", xpos,
- "y2", (gdouble) canvas_height,
- "color_rgba", color,
- NULL);
- gnome_canvas_item_raise_to_top (line);
- gnome_canvas_item_show (line);
- last_xpos = xpos;
- ++cnt;
- }
+ xpos = frame_to_unit ((*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;
}
}
- delete all_bbt_points;
-
/* the cursors are always on top of everything */
cursor_group->raise_to_top();
time_line_group->lower_to_bottom();
+ return;
}
void
-Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes_t frame)
{
if (session == 0) {
return;
}
-
TempoMap& map(session->tempo_map());
TempoDialog tempo_dialog (map, frame, _("add"));
- tempo_dialog.bpm_entry.signal_activate().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.ok_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), -1));
-
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- tempo_dialog.realize ();
- tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
+ 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);
- tempo_dialog.run();
-
- if (tempo_dialog.run_status() == 0) {
-
- double bpm = 0;
- BBT_Time requested;
-
- bpm = tempo_dialog.get_bpm ();
- bpm = max (0.01, bpm);
-
- tempo_dialog.get_bbt_time (requested);
+ switch (tempo_dialog.run()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
+ return;
+ }
- 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 ();
+ 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"));
+ XMLNode &before = map.get_state();
+ map.add_tempo (Tempo (bpm), requested);
+ XMLNode &after = map.get_state();
+ session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
+ commit_reversible_command ();
+
+ map.dump (cerr);
- map.dump (cerr);
- }
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
-Editor::mouse_add_new_meter_event (jack_nframes_t frame)
+Editor::mouse_add_new_meter_event (nframes_t frame)
{
if (session == 0) {
return;
TempoMap& map(session->tempo_map());
MeterDialog meter_dialog (map, frame, _("add"));
- meter_dialog.ok_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), 0));
- meter_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), -1));
-
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
- meter_dialog.realize ();
- meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
+ 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);
- meter_dialog.run ();
-
- if (meter_dialog.run_status() == 0) {
-
- 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);
+ switch (meter_dialog.run ()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
+ return;
+ }
- 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 ();
+ 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"));
+ 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);
- map.dump (cerr);
- }
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
-Editor::remove_tempo_marker (GnomeCanvasItem* item)
+Editor::remove_tempo_marker (ArdourCanvas::Item* item)
{
Marker* marker;
TempoMarker* tempo_marker;
- if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+ if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
/*NOTREACHED*/
}
{
MeterDialog meter_dialog (*section, _("done"));
- meter_dialog.ok_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), 0));
- meter_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), -1));
-
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
- meter_dialog.realize ();
- meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (meter_dialog);
- meter_dialog.run ();
-
- if (meter_dialog.run_status() == 0) {
+ switch (meter_dialog.run()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
+ return;
+ }
- double bpb = meter_dialog.get_bpb ();
- bpb = max (1.0, bpb); // XXX is this a reasonable limit?
+ 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 ();
- 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));
+ commit_reversible_command ();
- 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 ();
- }
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
{
TempoDialog tempo_dialog (*section, _("done"));
- tempo_dialog.bpm_entry.signal_activate().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.ok_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), -1));
-
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- tempo_dialog.realize ();
- tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (tempo_dialog);
- tempo_dialog.run ();
-
- if (tempo_dialog.run_status() == 0) {
+ switch (tempo_dialog.run ()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
+ return;
+ }
- double bpm = tempo_dialog.get_bpm ();
- BBT_Time when;
- tempo_dialog.get_bbt_time(when);
- bpm = max (0.01, bpm);
+ 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"));
+ 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<TempoMap>(session->tempo_map(), &before, &after));
+ commit_reversible_command ();
- 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 ();
- }
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
-Editor::edit_tempo_marker (GnomeCanvasItem *item)
+Editor::edit_tempo_marker (ArdourCanvas::Item *item)
{
Marker* marker;
TempoMarker* tempo_marker;
- if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+ if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
/*NOTREACHED*/
}
}
void
-Editor::edit_meter_marker (GnomeCanvasItem *item)
+Editor::edit_meter_marker (ArdourCanvas::Item *item)
{
Marker* marker;
MeterMarker* meter_marker;
- if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+ if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
/*NOTREACHED*/
}
Editor::real_remove_tempo_marker (TempoSection *section)
{
begin_reversible_command (_("remove tempo mark"));
- session->add_undo (session->tempo_map().get_memento());
+ XMLNode &before = session->tempo_map().get_state();
session->tempo_map().remove_tempo (*section);
- session->add_redo_no_execute (session->tempo_map().get_memento());
+ 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);
+
return FALSE;
}
void
-Editor::remove_meter_marker (GnomeCanvasItem* item)
+Editor::remove_meter_marker (ArdourCanvas::Item* item)
{
Marker* marker;
MeterMarker* meter_marker;
- if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+ if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg;
/*NOTREACHED*/
}
Editor::real_remove_meter_marker (MeterSection *section)
{
begin_reversible_command (_("remove tempo mark"));
- session->add_undo (session->tempo_map().get_memento());
+ XMLNode &before = session->tempo_map().get_state();
session->tempo_map().remove_meter (*section);
- session->add_redo_no_execute (session->tempo_map().get_memento());
+ 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);
+
return FALSE;
}
projects / ardour.git / blobdiff