X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=be7203f2db5f3044f821b898202a0954b08d67bf;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=831fe3b727deb2a82e1ba75e0f064b270cfad56c;hpb=cc862d31bd8c9005964dca94a9942f1b42847252;p=ardour.git diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 831fe3b727..be7203f2db 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -25,14 +25,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 @@ -44,6 +44,7 @@ #include "gui_thread.h" #include "time_axis_view.h" #include "ardour_ui.h" +#include "tempo_lines.h" #include "i18n.h" @@ -99,14 +100,14 @@ Editor::tempo_map_changed (Change ignored) return; } - ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored)); + ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored)); - compute_current_bbt_points(leftmost_frame, leftmost_frame + (nframes_t)(canvas_width * frames_per_unit)); + 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 - 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)); - } + redraw_measures (); } void @@ -116,23 +117,19 @@ Editor::redisplay_tempo (bool immediate_redraw) return; } - compute_current_bbt_points (leftmost_frame, leftmost_frame + (nframes_t)(canvas_width * frames_per_unit)); // redraw rulers and measures + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures + compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); if (immediate_redraw) { - - hide_measures (); - - if (current_bbt_points) { - draw_measures (); - } - - } else if (tempo_map_change_idle_handler_id < 0) { - - tempo_map_change_idle_handler_id = Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures)); - + redraw_measures (); + } else { +#ifdef GTKOSX + redraw_measures (); +#else + Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures)); +#endif } - - update_tempo_based_rulers (); + update_tempo_based_rulers (); // redraw rulers and measures } void @@ -148,9 +145,9 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost) session->bbt_time(rightmost, next_beat); if (previous_beat.beats > 1) { - previous_beat.beats -= 1; + previous_beat.beats -= 1; } else if (previous_beat.bars > 1) { - previous_beat.bars--; + previous_beat.bars--; previous_beat.beats += 1; } previous_beat.ticks = 0; @@ -163,10 +160,8 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost) } next_beat.ticks = 0; - if (current_bbt_points) { - delete current_bbt_points; - current_bbt_points = 0; - } + delete current_bbt_points; + current_bbt_points = 0; current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1); } @@ -174,43 +169,34 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost) void Editor::hide_measures () { - tempo_lines->hide(); - marker_tempo_lines->hide(); + 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 () { - if (session == 0 || _show_measures == false - || !current_bbt_points || current_bbt_points->empty()) { + if (session == 0 || _show_measures == false || + !current_bbt_points || current_bbt_points->empty()) { return; } - tempo_lines->draw(*current_bbt_points, frames_per_unit); - marker_tempo_lines->draw(*current_bbt_points, frames_per_unit); - - /*time_line_group->raise_to_top(); - time_line_group->lower(1);*/ - marker_time_line_group->raise_to_top(); - //marker_time_line_group->lower(1); - - /* the cursors are always on top of everything */ - cursor_group->raise_to_top(); + if (tempo_lines == 0) { + tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height); + } - return; + tempo_lines->draw(*current_bbt_points, frames_per_unit); } void -Editor::mouse_add_new_tempo_event (nframes_t frame) +Editor::mouse_add_new_tempo_event (nframes64_t frame) { if (session == 0) { return; @@ -220,7 +206,8 @@ Editor::mouse_add_new_tempo_event (nframes_t frame) 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 (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (tempo_dialog); @@ -235,22 +222,23 @@ Editor::mouse_add_new_tempo_event (nframes_t frame) 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)); commit_reversible_command (); - map.dump (cerr); + //map.dump (cerr); } void -Editor::mouse_add_new_meter_event (nframes_t frame) +Editor::mouse_add_new_meter_event (nframes64_t frame) { if (session == 0) { return; @@ -261,7 +249,9 @@ Editor::mouse_add_new_meter_event (nframes_t frame) 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 (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); ensure_float (meter_dialog); @@ -277,16 +267,16 @@ Editor::mouse_add_new_meter_event (nframes_t frame) 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(map, &before, &map.get_state())); commit_reversible_command (); - map.dump (cerr); + //map.dump (cerr); } void @@ -347,7 +337,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; @@ -356,15 +346,20 @@ Editor::edit_tempo_section (TempoSection* section) } 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); begin_reversible_command (_("replace tempo mark")); - XMLNode &before = session->tempo_map().get_state(); - session->tempo_map().replace_tempo (*section, Tempo (bpm)); + 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); - XMLNode &after = session->tempo_map().get_state(); + 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 (); }