#include "canvas/item.h"
#include "canvas/rectangle.h"
+#include "widgets/prompter.h"
+
#include "editor.h"
#include "marker.h"
#include "selection.h"
#include "editing.h"
#include "gui_thread.h"
#include "actions.h"
-#include "prompter.h"
#include "editor_drag.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
}
location->name_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+ location->position_lock_style_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
location->FlagsChanged.connect (*this, invalidator (*this), boost::bind (&Editor::location_flags_changed, this, location), gui_context());
pair<Location*,LocationMarkers*> newpair;
return;
}
- lam->set_name (location->name ());
+ if (location->position_lock_style() == MusicTime) {
+ lam->set_name ("\u266B" + location->name ()); // BEAMED EIGHTH NOTES
+ } else {
+ lam->set_name (location->name ());
+ }
+
lam->set_position (location->start(), location->end());
if (location->is_auto_loop()) {
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();
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));
}
}
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);
if (!tm->tempo().active()) {
return;
}
- can_remove = tm->tempo().movable() && !tm->tempo().locked_to_meter();
+ 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);
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);
- }
+ delete range_marker_menu;
+ build_range_marker_menu (loc, false, false);
+
marker_menu_item = item;
range_marker_menu->popup (1, ev->time);
}
using namespace Menu_Helpers;
marker_menu = new Menu;
+
MenuList& items = marker_menu->items();
marker_menu->set_name ("ArdourContextMenu");
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_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 {
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());
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().initial()) {
+ if (loc->tempo().clamped()) {
+ items.push_back (MenuElem (_("Don't Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+ } else {
+ items.push_back (MenuElem (_("Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+ }
+ }
+
+ if (loc->tempo().type() == TempoSection::Ramp) {
+ items.push_back (MenuElem (_("Set Constant"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
+ }
+
+ 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().position_lock_style() == AudioTime && can_remove) {
+ items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Lock to Music"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
} else if (can_remove) {
+ items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Lock to Audio"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
}
+ items.push_back (SeparatorElem());
+
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);
using namespace Menu_Helpers;
meter_marker_menu = new Menu;
+
MenuList& items = meter_marker_menu->items();
meter_marker_menu->set_name ("ArdourContextMenu");
using namespace Menu_Helpers;
new_transport_marker_menu = new Menu;
+
MenuList& items = new_transport_marker_menu->items();
new_transport_marker_menu->set_name ("ArdourContextMenu");
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);
}
}
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);
}
}
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);
}
}
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);
}
}
}
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);
}
}
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 (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt(), msp->frame(), pls);
+ _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) {
- begin_reversible_command (_("change tempo lock style"));
- XMLNode &before = _session->tempo_map().get_state();
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());
- _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->frame(), tsp->type(), pls);
+ 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<TempoMap>(_session->tempo_map(), &before, &after));
commit_reversible_command ();
}
}
-
+/* actally just resets the ts to constant using initial tempo */
void
Editor::toggle_tempo_type ()
{
dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
if (tm) {
- begin_reversible_command (_("change tempo type"));
+ 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<TempoMap>(_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();
- const TempoSection::Type type = (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp;
- _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->frame()
- , type, tsp->position_lock_style());
+ 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<TempoMap>(_session->tempo_map(), &before, &after));
}
}
+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<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ }
+ }
+}
+
void
Editor::toggle_marker_menu_lock ()
{
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);
+ ArdourWidgets::Prompter dialog (true);
string txt;
dialog.set_prompt (_("New Name:"));
} else {
- transport_punch_range_rect->hide();
+ transport_punch_range_rect->hide();
}
}
}
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
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