#include <algorithm>
#include <string>
#include <vector>
+#include <map>
#include <utility>
#include <sigc++/bind.h>
#include "pbd/whitespace.h"
#include "pbd/memento_command.h"
#include "pbd/enumwriter.h"
+#include "pbd/stateful_diff_command.h"
#include <gtkmm/menu.h>
#include <gtkmm/menuitem.h>
, automation_button (_("a"))
, visual_button (_("v"))
, gm (sess, slider, true, 115)
+ , _ignore_track_mode_change (false)
{
- set_button_names ();
-
gm.set_controls (_route, _route->shared_peak_meter(), _route->amp());
gm.get_level_meter().set_no_show_all();
gm.get_level_meter().setup_meters(50);
playlist_menu = 0;
playlist_action_menu = 0;
automation_action_menu = 0;
+ plugins_submenu_item = 0;
mode_menu = 0;
_view = 0;
_marked_for_display = true;
}
+ mute_changed (0);
+ update_solo_display ();
+
timestretch_rect = 0;
no_redraw = false;
destructive_track_mode_item = 0;
visual_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::visual_click));
hide_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::hide_click));
- solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false);
- solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
- mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
- mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
-
if (is_track()) {
/* use icon */
}
rec_enable_button->show_all ();
- rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false);
- rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false);
controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
+ ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
rec_enable_button->set_sensitive (_session->writable());
}
controls_hbox.pack_start(gm.get_level_meter(), false, false);
- _route->meter_change.connect (*this, boost::bind (&RouteTimeAxisView::meter_changed, this, _1));
- _route->input()->changed.connect (*this, boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2));
- _route->output()->changed.connect (*this, boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2));
+ _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
+ _route->input()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
+ _route->output()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+
+ if (!_route->is_master()) {
+ controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+ }
controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
- ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo"));
- ARDOUR_UI::instance()->tooltips().set_tip(*mute_button,_("Mute"));
- ARDOUR_UI::instance()->tooltips().set_tip(route_group_button, _("Route Group"));
- ARDOUR_UI::instance()->tooltips().set_tip(size_button,_("Display Height"));
- ARDOUR_UI::instance()->tooltips().set_tip(playlist_button,_("Playlist"));
- ARDOUR_UI::instance()->tooltips().set_tip(automation_button, _("Automation"));
- ARDOUR_UI::instance()->tooltips().set_tip(visual_button, _("Visual options"));
- ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("Hide this track"));
+ ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
+ ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
+ ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
+ ARDOUR_UI::instance()->set_tip(size_button,_("Display Height"));
+ ARDOUR_UI::instance()->set_tip(playlist_button,_("Playlist"));
+ ARDOUR_UI::instance()->set_tip(automation_button, _("Automation"));
+ ARDOUR_UI::instance()->set_tip(visual_button, _("Visual options"));
+ ARDOUR_UI::instance()->set_tip(hide_button, _("Hide this track"));
label_view ();
_y_position = -1;
- _route->mute_changed.connect (*this, boost::bind (&RouteUI::mute_changed, this, _1));
- _route->solo_changed.connect (*this, boost::bind (&RouteUI::solo_changed, this, _1));
- _route->processors_changed.connect (*this, boost::bind (&RouteTimeAxisView::processors_changed, this, _1));
- _route->NameChanged.connect (*this, boost::bind (&RouteTimeAxisView::route_name_changed, this));
- _route->solo_isolated_changed.connect (*this, boost::bind (&RouteUI::solo_changed, this, _1));
-
+ _route->processors_changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context());
+ _route->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::route_property_changed, this, _1), gui_context());
if (is_track()) {
- track()->TrackModeChanged.connect (*this, boost::bind (&RouteTimeAxisView::track_mode_changed, this));
- track()->FreezeChange.connect (*this, boost::bind (&RouteTimeAxisView::map_frozen, this));
- track()->DiskstreamChanged.connect (*this, boost::bind (&RouteTimeAxisView::diskstream_changed, this));
- get_diskstream()->SpeedChanged.connect (*this, boost::bind (&RouteTimeAxisView::speed_changed, this));
+ track()->TrackModeChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::track_mode_changed, this), gui_context());
+ track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context());
+ track()->SpeedChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::speed_changed, this), gui_context());
/* pick up the correct freeze state */
map_frozen ();
_editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
- route_group_menu = new RouteGroupMenu (
- _session,
- (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit)
- );
-
+ PropertyList* plist = new PropertyList();
+
+ plist->add (ARDOUR::Properties::edit, true);
+ plist->add (ARDOUR::Properties::mute, true);
+ plist->add (ARDOUR::Properties::solo, true);
+
+ route_group_menu = new RouteGroupMenu (_session, plist);
route_group_menu->GroupSelected.connect (sigc::mem_fun (*this, &RouteTimeAxisView::set_route_group_from_menu));
gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
RouteTimeAxisView::~RouteTimeAxisView ()
{
- drop_references ();
- drop_connections ();
+ CatchDeletion (this);
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
delete *i;
name_entry.set_text (x);
}
- ARDOUR_UI::instance()->tooltips().set_tip (name_entry, x);
+ ARDOUR_UI::instance()->set_tip (name_entry, x);
}
void
-RouteTimeAxisView::route_name_changed ()
+RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed)
{
- label_view ();
+ if (what_changed.contains (ARDOUR::Properties::name)) {
+ label_view ();
+ }
}
void
{
using namespace Menu_Helpers;
- automation_action_menu = manage (new Menu);
- MenuList& automation_items = automation_action_menu->items();
- automation_action_menu->set_name ("ArdourContextMenu");
-
- automation_items.push_back (MenuElem (_("Show all automation"),
- sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation)));
-
- automation_items.push_back (MenuElem (_("Show existing automation"),
- sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation)));
-
- automation_items.push_back (MenuElem (_("Hide all automation"),
- sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
+ delete automation_action_menu;
+ automation_action_menu = new Menu;
- if (subplugin_menu.get_attach_widget())
- subplugin_menu.detach();
+ MenuList& items = automation_action_menu->items();
- automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu));
- automation_items.back().set_sensitive (!subplugin_menu.items().empty());
-
- map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
- for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-
- automation_items.push_back (SeparatorElem());
-
- delete i->second->menu_item;
-
- automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param),
- sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
-
- i->second->menu_item = static_cast<Gtk::CheckMenuItem*>(&automation_items.back());
+ automation_action_menu->set_name ("ArdourContextMenu");
+
+ items.push_back (MenuElem (_("Show All Automation"),
+ sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation)));
+
+ items.push_back (MenuElem (_("Show Existing Automation"),
+ sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation)));
+
+ items.push_back (MenuElem (_("Hide All Automation"),
+ sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
+
+ /* attach the plugin submenu. It may have previously been used elsewhere, so we detach it first. */
- i->second->menu_item->set_active(show_automation(i->second->param));
- //i->second->menu_item->set_active(false);
- }
+ detach_menu (subplugin_menu);
+ items.push_back (MenuElem (_("Plugins"), subplugin_menu));
+ items.back().set_sensitive (!subplugin_menu.items().empty());
}
void
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
/* rebuild this every time */
build_automation_action_menu ();
+ detach_menu (*automation_action_menu);
items.push_back (MenuElem (_("Automation"), *automation_action_menu));
items.push_back (SeparatorElem());
}
RadioMenuItem::Group align_group;
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"),
+ 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 (get_diskstream()->alignment_style() == ExistingMaterial)
+ if (track()->alignment_style() == ExistingMaterial) {
align_existing_item->set_active();
+ }
- alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"),
+ 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 (get_diskstream()->alignment_style() == CaptureTime)
+ if (track()->alignment_style() == CaptureTime) {
align_capture_item->set_active();
+ }
if (!Profile->get_sae()) {
+
items.push_back (MenuElem (_("Alignment"), *alignment_menu));
- get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this));
+ track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
RadioMenuItem::Group mode_group;
- items.push_back (RadioMenuElem (mode_group, _("Normal mode"), sigc::bind (
+ 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());
- items.push_back (RadioMenuElem (mode_group, _("Tape mode"), sigc::bind (
+ 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());
- items.push_back (RadioMenuElem (mode_group, _("No layering 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());
-
+ _ignore_track_mode_change = true;
+
switch (track()->mode()) {
case ARDOUR::Destructive:
destructive_track_mode_item->set_active ();
non_layered_track_mode_item->set_active ();
break;
}
+
+ _ignore_track_mode_change = false;
}
- get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this));
-
- mode_menu = build_mode_menu();
- if (mode_menu)
- items.push_back (MenuElem (_("Mode"), *mode_menu));
+ track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
color_mode_menu = build_color_mode_menu();
- if (color_mode_menu)
+ if (color_mode_menu) {
items.push_back (MenuElem (_("Color Mode"), *color_mode_menu));
+ }
items.push_back (SeparatorElem());
}
void
RouteTimeAxisView::set_track_mode (TrackMode mode)
{
+ if (_ignore_track_mode_change) {
+ return;
+ }
+
RadioMenuItem* item;
RadioMenuItem* other_item;
RadioMenuItem* other_item_2;
return;
}
- if (item && other_item && other_item_2 && item->get_active() && track()->mode() != mode) {
+ if (item && other_item && other_item_2 && track()->mode() != mode) {
_set_track_mode (track().get(), mode, other_item, other_item_2);
}
}
return;
} else {
cerr << "would bounce this one\n";
+ /* XXX: radio menu item becomes inconsistent with track state in this case */
return;
}
}
gm.get_gain_slider().show();
mute_button->show();
- if (!_route || _route->is_control()) {
+ if (!_route || _route->is_monitor()) {
solo_button->hide();
} else {
solo_button->show();
gm.get_gain_slider().hide();
mute_button->show();
- if (!_route || _route->is_control()) {
+ if (!_route || _route->is_monitor()) {
solo_button->hide();
} else {
solo_button->show();
name_label.set_text (_route->name());
}
- if (height_changed) {
+ if (height_changed && !no_redraw) {
/* only emit the signal if the height really changed */
_route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
{
double speed = 1.0;
- if (get_diskstream() != 0) {
- speed = get_diskstream()->speed();
+ if (track()) {
+ speed = track()->speed();
}
if (_view) {
void
RouteTimeAxisView::align_style_changed ()
{
- switch (get_diskstream()->alignment_style()) {
+ switch (track()->alignment_style()) {
case ExistingMaterial:
if (!align_existing_item->get_active()) {
align_existing_item->set_active();
}
if (item->get_active()) {
- get_diskstream()->set_align_style (style);
+ track()->set_align_style (style);
}
}
ArdourPrompter prompter (true);
string name;
- boost::shared_ptr<Diskstream> ds = get_diskstream();
- if (!ds || ds->destructive())
+ boost::shared_ptr<Track> tr = track();
+ if (!tr || tr->destructive()) {
return;
+ }
- boost::shared_ptr<Playlist> pl = ds->playlist();
- if (!pl)
+ boost::shared_ptr<Playlist> pl = tr->playlist();
+ if (!pl) {
return;
+ }
- prompter.set_prompt (_("Name for playlist"));
+ prompter.set_title (_("Rename Playlist"));
+ prompter.set_prompt (_("New name for playlist:"));
prompter.set_initial_text (pl->name());
prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
{
string name;
- boost::shared_ptr<Diskstream> ds = get_diskstream();
- if (!ds || ds->destructive())
+ boost::shared_ptr<Track> tr = track ();
+ if (!tr || tr->destructive()) {
return;
+ }
- boost::shared_ptr<const Playlist> pl = ds->playlist();
- if (!pl)
+ boost::shared_ptr<const Playlist> pl = tr->playlist();
+ if (!pl) {
return;
+ }
name = pl->name();
ArdourPrompter prompter (true);
- prompter.set_prompt (_("Name for Playlist"));
+ prompter.set_title (_("New Copy Playlist"));
+ prompter.set_prompt (_("Name for new playlist:"));
prompter.set_initial_text (name);
prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
}
if (name.length()) {
- ds->use_copy_playlist ();
- ds->playlist()->set_name (name);
+ tr->use_copy_playlist ();
+ tr->playlist()->set_name (name);
}
}
{
string name;
- boost::shared_ptr<Diskstream> ds = get_diskstream();
- if (!ds || ds->destructive())
+ boost::shared_ptr<Track> tr = track ();
+ if (!tr || tr->destructive()) {
return;
+ }
- boost::shared_ptr<const Playlist> pl = ds->playlist();
- if (!pl)
+ boost::shared_ptr<const Playlist> pl = tr->playlist();
+ if (!pl) {
return;
+ }
name = pl->name();
ArdourPrompter prompter (true);
- prompter.set_prompt (_("Name for Playlist"));
+ prompter.set_title (_("New Playlist"));
+ prompter.set_prompt (_("Name for new playlist:"));
prompter.set_initial_text (name);
prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
}
if (name.length()) {
- ds->use_new_playlist ();
- ds->playlist()->set_name (name);
+ tr->use_new_playlist ();
+ tr->playlist()->set_name (name);
}
}
void
RouteTimeAxisView::clear_playlist ()
{
- boost::shared_ptr<Diskstream> ds = get_diskstream();
- if (!ds || ds->destructive())
+ boost::shared_ptr<Track> tr = track ();
+ if (!tr || tr->destructive()) {
return;
+ }
- boost::shared_ptr<Playlist> pl = ds->playlist();
- if (!pl)
+ boost::shared_ptr<Playlist> pl = tr->playlist();
+ if (!pl) {
return;
+ }
_editor.clear_playlist (pl);
}
void
RouteTimeAxisView::speed_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this));
-}
-
-void
-RouteTimeAxisView::diskstream_changed ()
-{
- Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::update_diskstream_display, this));
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this));
}
void
RouteTimeAxisView::update_diskstream_display ()
{
- if (!get_diskstream()) // bus
+ if (!track()) {
return;
+ }
map_frozen ();
}
{
double speed = 1.0;
- if (get_diskstream() != 0) {
- speed = get_diskstream()->speed();
+ if (track() != 0) {
+ speed = track()->speed();
}
nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
boost::shared_ptr<Playlist>
RouteTimeAxisView::playlist () const
{
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
- if ((ds = get_diskstream()) != 0) {
- return ds->playlist();
+ if ((tr = track()) != 0) {
+ return tr->playlist();
} else {
return boost::shared_ptr<Playlist> ();
}
boost::shared_ptr<Region>
RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
{
- boost::shared_ptr<Diskstream> stream;
- boost::shared_ptr<Playlist> playlist;
+ boost::shared_ptr<Playlist> pl = playlist ();
- if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) {
- return playlist->find_next_region (pos, point, dir);
+ if (pl) {
+ return pl->find_next_region (pos, point, dir);
}
return boost::shared_ptr<Region> ();
nframes64_t
RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
{
- boost::shared_ptr<Diskstream> stream;
- boost::shared_ptr<Playlist> playlist;
+ boost::shared_ptr<Playlist> pl = playlist ();
- if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) {
- return playlist->find_next_region_boundary (pos, dir);
+ if (pl) {
+ return pl->find_next_region_boundary (pos, dir);
}
return -1;
RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
{
boost::shared_ptr<Playlist> what_we_got;
- boost::shared_ptr<Diskstream> ds = get_diskstream();
+ boost::shared_ptr<Track> tr = track ();
boost::shared_ptr<Playlist> playlist;
bool ret = false;
- if (ds == 0) {
+ if (tr == 0) {
/* route is a bus, not a track */
return false;
}
- playlist = ds->playlist();
+ playlist = tr->playlist();
TimeSelection time (selection.time);
- float speed = ds->speed();
+ float const speed = tr->speed();
if (speed != 1.0f) {
for (TimeSelection::iterator i = time.begin(); i != time.end(); ++i) {
(*i).start = session_frame_to_track_frame((*i).start, speed);
}
}
- XMLNode &before = playlist->get_state();
+ playlist->clear_history ();
+ playlist->clear_owned_history ();
+
switch (op) {
case Cut:
if ((what_we_got = playlist->cut (time)) != 0) {
_editor.get_cut_buffer().add (what_we_got);
- _session->add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
+
+ vector<StatefulDiffCommand*> cmds;
+
+ playlist->rdiff (cmds);
+
+ for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
+ _session->add_command (*c);
+ }
+ _session->add_command (new StatefulDiffCommand (playlist));
ret = true;
}
break;
case Clear:
if ((what_we_got = playlist->cut (time)) != 0) {
- _session->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+ vector<StatefulDiffCommand*> cmds;
+
+ playlist->rdiff (cmds);
+
+ for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
+ _session->add_command (*c);
+ }
+ _session->add_command (new StatefulDiffCommand (playlist));
what_we_got->release ();
ret = true;
}
return false;
}
- boost::shared_ptr<Playlist> playlist = get_diskstream()->playlist();
+ boost::shared_ptr<Playlist> pl = playlist ();
PlaylistSelection::iterator p;
for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {}
return false;
}
- if (get_diskstream()->speed() != 1.0f) {
- pos = session_frame_to_track_frame(pos, get_diskstream()->speed() );
+ if (track()->speed() != 1.0f) {
+ pos = session_frame_to_track_frame (pos, track()->speed());
}
- XMLNode &before = playlist->get_state();
- playlist->paste (*p, pos, times);
- _session->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+ pl->clear_history ();
+ pl->paste (*p, pos, times);
+ _session->add_command (new StatefulDiffCommand (pl));
return true;
}
}
+struct PlaylistSorter {
+ bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
+ return a->sort_id() < b->sort_id();
+ }
+};
+
void
RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
{
delete playlist_menu;
- playlist_menu = new Menu;
- playlist_menu->set_name ("ArdourContextMenu");
- vector<boost::shared_ptr<Playlist> > playlists;
- boost::shared_ptr<Diskstream> ds = get_diskstream();
+ vector<boost::shared_ptr<Playlist> > playlists, playlists_tr;
+ boost::shared_ptr<Track> tr = track();
RadioMenuItem::Group playlist_group;
_session->playlists->get (playlists);
- for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
-
- if ((*i)->get_orig_diskstream_id() == ds->id()) {
- playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist),
- boost::weak_ptr<Playlist> (*i))));
-
- if (ds->playlist()->id() == (*i)->id()) {
- static_cast<RadioMenuItem*>(&playlist_items.back())->set_active();
- }
- } else if (ds->playlist()->id() == (*i)->id()) {
- playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist),
- boost::weak_ptr<Playlist>(*i))));
- static_cast<RadioMenuItem*>(&playlist_items.back())->set_active();
-
+ /* find the playlists for this diskstream */
+ for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+ if (((*i)->get_orig_diskstream_id() == tr->diskstream_id()) || (tr->playlist()->id() == (*i)->id())) {
+ playlists_tr.push_back(*i);
+ }
+ }
+
+ /* sort the playlists */
+ PlaylistSorter cmp;
+ sort (playlists_tr.begin(), playlists_tr.end(), cmp);
+
+ /* add the playlists to the menu */
+ for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) {
+ playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
+ RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
+ item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
+
+ if (tr->playlist()->id() == (*i)->id()) {
+ item->set_active();
+
}
}
-
+
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
+ playlist_items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
playlist_items.push_back (SeparatorElem());
if (!route_group() || !route_group()->is_active()) {
- playlist_items.push_back (MenuElem (_("New"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
- playlist_items.push_back (MenuElem (_("New Copy"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this)));
+ playlist_items.push_back (MenuElem (_("New..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
+ playlist_items.push_back (MenuElem (_("New Copy..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this)));
} else {
// Use a label which tells the user what is happening
playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::clear_playlists), this)));
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem(_("Select from all ..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
+ playlist_items.push_back (MenuElem(_("Select from all..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
}
void
-RouteTimeAxisView::use_playlist (boost::weak_ptr<Playlist> wpl)
+RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist> wpl)
{
assert (is_track());
+ // exit if we were triggered by deactivating the old playlist
+ if (!item->get_active()) {
+ return;
+ }
+
boost::shared_ptr<Playlist> pl (wpl.lock());
if (!pl) {
boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
if (apl) {
- if (get_diskstream()->playlist() == apl) {
- // radio button cotnrols mean this function is called for both the
- // old and new playlist
+ if (track()->playlist() == apl) {
+ // exit when use_playlist is called by the creation of the playlist menu
+ // or the playlist choice is unchanged
return;
}
- get_diskstream()->use_playlist (apl);
-
+ track()->use_playlist (apl);
if (route_group() && route_group()->is_active()) {
- //PBD::stacktrace(cerr, 20);
std::string group_string = "."+route_group()->name()+".";
std::string take_name = apl->name();
boost::shared_ptr<Playlist> ipl = session()->playlists->by_name(playlist_name);
if (!ipl) {
// No playlist for this track for this take yet, make it
- track->diskstream()->use_new_playlist();
- track->diskstream()->playlist()->set_name(playlist_name);
+ track->use_new_playlist();
+ track->playlist()->set_name(playlist_name);
} else {
- track->diskstream()->use_playlist(ipl);
+ track->use_playlist(ipl);
}
}
}
reset_meter();
}
+/** Toggle an automation track for a fully-specified Parameter (type,channel,id)
+ * Will add track if necessary.
+ */
void
-RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param)
+RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param)
{
RouteAutomationNode* node = automation_track(param);
-
- if (!node)
- return;
-
- bool showit = node->menu_item->get_active();
-
- if (showit != node->track->marked_for_display()) {
- if (showit) {
- node->track->set_marked_for_display (true);
- node->track->canvas_display()->show();
- node->track->get_state_node()->add_property ("shown", X_("yes"));
- } else {
- node->track->set_marked_for_display (false);
- node->track->hide ();
- node->track->get_state_node()->add_property ("shown", X_("no"));
- }
-
- /* now trigger a redisplay */
-
- if (!no_redraw) {
- _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */
+
+ if (!node) {
+ /* it doesn't exist yet, so we don't care about the button state: just add it */
+ create_automation_child (param, true);
+ } else {
+ bool yn = node->menu_item->get_active();
+ if (node->track->set_visibility (node->menu_item->get_active()) && yn) {
+
+ /* we made it visible, now trigger a redisplay. if it was hidden, then automation_track_hidden()
+ will have done that for us.
+ */
+
+ if (!no_redraw) {
+ _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */
+ }
}
}
}
RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param)
{
RouteAutomationNode* ran = automation_track(param);
+
if (!ran) {
return;
}
// if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here....
- _show_automation.erase(param);
+ _show_automation.erase (param);
ran->track->get_state_node()->add_property (X_("shown"), X_("no"));
if (ran->menu_item && !_hidden) {
+ ignore_toggle = true;
ran->menu_item->set_active (false);
+ ignore_toggle = false;
}
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ if (_route && !no_redraw) {
+ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ }
}
i->second->track->set_marked_for_display (true);
i->second->track->canvas_display()->show();
i->second->track->get_state_node()->add_property ("shown", X_("yes"));
- i->second->menu_item->set_active(true);
+ if (i->second->menu_item) {
+ i->second->menu_item->set_active(true);
+ }
}
/* Redraw */
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
void
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
- if ((*ii)->view != 0 && (*i)->processor->data().control((*ii)->what)->list()->size() > 0) {
+ if ((*ii)->view != 0 && (*i)->processor->control((*ii)->what)->list()->size() > 0) {
(*ii)->menu_item->set_active (true);
}
}
no_redraw = false;
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
void
i->second->track->set_marked_for_display (false);
i->second->track->hide ();
i->second->track->get_state_node()->add_property ("shown", X_("no"));
- i->second->menu_item->set_active (false);
+ if (i->second->menu_item) {
+ i->second->menu_item->set_active (false);
+ }
}
/* Hide processor automation */
_show_automation.clear();
no_redraw = false;
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
RouteTimeAxisView::region_view_added (RegionView* rv)
{
/* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */
- if(is_audio_track()) {
+ if (is_audio_track()) {
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
boost::shared_ptr<AutomationTimeAxisView> atv;
snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
boost::shared_ptr<AutomationControl> control
- = boost::dynamic_pointer_cast<AutomationControl>(processor->data().control(what, true));
+ = boost::dynamic_pointer_cast<AutomationControl>(processor->control(what, true));
pan->view = boost::shared_ptr<AutomationTimeAxisView>(
new AutomationTimeAxisView (_session, _route, processor, control,
i->mark_automation_visible (pan->what, false);
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ if (!no_redraw) {
+ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ }
}
void
}
void
-RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show)
+RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show)
{
using namespace Menu_Helpers;
}
}
- _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track)));
-
- if (hideit) {
- track->hide ();
- } else {
- _show_automation.insert (param);
+ _automation_tracks.insert (std::make_pair (param, new RouteAutomationNode(param, NULL, track)));
+ track->set_visibility (!hideit);
- if (!no_redraw) {
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
- }
+ if (!hideit) {
+ _show_automation.insert (param);
+ }
+
+ if (!no_redraw) {
+ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
- build_display_menu();
+ if (!EventTypeMap::instance().is_midi_parameter(param)) {
+ /* MIDI-related parameters are always in the menu, there's no
+ reason to rebuild the menu just because we added a automation
+ lane for one of them. But if we add a non-MIDI automation
+ lane, then we need to invalidate the display menu.
+ */
+ delete display_menu;
+ display_menu = 0;
+ }
}
-
void
RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p)
{
}
if (redraw && !no_redraw) {
-
- /* now trigger a redisplay */
-
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
}
i = tmp;
}
- if (deleted_processor_automation) {
- _route->gui_changed ("visible_tracks", this);
+ if (deleted_processor_automation && !no_redraw) {
+ _route->gui_changed ("track_height", this);
}
}
RouteTimeAxisView::automation_child(Evoral::Parameter param)
{
AutomationTracks::iterator i = _automation_tracks.find(param);
- if (i != _automation_tracks.end())
+ if (i != _automation_tracks.end()) {
return i->second->track;
- else
+ } else {
return boost::shared_ptr<AutomationTimeAxisView>();
+ }
}
void
}
void
-RouteTimeAxisView::meter_changed (void *src)
+RouteTimeAxisView::meter_changed ()
{
- ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed, src)
+ ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed)
reset_meter();
}
}
void
-RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu) {
+RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu)
+{
using namespace Menu_Helpers;
- if(!_underlay_streams.empty()) {
+ if (!_underlay_streams.empty()) {
MenuList& parent_items = parent_menu->items();
Menu* gs_menu = manage (new Menu);
gs_menu->set_name ("ArdourContextMenu");
bool
RouteTimeAxisView::set_underlay_state()
{
- if(!underlay_xml_node) {
+ if (!underlay_xml_node) {
return false;
}
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
child_node = *niter;
- if(child_node->name() != "Underlay") {
+ if (child_node->name() != "Underlay") {
continue;
}
}
void
-RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml)
+RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml)
{
- if(!v) {
+ if (!v) {
return;
}
RouteTimeAxisView& other = v->trackview();
- if(find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) {
- if(find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) {
+ if (find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) {
+ if (find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) {
fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
/*NOTREACHED*/
}
v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::add_ghost));
- if(update_xml) {
- if(!underlay_xml_node) {
+ if (update_xml) {
+ if (!underlay_xml_node) {
ensure_xml_node();
underlay_xml_node = xml_node->add_child("Underlays");
}
}
void
-RouteTimeAxisView::remove_underlay(StreamView* v)
+RouteTimeAxisView::remove_underlay (StreamView* v)
{
- if(!v) {
+ if (!v) {
return;
}
UnderlayList::iterator it = find(_underlay_streams.begin(), _underlay_streams.end(), v);
RouteTimeAxisView& other = v->trackview();
- if(it != _underlay_streams.end()) {
+ if (it != _underlay_streams.end()) {
UnderlayMirrorList::iterator gm = find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this);
- if(gm == other._underlay_mirrors.end()) {
+ if (gm == other._underlay_mirrors.end()) {
fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
/*NOTREACHED*/
}
_underlay_streams.erase(it);
other._underlay_mirrors.erase(gm);
- if(underlay_xml_node) {
+ if (underlay_xml_node) {
underlay_xml_node->remove_nodes_and_delete("id", v->trackview().route()->id().to_s());
}
}
{
rec_enable_button_label.set_text (_("r"));
- if (Config->get_solo_control_is_listen_control()) {
- switch (Config->get_listen_position()) {
- case AfterFaderListen:
- solo_button_label.set_text (_("A"));
- break;
- case PreFaderListen:
- solo_button_label.set_text (_("P"));
- break;
- }
- } else {
- solo_button_label.set_text (_("s"));
- }
-
+ if (_route && _route->solo_safe()) {
+ solo_button_label.set_text (X_("!"));
+ } else {
+ if (Config->get_solo_control_is_listen_control()) {
+ switch (Config->get_listen_position()) {
+ case AfterFaderListen:
+ solo_button_label.set_text (_("A"));
+ break;
+ case PreFaderListen:
+ solo_button_label.set_text (_("P"));
+ break;
+ }
+ } else {
+ solo_button_label.set_text (_("s"));
+ }
+ }
mute_button_label.set_text (_("m"));
}