#include <algorithm>
#include <string>
#include <vector>
-#include <map>
+#include <map>
#include <utility>
#include <sigc++/bind.h>
#include "evoral/Parameter.hpp"
#include "ardour_ui.h"
+#include "debug.h"
+#include "global_signals.h"
#include "route_time_axis.h"
#include "automation_time_axis.h"
#include "canvas_impl.h"
playlist_button.unset_flags (Gtk::CAN_FOCUS);
automation_button.unset_flags (Gtk::CAN_FOCUS);
- route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false);
+ route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
}
_editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+ _editor.HorizontalPositionChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::horizontal_position_changed));
ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
PropertyList* plist = new PropertyList();
}
gint
-RouteTimeAxisView::edit_click (GdkEventButton *ev)
+RouteTimeAxisView::route_group_click (GdkEventButton *ev)
{
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
if (_route->route_group()) {
name_entry.set_text (x);
}
+ if (x != name_label.get_text()) {
+ name_label.set_text (x);
+ }
+
ARDOUR_UI::instance()->set_tip (name_entry, x);
}
void
RouteTimeAxisView::take_name_changed (void *src)
-
{
if (src != this) {
label_view ();
void
RouteTimeAxisView::playlist_click ()
{
- // always build a new action menu
-
- delete playlist_action_menu;
-
- playlist_action_menu = new Menu;
- playlist_action_menu->set_name ("ArdourContextMenu");
-
- build_playlist_menu (playlist_action_menu);
-
+ build_playlist_menu ();
conditionally_add_to_selection ();
playlist_action_menu->popup (1, gtk_get_current_event_time());
}
items.push_back (MenuElem (_("Color..."), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color)));
+ build_size_menu ();
+ items.push_back (MenuElem (_("Height"), *_size_menu));
+
items.push_back (SeparatorElem());
if (!Profile->get_sae()) {
// Hook for derived classes to add type specific stuff
append_extra_display_menu_items ();
- items.push_back (SeparatorElem());
if (is_track()) {
items.push_back (MenuElem (_("Layers"), *layers_menu));
- Menu* alignment_menu = manage (new Menu);
- MenuList& alignment_items = alignment_menu->items();
- alignment_menu->set_name ("ArdourContextMenu");
-
- RadioMenuItem::Group align_group;
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"),
- sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
- align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (track()->alignment_style() == ExistingMaterial) {
- align_existing_item->set_active();
- }
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"),
- sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
- align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (track()->alignment_style() == CaptureTime) {
- align_capture_item->set_active();
- }
-
if (!Profile->get_sae()) {
+ Menu* alignment_menu = manage (new Menu);
+ MenuList& alignment_items = alignment_menu->items();
+ alignment_menu->set_name ("ArdourContextMenu");
+
+ RadioMenuItem::Group align_group;
+
+ alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"),
+ sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
+ align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
+ if (track()->alignment_style() == ExistingMaterial) {
+ align_existing_item->set_active();
+ }
+
+ alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"),
+ sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
+ align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
+ if (track()->alignment_style() == CaptureTime) {
+ align_capture_item->set_active();
+ }
+
items.push_back (MenuElem (_("Alignment"), *alignment_menu));
track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+ Menu* mode_menu = manage (new Menu);
+ MenuList& mode_items = mode_menu->items ();
+ mode_menu->set_name ("ArdourContextMenu");
+
RadioMenuItem::Group mode_group;
- items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind (
+
+ mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind (
sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Normal)));
- normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+ normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
- items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind (
+ mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind (
sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Destructive)));
- destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+ destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
- items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"),
+ mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
- non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+ non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
_ignore_track_mode_change = true;
}
_ignore_track_mode_change = false;
- }
- track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+ items.push_back (MenuElem (_("Mode"), *mode_menu));
+ }
color_mode_menu = build_color_mode_menu();
if (color_mode_menu) {
}
items.push_back (SeparatorElem());
+
+ build_playlist_menu ();
+ items.push_back (MenuElem (_("Playlist"), *playlist_action_menu));
+
+ route_group_menu->rebuild (_route->route_group ());
+ items.push_back (MenuElem (_("Route Group"), *route_group_menu));
+
+ build_automation_action_menu ();
+ items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+
+ items.push_back (SeparatorElem());
}
items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun(*this, &RouteUI::toggle_route_active)));
}
void
-RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
+RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end)
{
double x1;
double x2;
set_samples_per_unit (_editor.get_current_zoom());
}
+void
+RouteTimeAxisView::horizontal_position_changed ()
+{
+ if (_view) {
+ _view->horizontal_position_changed ();
+ }
+}
+
void
RouteTimeAxisView::set_samples_per_unit (double spu)
{
speed = track()->speed();
}
- nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
- nframes_t end_adjusted = session_frame_to_track_frame(end, speed);
+ framepos_t const start_adjusted = session_frame_to_track_frame(start, speed);
+ framepos_t const end_adjusted = session_frame_to_track_frame(end, speed);
if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
_view->get_selectables (start_adjusted, end_adjusted, top, bot, results);
ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
name_entry.set_text (_route->name());
} else if (_session->route_name_internal (x)) {
- ARDOUR_UI::instance()->popup_error (_("You cannot create a track with that name as it is reserved for Ardour"));
+ ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"),
+ PROGRAM_NAME));
name_entry.set_text (_route->name());
} else {
_route->set_name (x);
}
boost::shared_ptr<Region>
-RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
+RouteTimeAxisView::find_next_region (framepos_t pos, RegionPoint point, int32_t dir)
{
boost::shared_ptr<Playlist> pl = playlist ();
return boost::shared_ptr<Region> ();
}
-nframes64_t
-RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
+framepos_t
+RouteTimeAxisView::find_next_region_boundary (framepos_t pos, int32_t dir)
{
boost::shared_ptr<Playlist> pl = playlist ();
}
}
- playlist->clear_history ();
- playlist->clear_owned_history ();
+ playlist->clear_changes ();
+ playlist->clear_owned_changes ();
switch (op) {
case Cut:
if ((what_we_got = playlist->cut (time)) != 0) {
_editor.get_cut_buffer().add (what_we_got);
- vector<StatefulDiffCommand*> cmds;
-
+ vector<Command*> cmds;
playlist->rdiff (cmds);
-
- for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
- _session->add_command (*c);
- }
+ _session->add_commands (cmds);
+
_session->add_command (new StatefulDiffCommand (playlist));
}
break;
case Clear:
if ((what_we_got = playlist->cut (time)) != 0) {
- vector<StatefulDiffCommand*> cmds;
-
+
+ vector<Command*> cmds;
playlist->rdiff (cmds);
-
- for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
- _session->add_command (*c);
- }
+ _session->add_commands (cmds);
_session->add_command (new StatefulDiffCommand (playlist));
what_we_got->release ();
}
return false;
}
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("paste to %1\n", pos));
+
if (track()->speed() != 1.0f) {
pos = session_frame_to_track_frame (pos, track()->speed());
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("modified paste to %1\n", pos));
}
- pl->clear_history ();
+ pl->clear_changes ();
pl->paste (*p, pos, times);
_session->add_command (new StatefulDiffCommand (pl));
};
void
-RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
+RouteTimeAxisView::build_playlist_menu ()
{
using namespace Menu_Helpers;
- if (!menu || !is_track()) {
+ if (!is_track()) {
return;
}
- MenuList& playlist_items = menu->items();
- menu->set_name ("ArdourContextMenu");
+ delete playlist_action_menu;
+ playlist_action_menu = new Menu;
+ playlist_action_menu->set_name ("ArdourContextMenu");
+
+ MenuList& playlist_items = playlist_action_menu->items();
+ playlist_action_menu->set_name ("ArdourContextMenu");
playlist_items.clear();
delete playlist_menu;
-
vector<boost::shared_ptr<Playlist> > playlists, playlists_tr;
boost::shared_ptr<Track> tr = track();
RadioMenuItem::Group playlist_group;
RouteTimeAxisView::region_view_added (RegionView* rv)
{
/* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */
- if (is_audio_track()) {
- for (Children::iterator i = children.begin(); i != children.end(); ++i) {
- boost::shared_ptr<AutomationTimeAxisView> atv;
-
- if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
- atv->add_ghost(rv);
- }
+ for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+ boost::shared_ptr<AutomationTimeAxisView> atv;
+
+ if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
+ atv->add_ghost(rv);
}
}
ProcessorAutomationNode* pan;
if ((pan = find_processor_automation_node (processor, what)) == 0) {
- error << _("programming error: ")
- << string_compose (X_("processor automation curve for %1:%2 not registered with track!"),
- processor->name(), what)
+ /* session state may never have been saved with new plugin */
+ error << _("programming error: ")
+ << string_compose (X_("processor automation curve for %1:%2/%3/%4 not registered with track!"),
+ processor->name(), what.type(), (int) what.channel(), what.id() )
<< endmsg;
/*NOTREACHED*/
return;
/* FIXME: ew */
char state_name[256];
- snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
+ snprintf (state_name, sizeof (state_name), "%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
boost::shared_ptr<AutomationControl> control
= boost::dynamic_pointer_cast<AutomationControl>(processor->control(what, true));
pan->view = boost::shared_ptr<AutomationTimeAxisView>(
- new AutomationTimeAxisView (_session, _route, processor, control,
- _editor, *this, false, parent_canvas, name, state_name));
+ new AutomationTimeAxisView (_session, _route, processor, control, control->parameter (),
+ _editor, *this, false, parent_canvas, name, state_name));
pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
if (prop) {
PBD::ID id (prop->value());
- RouteTimeAxisView* v = _editor.get_route_view_by_id (id);
+ RouteTimeAxisView* v = _editor.get_route_view_by_route_id (id);
if (v) {
add_underlay(v->view(), false);
return 0;
}
+
+void
+RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, bool show)
+{
+ boost::shared_ptr<AutomationControl> c = _route->gain_control();
+ if (!c) {
+ error << "Route has no gain automation, unable to add automation track view." << endmsg;
+ return;
+ }
+
+ gain_track.reset (new AutomationTimeAxisView (_session,
+ _route, _route->amp(), c, param,
+ _editor,
+ *this,
+ false,
+ parent_canvas,
+ _route->amp()->describe_parameter(param)));
+
+ add_automation_child (Evoral::Parameter(GainAutomation), gain_track, show);
+}
projects / ardour.git / blobdiff