/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <libgnomecanvas/libgnomecanvas.h>
#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/window_title.h>
+#include "ardour/session.h"
#include "ardour/location.h"
#include "ardour/profile.h"
#include "pbd/memento_command.h"
lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
}
lam->end = 0;
-
+
} else if (location->is_auto_loop()) {
// transport marker
- lam->start = new Marker (*this, *transport_marker_group, color,
+ lam->start = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::LoopStart, location->start());
- lam->end = new Marker (*this, *transport_marker_group, color,
+ lam->end = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::LoopEnd, location->end());
-
+
} else if (location->is_auto_punch()) {
// transport marker
- lam->start = new Marker (*this, *transport_marker_group, color,
+ lam->start = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::PunchIn, location->start());
- lam->end = new Marker (*this, *transport_marker_group, color,
+ lam->end = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::PunchOut, location->end());
-
+
} else {
// range marker
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
- lam->start = new Marker (*this, *cd_marker_group, color,
+ lam->start = new Marker (*this, *cd_marker_group, color,
location->name(), Marker::Start, location->start());
- lam->end = new Marker (*this, *cd_marker_group, color,
+ lam->end = new Marker (*this, *cd_marker_group, color,
location->name(), Marker::End, location->end());
}
else {
-
- lam->start = new Marker (*this, *range_marker_group, color,
+
+ lam->start = new Marker (*this, *range_marker_group, color,
location->name(), Marker::Start, location->start());
- lam->end = new Marker (*this, *range_marker_group, color,
+ lam->end = new Marker (*this, *range_marker_group, color,
location->name(), Marker::End, location->end());
}
}
/* a location that isn't "marked" with markers */
return;
}
-
+
lam->set_name (location->name());
lam->set_position (location->start(), location->end());
Editor::location_flags_changed (Location *location, void *src)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
-
+
LocationMarkers *lam = find_location_markers (location);
-
+
if (lam == 0) {
/* a location that isn't "marked" with markers */
return;
} else {
lam->set_color_rgba (location_range_color);
}
-
+
if (location->is_hidden()) {
lam->hide();
} else {
lam->end->reparent (*cd_marker_group);
}
}
- else if ( (!location->is_cd_marker() || !ruler_cd_marker_action->get_active())
- && (lam->start->get_parent() == cd_marker_group))
+ else if ( (!location->is_cd_marker() || !ruler_cd_marker_action->get_active())
+ && (lam->start->get_parent() == cd_marker_group))
{
//cerr << "reparenting non-cd marker so it can be relocated: " << location->name() << endl;
if (location->is_mark()) {
for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
i->second->valid = false;
}
-
+
/* add new ones */
for (Locations::LocationList::iterator i = locations.begin(); i != locations.end(); ++i) {
if (!i->second->valid) {
delete i->second;
location_markers.erase (i);
- }
+ }
i = tmp;
}
Editor::refresh_location_display ()
{
ENSURE_GUI_THREAD(mem_fun(*this, &Editor::refresh_location_display));
-
+
if (session) {
session->locations()->apply (*this, &Editor::refresh_location_display_internal);
}
}
void
-Editor::LocationMarkers::hide()
+Editor::LocationMarkers::hide()
{
start->hide ();
if (end) { end->hide(); }
}
void
-Editor::LocationMarkers::show()
+Editor::LocationMarkers::show()
{
start->show ();
if (end) { end->show(); }
}
void
-Editor::LocationMarkers::set_name (const string& str)
+Editor::LocationMarkers::set_name (const string& str)
{
start->set_name (str);
if (end) { end->set_name (str); }
}
void
-Editor::LocationMarkers::set_position (nframes64_t startf,
- nframes64_t endf)
+Editor::LocationMarkers::set_position (nframes64_t startf,
+ nframes64_t endf)
{
start->set_position (startf);
if (end) { end->set_position (endf); }
}
void
-Editor::LocationMarkers::set_color_rgba (uint32_t rgba)
+Editor::LocationMarkers::set_color_rgba (uint32_t rgba)
{
start->set_color_rgba (rgba);
if (end) { end->set_color_rgba (rgba); }
session->locations()->next_available_name(markername, markerprefix);
if (!is_xrun && !choose_new_marker_name(markername)) {
return;
- }
+ }
Location *location = new Location (where, where, markername, (Location::Flags) flags);
session->begin_reversible_command (_("add marker"));
XMLNode &before = session->locations()->get_state();
}
void
-Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
+Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
{
Marker* marker;
bool is_start;
Editor::location_gone (Location *location)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location));
-
+
LocationMarkerMap::iterator i;
if (location == transport_loop_location()) {
if (location == transport_punch_location()) {
update_punch_range_view (true);
}
-
+
for (i = location_markers.begin(); i != location_markers.end(); ++i) {
if ((*i).first == location) {
delete (*i).second;
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
/*NOTREACHED*/
}
-
+
bool is_start;
Location * loc = find_location_from_marker (marker, is_start);
if (loc == transport_loop_location() || loc == transport_punch_location()) {
}
}
}
-#endif
+#endif
marker_menu_item = item;
markerMenu->popup (1, ev->time);
}
}
void
-Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
+Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
{
if (new_transport_marker_menu == 0) {
build_new_transport_marker_menu ();
}
void
-Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
+Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
{
if (transport_marker_menu == 0) {
build_range_marker_menu (true);
items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide)));
items.push_back (MenuElem (_("Rename Range"), mem_fun(*this, &Editor::marker_menu_rename)));
items.push_back (MenuElem (_("Remove Range"), mem_fun(*this, &Editor::marker_menu_remove)));
+ items.push_back (SeparatorElem());
}
- items.push_back (SeparatorElem());
-
items.push_back (MenuElem (_("Separate Regions in Range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location)));
items.push_back (MenuElem (_("Select All in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
if (!Profile->get_sae()) {
items.push_back (MenuElem (_("Set Loop Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop)));
items.push_back (MenuElem (_("Set Punch Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch)));
- new_transport_marker_menu->signal_unmap().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown));
+ new_transport_marker_menu->signal_unmap().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown));
}
void
Location* l;
bool is_start;
-
+
if ((l = find_location_from_marker (marker, is_start)) != 0) {
l->set_hidden (true, this);
}
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);
}
-
+
}
void
if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
separate_regions_using_location (*l);
}
-
+
}
void
Location* l;
bool is_start;
-
+
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
}
else {
//session->request_bounded_roll (l->start(), l->end());
-
+
if (is_start) {
session->request_locate (l->start(), true);
} else {
Location* l;
bool is_start;
-
+
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
if ((l = find_location_from_marker (marker, is_start)) == 0) {
return;
}
-
- nframes_t end = session->locations()->first_mark_after (marker->position());
+
+ nframes64_t start;
+ nframes64_t end;
+ session->locations()->marks_either_side (marker->position(), start, end);
if (end != max_frames) {
string range_name = l->name();
Location* l;
bool is_start;
-
+
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
Location* l;
bool is_start;
-
+
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
Location* l;
bool is_start;
-
+
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
}
else {
session->request_bounded_roll (l->start(), l->end());
-
+
}
}
}
Location* l;
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_play_loop(true);
session->request_locate (l2->start(), true);
dialog.set_prompt (_("New Name:"));
- WindowTitle title(Glib::get_application_name());
if (loc->is_mark()) {
- title += _("Rename Mark");
+ dialog.set_title (_("Rename Mark"));
} else {
- title += _("Rename Range");
+ dialog.set_title (_("Rename Range"));
}
- dialog.set_title(title.get_string());
-
dialog.set_name ("MarkRenameWindow");
dialog.set_size_request (250, -1);
dialog.set_position (Gtk::WIN_POS_MOUSE);
{
// hide rects
transport_bar_drag_rect->hide();
- range_marker_drag_rect->hide();
+
+ break_drag ();
}
void
double x1 = frame_to_pixel (tll->start());
double x2 = frame_to_pixel (tll->end());
-
+
transport_loop_range_rect->property_x1() = x1;
transport_loop_range_rect->property_x2() = x2;
-
+
if (visibility) {
transport_loop_range_rect->show();
}
Location* tpl;
- if ((Config->get_punch_in() || Config->get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
+ 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);
- if (Config->get_punch_in()) {
+ if (session->config.get_punch_in()) {
transport_punch_range_rect->property_x1() = frame_to_pixel (tpl->start());
- transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES));
+ transport_punch_range_rect->property_x2() = (session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES));
} else {
transport_punch_range_rect->property_x1() = 0;
- transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width);
+ transport_punch_range_rect->property_x2() = (session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width);
}
-
+
if (visibility) {
transport_punch_range_rect->show();
}
if (lam->start) {
lam->start->hide_line();
- }
+ }
if (lam->end) {
lam->end->hide_line();
}
}
- edit_point_clock_connection_a.disconnect();
- edit_point_clock_connection_b.disconnect();
-
- if (selection->markers.empty()) {
- edit_point_clock.set (0);
- return;
- }
-
for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
- (*x)->add_line (cursor_group, 0, canvas_height);
+ (*x)->add_line (cursor_group, 0, _canvas_height);
(*x)->show_line ();
}
-
- edit_point_clock.set (selection->markers.front()->position());
-
- bool ignored;
- Location* loc = find_location_from_marker (selection->markers.front(), ignored);
-
- if (loc) {
- edit_point_clock_connection_a = loc->changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
- edit_point_clock_connection_b = loc->start_changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
- }
-}
-
-void
-Editor::selected_marker_moved (Location* loc)
-{
- edit_point_clock.set (loc->start());
}
-struct SortLocationsByPosition {
+struct SortLocationsByPosition {
bool operator() (Location* a, Location* b) {
return a->start() < b->start();
}
SortLocationsByPosition cmp;
ordered.sort (cmp);
-
+
for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) {
if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_start()) {
if (n == 0) {
projects / ardour.git / blobdiff