X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=8723aad488b7834832e032870f0be9fac015f63f;hb=c4578db595771b5db9572b23cfe3f9a7ebef66c3;hp=a8663edf6f71b07ba67814150057be2f6bab4f8b;hpb=c3a7730c88c3ac19fea36d2b7e0a779ced841a24;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index a8663edf6f..8723aad488 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -40,7 +40,7 @@ #include "prompter.h" #include "editor_drag.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -68,7 +68,7 @@ Editor::add_new_location (Location *location) /* Do a full update of the markers in this group */ update_marker_labels (group); - + if (location->is_auto_punch()) { update_punch_range_view (); } @@ -646,7 +646,7 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd) if (!choose_new_marker_name(markername)) { return; } - Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags); + Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags, get_grid_music_divisions (0)); begin_reversible_command (_("add marker")); XMLNode &before = _session->locations()->get_state(); @@ -741,7 +741,7 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) Location* loc = find_location_from_marker (marker, is_start); if (_session && loc) { - Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc)); + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc)); } } @@ -807,16 +807,21 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It bool can_remove = false; if (mm) { - can_remove = mm->meter().movable (); + can_remove = !mm->meter().initial (); + delete meter_marker_menu; + build_meter_marker_menu (mm, can_remove); + meter_marker_menu->popup (1, ev->time); } else if (tm) { - can_remove = tm->tempo().movable (); + if (!tm->tempo().active()) { + return; + } + can_remove = !tm->tempo().initial() && !tm->tempo().locked_to_meter(); + delete tempo_marker_menu; + build_tempo_marker_menu (tm, can_remove); + tempo_marker_menu->popup (1, ev->time); } else { return; } - - delete tempo_or_meter_marker_menu; - build_tempo_or_meter_marker_menu (can_remove); - tempo_or_meter_marker_menu->popup (1, ev->time); } void @@ -833,9 +838,8 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) { - if (transport_marker_menu == 0) { - build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range()); - } + delete transport_marker_menu; + build_range_marker_menu (loc, loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range()); marker_menu_item = item; transport_marker_menu->popup (1, ev->time); @@ -863,9 +867,9 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) marker_menu->popup (1, ev->time); } else if (loc->is_range_marker()) { - if (range_marker_menu == 0) { - build_range_marker_menu (false, false); - } + delete range_marker_menu; + build_range_marker_menu (loc, false, false); + marker_menu_item = item; range_marker_menu->popup (1, ev->time); } @@ -888,6 +892,7 @@ Editor::build_marker_menu (Location* loc) using namespace Menu_Helpers; marker_menu = new Menu; + MenuList& items = marker_menu->items(); marker_menu->set_name ("ArdourContextMenu"); @@ -911,9 +916,8 @@ Editor::build_marker_menu (Location* loc) items.push_back (CheckMenuElem (_("Glue to Bars and Beats"))); Gtk::CheckMenuItem* glue_item = static_cast (&items.back()); - if (loc->position_lock_style() == MusicTime) { - glue_item->set_active (); - } + glue_item->set_active (loc->position_lock_style() == MusicTime); + glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue)); items.push_back (SeparatorElem()); @@ -922,13 +926,14 @@ Editor::build_marker_menu (Location* loc) } void -Editor::build_range_marker_menu (bool loop_or_punch, bool session) +Editor::build_range_marker_menu (Location* loc, bool loop_or_punch, bool session) { using namespace Menu_Helpers; - bool const loop_or_punch_or_session = loop_or_punch | session; + bool const loop_or_punch_or_session = loop_or_punch || session; + + Menu* markerMenu = new Menu; - Menu *markerMenu = new Menu; if (loop_or_punch_or_session) { transport_marker_menu = markerMenu; } else { @@ -943,12 +948,17 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session) items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range))); items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead))); - if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false))); - } + items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false))); items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range))); + items.push_back (SeparatorElem()); + items.push_back (CheckMenuElem (_("Glue to Bars and Beats"))); + + Gtk::CheckMenuItem* glue_item = static_cast (&items.back()); + glue_item->set_active (loc->position_lock_style() == MusicTime); + glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue)); + items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range))); items.push_back (SeparatorElem()); @@ -965,22 +975,70 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session) if (!loop_or_punch_or_session || !session) { items.push_back (SeparatorElem()); } - + items.push_back (MenuElem (_("Separate Regions in Range"), sigc::mem_fun(*this, &Editor::marker_menu_separate_regions_using_location))); items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range))); - if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range))); + items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range))); +} + +void +Editor::build_tempo_marker_menu (TempoMarker* loc, bool can_remove) +{ + using namespace Menu_Helpers; + + tempo_marker_menu = new Menu; + + MenuList& items = tempo_marker_menu->items(); + tempo_marker_menu->set_name ("ArdourContextMenu"); + + if (!loc->tempo().initial()) { + if (loc->tempo().clamped()) { + items.push_back (MenuElem (_("Unlock Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped))); + } else { + items.push_back (MenuElem (_("Lock Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped))); + } + + TempoSection* prev_ts = _session->tempo_map().previous_tempo_section (&loc->tempo()); + if (prev_ts && prev_ts->end_note_types_per_minute() != loc->tempo().note_types_per_minute()) { + items.push_back (MenuElem (_("Continue"), sigc::mem_fun(*this, &Editor::continue_previous_tempo))); + } + } + + TempoSection* next_ts = _session->tempo_map().next_tempo_section (&loc->tempo()); + if (next_ts && next_ts->note_types_per_minute() != loc->tempo().end_note_types_per_minute()) { + items.push_back (MenuElem (_("Ramp to Next"), sigc::mem_fun(*this, &Editor::ramp_to_next_tempo))); } + + if (loc->tempo().type() == TempoSection::Ramp) { + items.push_back (MenuElem (_("Set Constant"), sigc::mem_fun(*this, &Editor::toggle_tempo_type))); + } + + if (loc->tempo().position_lock_style() == AudioTime && can_remove) { + items.push_back (MenuElem (_("Lock to Music"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style))); + } else if (can_remove) { + items.push_back (MenuElem (_("Lock to Audio"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style))); + } + + items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit))); + items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); + items.back().set_sensitive (can_remove); } void -Editor::build_tempo_or_meter_marker_menu (bool can_remove) +Editor::build_meter_marker_menu (MeterMarker* loc, bool can_remove) { using namespace Menu_Helpers; - tempo_or_meter_marker_menu = new Menu; - MenuList& items = tempo_or_meter_marker_menu->items(); - tempo_or_meter_marker_menu->set_name ("ArdourContextMenu"); + meter_marker_menu = new Menu; + + MenuList& items = meter_marker_menu->items(); + meter_marker_menu->set_name ("ArdourContextMenu"); + + if (loc->meter().position_lock_style() == AudioTime && can_remove) { + items.push_back (MenuElem (_("Lock to Music"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style))); + } else if (can_remove) { + items.push_back (MenuElem (_("Lock to Audio"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style))); + } items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit))); items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); @@ -994,6 +1052,7 @@ Editor::build_new_transport_marker_menu () using namespace Menu_Helpers; new_transport_marker_menu = new Menu; + MenuList& items = new_transport_marker_menu->items(); new_transport_marker_menu->set_name ("ArdourContextMenu"); @@ -1035,7 +1094,7 @@ Editor::marker_menu_select_using_range () bool is_start; if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { - set_selection_from_range (*l); + set_selection_from_range (*l); } } @@ -1053,7 +1112,7 @@ Editor::marker_menu_select_all_selectables_using_range () bool is_start; if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { - select_all_within (l->start(), l->end() - 1, 0, DBL_MAX, track_views, Selection::Set, false); + select_all_within (l->start(), l->end() - 1, 0, DBL_MAX, track_views, Selection::Set, false); } } @@ -1072,7 +1131,7 @@ Editor::marker_menu_separate_regions_using_location () bool is_start; if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { - separate_regions_using_location (*l); + separate_regions_using_location (*l); } } @@ -1180,17 +1239,18 @@ Editor::marker_menu_set_from_playhead () Location* l; bool is_start; + const int32_t divisions = get_grid_music_divisions (0); if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { - l->set_start (_session->audible_frame ()); + l->set_start (_session->audible_frame (), false, true, divisions); } else { if (is_start) { - l->set_start (_session->audible_frame ()); + l->set_start (_session->audible_frame (), false, true, divisions); } else { - l->set_end (_session->audible_frame ()); + l->set_end (_session->audible_frame (), false, true, divisions); } } } @@ -1216,7 +1276,7 @@ Editor::marker_menu_set_from_selection (bool /*force_regions*/) // nothing for now } else { - + if (!selection->time.empty()) { l->set (selection->time.start(), selection->time.end_frame()); } else if (!selection->regions.empty()) { @@ -1266,14 +1326,11 @@ Editor::marker_menu_loop_range () bool is_start; if ((l = find_location_from_marker (marker, is_start)) != 0) { - Location* l2; - if ((l2 = transport_loop_location()) != 0) { - l2->set (l->start(), l->end()); - - // enable looping, reposition and start rolling - _session->request_locate (l2->start(), true); - _session->request_play_loop(true); + if (l != transport_loop_location()) { + set_loop_range (l->start(), l->end(), _("loop range from marker")); } + _session->request_locate (l->start(), true); + _session->request_play_loop (true); } } @@ -1295,7 +1352,7 @@ Editor::marker_menu_zoom_to_range () if (a >= extra) { a -= extra; } - + framepos_t b = l->end (); if (b < (max_framepos - extra)) { b += extra; @@ -1347,6 +1404,158 @@ Editor::marker_menu_remove () } } +void +Editor::toggle_marker_lock_style () +{ + MeterMarker* mm; + TempoMarker* tm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + + if (mm) { + begin_reversible_command (_("change meter lock style")); + XMLNode &before = _session->tempo_map().get_state(); + MeterSection* msp = &mm->meter(); + + const Meter meter (msp->divisions_per_bar(), msp->note_divisor()); + const Timecode::BBT_Time bbt (msp->bbt()); + const PositionLockStyle pls = (msp->position_lock_style() == AudioTime) ? MusicTime : AudioTime; + + _session->tempo_map().replace_meter (*msp, meter, bbt, msp->frame(), pls); + + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); + commit_reversible_command (); + } else if (tm) { + TempoSection* tsp = &tm->tempo(); + + const double pulse = tsp->pulse(); + const framepos_t frame = tsp->frame(); + const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime; + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute()); + + begin_reversible_command (_("change tempo lock style")); + XMLNode &before = _session->tempo_map().get_state(); + + _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls); + + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); + commit_reversible_command (); + } +} +/* actally just resets the ts to constant using initial tempo */ +void +Editor::toggle_tempo_type () +{ + TempoMarker* tm; + MeterMarker* mm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + + if (tm) { + TempoSection* tsp = &tm->tempo(); + + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type()); + const double pulse = tsp->pulse(); + const framepos_t frame = tsp->frame(); + const PositionLockStyle pls = tsp->position_lock_style(); + + begin_reversible_command (_("set tempo to constant")); + XMLNode &before = _session->tempo_map().get_state(); + + _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls); + + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); + commit_reversible_command (); + } +} +/* clamped locks the previous section end tempo to the start tempo */ +void +Editor::toggle_tempo_clamped () +{ + TempoMarker* tm; + MeterMarker* mm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + + if (tm) { + begin_reversible_command (_("Clamp Tempo")); + XMLNode &before = _session->tempo_map().get_state(); + + TempoSection* tsp = &tm->tempo(); + TempoSection* prev = _session->tempo_map().previous_tempo_section (tsp); + + if (prev) { + /* set to the end tempo of the previous section */ + Tempo new_tempo (prev->end_note_types_per_minute(), prev->note_type(), tsp->end_note_types_per_minute()); + _session->tempo_map().gui_change_tempo (tsp, new_tempo); + } + + tsp->set_clamped (!tsp->clamped()); + + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); + commit_reversible_command (); + } +} + +void +Editor::continue_previous_tempo () +{ + TempoMarker* tm; + MeterMarker* mm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + + if (tm) { + TempoMap& tmap (_session->tempo_map()); + TempoSection* tsp = &tm->tempo(); + TempoSection* prev_ts = tmap.previous_tempo_section (&tm->tempo()); + if (prev_ts) { + const Tempo tempo (prev_ts->end_note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute()); + const double pulse = tsp->pulse(); + const framepos_t frame = tsp->frame(); + const PositionLockStyle pls = tsp->position_lock_style(); + + begin_reversible_command (_("continue previous tempo")); + XMLNode &before = _session->tempo_map().get_state(); + + tmap.replace_tempo (*tsp, tempo, pulse, frame, pls); + + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); + commit_reversible_command (); + } + } +} + +void +Editor::ramp_to_next_tempo () +{ + TempoMarker* tm; + MeterMarker* mm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + + if (tm) { + TempoMap& tmap (_session->tempo_map()); + TempoSection* tsp = &tm->tempo(); + TempoSection* next_ts = tmap.next_tempo_section (&tm->tempo()); + if (next_ts) { + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), next_ts->note_types_per_minute()); + const double pulse = tsp->pulse(); + const framepos_t frame = tsp->frame(); + const PositionLockStyle pls = tsp->position_lock_style(); + + begin_reversible_command (_("ramp to next tempo")); + XMLNode &before = _session->tempo_map().get_state(); + + tmap.replace_tempo (*tsp, tempo, pulse, frame, pls); + + XMLNode &after = _session->tempo_map().get_state(); + _session->add_command(new MementoCommand(_session->tempo_map(), &before, &after)); + commit_reversible_command (); + } + } +} + void Editor::toggle_marker_menu_lock () { @@ -1395,11 +1604,13 @@ Editor::rename_marker(ArdourMarker *marker) loc = find_location_from_marker (marker, is_start); - if (!loc) - return; + if (!loc) { + return; + } - if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range()) + if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range()) { return; + } ArdourPrompter dialog (true); string txt; @@ -1480,7 +1691,7 @@ Editor::update_loop_range_view () transport_loop_range_rect->set_x1 (x2); transport_loop_range_rect->show(); - + } else { transport_loop_range_rect->hide(); } @@ -1499,7 +1710,7 @@ Editor::update_punch_range_view () double pixel_start; double pixel_end; - + if (_session->config.get_punch_in()) { pixel_start = sample_to_pixel (tpl->start()); } else { @@ -1510,14 +1721,14 @@ Editor::update_punch_range_view () } else { pixel_end = sample_to_pixel (max_framepos); } - + transport_punch_range_rect->set_x0 (pixel_start); - transport_punch_range_rect->set_x1 (pixel_end); + transport_punch_range_rect->set_x1 (pixel_end); transport_punch_range_rect->show(); } else { - transport_punch_range_rect->hide(); + transport_punch_range_rect->hide(); } } @@ -1538,9 +1749,9 @@ Editor::marker_selection_changed () } struct SortLocationsByPosition { - bool operator() (Location* a, Location* b) { - return a->start() < b->start(); - } + bool operator() (Location* a, Location* b) { + return a->start() < b->start(); + } }; void @@ -1586,12 +1797,18 @@ Editor::toggle_marker_menu_glue () return; } + begin_reversible_command (_("change marker lock style")); + XMLNode &before = _session->locations()->get_state(); + if (loc->position_lock_style() == MusicTime) { loc->set_position_lock_style (AudioTime); } else { loc->set_position_lock_style (MusicTime); } + XMLNode &after = _session->locations()->get_state(); + _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); + commit_reversible_command (); } void