*/
-#include <sigc++/retype.h>
#include <cstdlib>
#include <cmath>
-#include <libgnomecanvas/libgnomecanvas.h>
#include <gtkmm2ext/gtk_ui.h>
#include "ardour/session.h"
#include "ardour/profile.h"
#include "pbd/memento_command.h"
+#include "canvas/canvas.h"
+#include "canvas/item.h"
+#include "canvas/rectangle.h"
+
#include "editor.h"
#include "marker.h"
#include "selection.h"
#include "editing.h"
#include "gui_thread.h"
-#include "simplerect.h"
#include "actions.h"
#include "prompter.h"
#include "editor_drag.h"
void
Editor::add_new_location (Location *location)
{
- ENSURE_GUI_THREAD (*this, &Editor::add_new_location, location)
+ ENSURE_GUI_THREAD (*this, &Editor::add_new_location, location);
+
+ ArdourCanvas::Group* group = add_new_location_internal (location);
+ /* Do a full update of the markers in this group */
+ update_marker_labels (group);
+}
+
+/** Add a new location, without a time-consuming update of all marker labels;
+ * the caller must call update_marker_labels () after calling this.
+ * @return canvas group that the location's marker was added to.
+ */
+ArdourCanvas::Group*
+Editor::add_new_location_internal (Location* location)
+{
LocationMarkers *lam = new LocationMarkers;
uint32_t color;
lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
group = marker_group;
}
-
+
lam->end = 0;
} else if (location->is_auto_loop()) {
-
+
// transport marker
lam->start = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::LoopStart, location->start());
group = transport_marker_group;
} else if (location->is_auto_punch()) {
-
+
// transport marker
lam->start = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::PunchIn, location->start());
lam->end = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::PunchOut, location->end());
group = transport_marker_group;
-
+
} else if (location->is_session_range()) {
// session range
lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start());
lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end());
group = marker_group;
-
+
} else {
// range marker
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
lam->show ();
}
- location->start_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->end_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->name_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->FlagsChanged.connect (*this, invalidator (*this), ui_bind (&Editor::location_flags_changed, this, _1, _2), gui_context());
+ location->start_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+ location->end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+ location->changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+ location->name_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, _1, _2), gui_context());
pair<Location*,LocationMarkers*> newpair;
select_new_marker = false;
}
- lam->canvas_height_set (_canvas_height);
+ lam->canvas_height_set (_visible_canvas_height);
lam->set_show_lines (_show_marker_lines);
/* Add these markers to the appropriate sorted marker lists, which will render
- them unsorted until the update_marker_labels() below sorts them out.
+ them unsorted until a call to update_marker_labels() sorts them out.
*/
_sorted_marker_lists[group].push_back (lam->start);
if (lam->end) {
_sorted_marker_lists[group].push_back (lam->end);
}
- /* Do a full update of the markers in this group */
- update_marker_labels (group);
+ return group;
}
void
{
/* Get a time-ordered list of markers from the last time anything changed */
std::list<Marker*>& sorted = _sorted_marker_lists[m->get_parent()];
-
+
list<Marker*>::iterator i = find (sorted.begin(), sorted.end(), m);
list<Marker*>::iterator prev = sorted.end ();
if (prev != sorted.end()) {
/* Update just the available space between the previous marker and this one */
-
- double const p = frame_to_pixel (m->position() - (*prev)->position());
+
+ double const p = sample_to_pixel (m->position() - (*prev)->position());
if (m->label_on_left()) {
(*prev)->set_right_label_limit (p / 2);
} else {
(*prev)->set_right_label_limit (p);
}
-
+
if ((*prev)->label_on_left ()) {
m->set_left_label_limit (p);
} else {
if (next != sorted.end()) {
/* Update just the available space between this marker and the next */
-
- double const p = frame_to_pixel ((*next)->position() - m->position());
+
+ double const p = sample_to_pixel ((*next)->position() - m->position());
if ((*next)->label_on_left()) {
m->set_right_label_limit (p / 2);
}
/* We sort the list of markers and then set up the space available between each one */
-
+
sorted.sort (MarkerComparator ());
list<Marker*>::iterator i = sorted.begin ();
list<Marker*>::iterator prev = sorted.end ();
list<Marker*>::iterator next = i;
++next;
-
+
while (i != sorted.end()) {
if (prev != sorted.end()) {
- double const p = frame_to_pixel ((*i)->position() - (*prev)->position());
-
+ double const p = sample_to_pixel ((*i)->position() - (*prev)->position());
+
if ((*prev)->label_on_left()) {
(*i)->set_left_label_limit (p);
} else {
(*i)->set_left_label_limit (p / 2);
}
-
+
}
if (next != sorted.end()) {
- double const p = frame_to_pixel ((*next)->position() - (*i)->position());
+ double const p = sample_to_pixel ((*next)->position() - (*i)->position());
if ((*next)->label_on_left()) {
(*i)->set_right_label_limit (p / 2);
continue;
}
- add_new_location (*i);
+ add_new_location_internal (*i);
}
/* remove dead ones */
if (i->second->end) {
remove_sorted_marker (i->second->end);
}
-
- delete i->second;
+
+ LocationMarkers* m = i->second;
location_markers.erase (i);
+ delete m;
}
i = tmp;
if (_session) {
_session->locations()->apply (*this, &Editor::refresh_location_display_internal);
}
-}
-void
-Editor::refresh_location_display_s (const PropertyChange&)
-{
- ENSURE_GUI_THREAD (*this, &Editor::refresh_location_display_s, ignored)
-
- if (_session) {
- _session->locations()->apply (*this, &Editor::refresh_location_display_internal);
- }
+ update_marker_labels ();
}
void
if (start->type() != Marker::SessionStart) {
start->set_name (str);
}
-
+
if (end && end->type() != Marker::SessionEnd) {
end->set_name (str);
}
}
}
+void
+Editor::mouse_add_new_range (framepos_t where)
+{
+ if (!_session) {
+ return;
+ }
+
+ /* Make this marker 1/8th of the visible area of the session so that
+ it's reasonably easy to manipulate after creation.
+ */
+
+ framepos_t const end = where + current_page_samples() / 8;
+
+ string name;
+ _session->locations()->next_available_name (name, _("range"));
+ Location* loc = new Location (*_session, where, end, name, Location::IsRangeMarker);
+
+ begin_reversible_command (_("new range marker"));
+ XMLNode& before = _session->locations()->get_state ();
+ _session->locations()->add (loc, true);
+ XMLNode& after = _session->locations()->get_state ();
+ _session->add_command (new MementoCommand<Locations> (*_session->locations(), &before, &after));
+ commit_reversible_command ();
+}
+
void
Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
{
if (i->second->end) {
remove_sorted_marker (i->second->end);
}
-
-
- delete i->second;
+
+ LocationMarkers* m = i->second;
location_markers.erase (i);
+ delete m;
break;
}
}
Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
{
marker_menu_item = item;
-
+
MeterMarker* mm;
TempoMarker* tm;
dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
} 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);
if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) {
if (transport_marker_menu == 0) {
- build_range_marker_menu (true);
+ build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
}
-
+
marker_menu_item = item;
transport_marker_menu->popup (1, ev->time);
} else if (loc->is_mark()) {
-
+
delete marker_menu;
build_marker_menu (loc);
#endif
marker_menu_item = item;
marker_menu->popup (1, ev->time);
-
+
} else if (loc->is_range_marker()) {
if (range_marker_menu == 0) {
- build_range_marker_menu (false);
+ build_range_marker_menu (false, false);
}
marker_menu_item = item;
range_marker_menu->popup (1, ev->time);
}
-void
-Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
-{
- if (transport_marker_menu == 0) {
- build_range_marker_menu (true);
- }
-
- transport_marker_menu->popup (1, ev->time);
-}
-
void
Editor::build_marker_menu (Location* loc)
{
items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
- items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
+ items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
items.push_back (CheckMenuElem (_("Lock")));
CheckMenuItem* lock_item = static_cast<CheckMenuItem*> (&items.back());
glue_item->set_active ();
}
glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
-
+
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
}
void
-Editor::build_range_marker_menu (bool loop_or_punch_or_session)
+Editor::build_range_marker_menu (bool loop_or_punch, bool session)
{
using namespace Menu_Helpers;
+ bool const loop_or_punch_or_session = loop_or_punch | session;
+
Menu *markerMenu = new Menu;
if (loop_or_punch_or_session) {
transport_marker_menu = markerMenu;
markerMenu->set_name ("ArdourContextMenu");
items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
- items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
- items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
- if (!loop_or_punch_or_session) {
- items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
- }
- items.push_back (MenuElem (_("Set Range Mark from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+ 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)));
+ 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 Range Selection"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+ 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 (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_range)));
+ items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range)));
items.push_back (SeparatorElem());
if (!loop_or_punch_or_session) {
items.push_back (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
- items.push_back (MenuElem (_("Rename Range"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
+ items.push_back (MenuElem (_("Rename Range..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
+ }
+
+ if (!session) {
items.push_back (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
- 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()) {
}
void
-Editor::marker_menu_set_from_selection ()
+Editor::marker_menu_set_from_selection (bool /*force_regions*/)
{
Marker* marker;
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
- // nothing for now
- }
- else {
- /* if range selection use first to last */
+ // nothing for now
- if (mouse_mode == Editing::MouseRange) {
- if (!selection->time.empty()) {
- l->set_start (selection->time.start());
- l->set_end (selection->time.end_frame());
- }
- }
- else {
- if (!selection->regions.empty()) {
- l->set_start (selection->regions.start());
- l->set_end (selection->regions.end_frame());
- }
+ } else {
+
+ if (!selection->time.empty()) {
+ l->set (selection->time.start(), selection->time.end_frame());
+ } else if (!selection->regions.empty()) {
+ l->set (selection->regions.start(), selection->regions.end_frame());
}
}
}
}
}
+/** Temporal zoom to the range of the marker_menu_item (plus 5% either side) */
+void
+Editor::marker_menu_zoom_to_range ()
+{
+ Marker* marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"));
+ assert (marker);
+
+ bool is_start;
+ Location* l = find_location_from_marker (marker, is_start);
+ if (l == 0) {
+ return;
+ }
+
+ framecnt_t const extra = l->length() * 0.05;
+ framepos_t a = l->start ();
+ if (a >= extra) {
+ a -= extra;
+ }
+
+ framepos_t b = l->end ();
+ if (b < (max_framepos - extra)) {
+ b += extra;
+ }
+
+ temporal_zoom_by_frame (a, b);
+}
+
void
Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const
{
if (_session->get_play_loop() && ((tll = transport_loop_location()) != 0)) {
- double x1 = frame_to_pixel (tll->start());
- double x2 = frame_to_pixel (tll->end());
+ double x1 = sample_to_pixel (tll->start());
+ double x2 = sample_to_pixel (tll->end());
- transport_loop_range_rect->property_x1() = x1;
- transport_loop_range_rect->property_x2() = x2;
+ transport_loop_range_rect->set_x0 (x1);
+ transport_loop_range_rect->set_x1 (x2);
if (visibility) {
transport_loop_range_rect->show();
Location* tpl;
if ((_session->config.get_punch_in() || _session->config.get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
- guint track_canvas_width,track_canvas_height;
- track_canvas->get_size(track_canvas_width,track_canvas_height);
+ ArdourCanvas::Rect const v = _track_canvas->visible_area ();
if (_session->config.get_punch_in()) {
- transport_punch_range_rect->property_x1() = frame_to_pixel (tpl->start());
- transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES));
+ transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
+ transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES));
} else {
- transport_punch_range_rect->property_x1() = 0;
- transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width);
+ transport_punch_range_rect->set_x0 (0);
+ transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ());
}
if (visibility) {
Editor::toggle_marker_lines ()
{
_show_marker_lines = !_show_marker_lines;
-
+
for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
i->second->set_show_lines (_show_marker_lines);
}
i->second.remove (m);
}
}
+
+Marker *
+Editor::find_marker_from_location_id (PBD::ID const & id, bool is_start) const
+{
+ for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+ if (i->first->id() == id) {
+ return is_start ? i->second->start : i->second->end;
+ }
+ }
+
+ return 0;
+}