#include <string>
#include <climits>
-#include <libgnomecanvasmm/libgnomecanvasmm.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 "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 ());
}
}
+
}
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));
if (current_bbt_points) {
delete current_bbt_points;
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 ();
+ update_tempo_based_rulers ();
}
-
}
void
ArdourCanvas::SimpleLine *
Editor::get_time_line ()
{
- ArdourCanvas::SimpleLine *line;
+ ArdourCanvas::SimpleLine *line;
if (free_measure_lines.empty()) {
- line = new ArdourCanvas::SimpleLine (*time_line_group);
- // 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;
}
- TempoMap::BBTPointList::iterator i;
- TempoMap::BBTPointList *all_bbt_points;
+ TempoMap::BBTPointList::iterator i = current_bbt_points->begin();
+ TempoMap::BBTPoint& p = (*i);
ArdourCanvas::SimpleLine *line;
gdouble xpos, last_xpos;
uint32_t cnt;
return;
}
- all_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
-
cnt = 0;
last_xpos = 0;
gdouble last_beat = DBL_MAX;
gdouble beat_spacing = 0;
- for (i = all_bbt_points->begin(); i != all_bbt_points->end() && beat_spacing == 0; ++i) {
+ for (i = current_bbt_points->begin(); i != current_bbt_points->end() && beat_spacing == 0; ++i) {
TempoMap::BBTPoint& p = (*i);
switch (p.type) {
break;
case TempoMap::Beat:
- xpos = p.frame / (gdouble) frames_per_unit;
+ xpos = frame_to_unit (p.frame);
if (last_beat < xpos) {
beat_spacing = xpos - last_beat;
}
}
}
- for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) {
+ double x1, x2, y1, y2;
+ track_canvas.get_scroll_region (x1, y1, x2, y2);
+ //y2 = 1000000000.0f;
- TempoMap::BBTPoint& p = (*i);
+ 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 = p.frame / (gdouble) frames_per_unit;
-
+ xpos = frame_to_unit (p.frame);
+
if (p.beat == 1) {
color = color_map[cMeasureLineBeat];
} else {
are large.
*/
- if (beat_spacing < 25.0) {
+ if (beat_spacing < 15.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() = canvas_height;
+ line->property_y2() = y2;
line->property_color_rgba() = color;
line->raise_to_top();
line->show();
}
}
- delete all_bbt_points;
-
/* the cursors are always on top of everything */
cursor_group->raise_to_top();
TempoDialog tempo_dialog (map, frame, _("add"));
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- // GTK2FIX
- // 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.get_bbt_time (requested);
begin_reversible_command (_("add tempo mark"));
- session->add_undo (map.get_memento());
+ XMLNode &before = map.get_state();
map.add_tempo (Tempo (bpm), requested);
- session->add_redo_no_execute (map.get_memento());
+ 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);
}
void
MeterDialog meter_dialog (map, frame, _("add"));
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
- // GTK2FIX
- // 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.get_bbt_time (requested);
begin_reversible_command (_("add meter mark"));
- session->add_undo (map.get_memento());
+ XMLNode &before = map.get_state();
map.add_meter (Meter (bpb, note_type), requested);
- session->add_redo_no_execute (map.get_memento());
+ 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);
}
void
MeterDialog meter_dialog (*section, _("done"));
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
- // GTK2FIX
- // meter_dialog.realize ();
- // meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (meter_dialog);
double note_type = meter_dialog.get_note_type ();
begin_reversible_command (_("replace tempo mark"));
- session->add_undo (session->tempo_map().get_memento());
+ XMLNode &before = session->tempo_map().get_state();
session->tempo_map().replace_meter (*section, Meter (bpb, note_type));
- 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);
}
void
TempoDialog tempo_dialog (*section, _("done"));
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- // GTK2FIX
- // tempo_dialog.realize ();
- // tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (tempo_dialog);
bpm = max (0.01, bpm);
begin_reversible_command (_("replace tempo mark"));
- session->add_undo (session->tempo_map().get_memento());
+ XMLNode &before = session->tempo_map().get_state();
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());
+ 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
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;
}
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