#include "prompter.h"
#include "editor_drag.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
/* Do a full update of the markers in this group */
update_marker_labels (group);
-
+
if (location->is_auto_punch()) {
update_punch_range_view ();
}
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();
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
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);
marker_menu->popup (1, ev->time);
} else if (loc->is_range_marker()) {
- if (range_marker_menu == 0) {
- build_range_marker_menu (false, false, false);
- }
+ delete range_marker_menu;
+ build_range_marker_menu (loc, false, false);
+
marker_menu_item = item;
range_marker_menu->popup (1, ev->time);
}
items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&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());
}
void
-Editor::build_range_marker_menu (bool loop, bool 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 | punch | session;
+ bool const loop_or_punch_or_session = loop_or_punch || session;
Menu *markerMenu = new Menu;
if (loop_or_punch_or_session) {
items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
items.push_back (MenuElem (_("Locate to Marker"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
items.push_back (MenuElem (_("Play from Marker"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
-
- if (!loop) {
- items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
- } else {
- items.push_back (MenuElem (_("Setup Loop Record"), sigc::mem_fun(*this, &Editor::setup_loop_record)));
- }
+ 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<Gtk::CheckMenuItem*> (&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());
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().type() == TempoSection::Constant) {
+ items.push_back (MenuElem (_("Make Ramped"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
+ } else {
+ items.push_back (MenuElem (_("Make 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)));
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);
}
}
}
// nothing for now
} else {
-
+
if (!selection->time.empty()) {
l->set (selection->time.start(), selection->time.end_frame());
} else if (!selection->regions.empty()) {
if (a >= extra) {
a -= extra;
}
-
+
framepos_t b = l->end ();
if (b < (max_framepos - extra)) {
b += extra;
}
}
+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<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ } else 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 TempoSection::Type type = tsp->type();
+ const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
+
+ begin_reversible_command (_("change tempo lock style"));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls);
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ }
+}
+
+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 TempoSection::Type type = (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp;
+ const PositionLockStyle pls = tsp->position_lock_style();
+
+ begin_reversible_command (_("change tempo type"));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls);
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ }
+}
+
void
Editor::toggle_marker_menu_lock ()
{
transport_loop_range_rect->set_x1 (x2);
transport_loop_range_rect->show();
-
+
} else {
transport_loop_range_rect->hide();
}
double pixel_start;
double pixel_end;
-
+
if (_session->config.get_punch_in()) {
pixel_start = sample_to_pixel (tpl->start());
} else {
} 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 {
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<Locations>(*(_session->locations()), &before, &after));
+ commit_reversible_command ();
}
void
projects / ardour.git / blobdiff