#include <gdkmm/color.h>
#include <gdkmm/bitmap.h>
-#include <gtkmm2ext/grouped_buttons.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/tearoff.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/window_title.h>
-#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/cell_renderer_pixbuf_toggle.h>
+#include "gtkmm2ext/bindings.h"
+#include "gtkmm2ext/grouped_buttons.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/tearoff.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/window_title.h"
+#include "gtkmm2ext/choice.h"
+#include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audio_track.h"
#include "control_protocol/control_protocol.h"
#include "editor.h"
+#include "debug.h"
#include "keyboard.h"
#include "marker.h"
#include "playlist_selector.h"
, minsec_label (_("Mins:Secs"))
, bbt_label (_("Bars:Beats"))
, timecode_label (_("Timecode"))
- , frame_label (_("Samples"))
+ , samples_label (_("Samples"))
, tempo_label (_("Tempo"))
, meter_label (_("Meter"))
, mark_label (_("Location Markers"))
timecode_label.set_padding (5,0);
timecode_label.hide ();
timecode_label.set_no_show_all();
- frame_label.set_name ("EditorTimeButton");
- frame_label.set_size_request (-1, (int)timebar_height);
- frame_label.set_alignment (1.0, 0.5);
- frame_label.set_padding (5,0);
- frame_label.hide ();
- frame_label.set_no_show_all();
+ samples_label.set_name ("EditorTimeButton");
+ samples_label.set_size_request (-1, (int)timebar_height);
+ samples_label.set_alignment (1.0, 0.5);
+ samples_label.set_padding (5,0);
+ samples_label.hide ();
+ samples_label.set_no_show_all();
tempo_label.set_name ("EditorTimeButton");
tempo_label.set_size_request (-1, (int)timebar_height);
tempo_label.set_padding (5,0);
tempo_label.hide();
tempo_label.set_no_show_all();
+
meter_label.set_name ("EditorTimeButton");
meter_label.set_size_request (-1, (int)timebar_height);
meter_label.set_alignment (1.0, 0.5);
meter_label.set_padding (5,0);
meter_label.hide();
meter_label.set_no_show_all();
+
mark_label.set_name ("EditorTimeButton");
mark_label.set_size_request (-1, (int)timebar_height);
mark_label.set_alignment (1.0, 0.5);
mark_label.set_padding (5,0);
mark_label.hide();
mark_label.set_no_show_all();
+
cd_mark_label.set_name ("EditorTimeButton");
cd_mark_label.set_size_request (-1, (int)timebar_height);
cd_mark_label.set_alignment (1.0, 0.5);
cd_mark_label.set_padding (5,0);
cd_mark_label.hide();
cd_mark_label.set_no_show_all();
+
range_mark_label.set_name ("EditorTimeButton");
range_mark_label.set_size_request (-1, (int)timebar_height);
range_mark_label.set_alignment (1.0, 0.5);
range_mark_label.set_padding (5,0);
range_mark_label.hide();
range_mark_label.set_no_show_all();
+
transport_mark_label.set_name ("EditorTimeButton");
transport_mark_label.set_size_request (-1, (int)timebar_height);
transport_mark_label.set_alignment (1.0, 0.5);
initialize_rulers ();
initialize_canvas ();
+
_summary = new EditorSummary (this);
selection->TimeChanged.connect (sigc::mem_fun(*this, &Editor::time_selection_changed));
selection->TracksChanged.connect (sigc::mem_fun(*this, &Editor::track_selection_changed));
+
editor_regions_selection_changed_connection = selection->RegionsChanged.connect (sigc::mem_fun(*this, &Editor::region_selection_changed));
+
selection->PointsChanged.connect (sigc::mem_fun(*this, &Editor::point_selection_changed));
selection->MarkersChanged.connect (sigc::mem_fun(*this, &Editor::marker_selection_changed));
controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
controls_layout.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::edit_controls_button_release));
- controls_layout_size_request_connection = controls_layout.signal_size_request().connect (sigc::mem_fun (*this, &Editor::controls_layout_size_request));
_cursors = new MouseCursors;
ArdourCanvas::Canvas* time_pad = manage(new ArdourCanvas::Canvas());
ArdourCanvas::SimpleLine* pad_line_1 = manage(new ArdourCanvas::SimpleLine(*time_pad->root(),
0.0, 1.0, 100.0, 1.0));
+
pad_line_1->property_color_rgba() = 0xFF0000FF;
pad_line_1->show();
+
time_pad->show();
time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars) + 2);
_snapshots = new EditorSnapshots (this);
_locations = new EditorLocations (this);
- Gtk::Label* nlabel;
-
- nlabel = manage (new Label (_("Regions")));
- nlabel->set_angle (-90);
- the_notebook.append_page (_regions->widget (), *nlabel);
- nlabel = manage (new Label (_("Tracks & Busses")));
- nlabel->set_angle (-90);
- the_notebook.append_page (_routes->widget (), *nlabel);
- nlabel = manage (new Label (_("Snapshots")));
- nlabel->set_angle (-90);
- the_notebook.append_page (_snapshots->widget (), *nlabel);
- nlabel = manage (new Label (_("Route Groups")));
- nlabel->set_angle (-90);
- the_notebook.append_page (_route_groups->widget (), *nlabel);
- nlabel = manage (new Label (_("Ranges & Marks")));
- nlabel->set_angle (-90);
- the_notebook.append_page (_locations->widget (), *nlabel);
-
- the_notebook.set_show_tabs (true);
- the_notebook.set_scrollable (true);
- the_notebook.popup_disable ();
- the_notebook.set_tab_pos (Gtk::POS_RIGHT);
- the_notebook.show_all ();
-
+ add_notebook_page (_("Regions"), _regions->widget ());
+ add_notebook_page (_("Tracks & Busses"), _routes->widget ());
+ add_notebook_page (_("Snapshots"), _snapshots->widget ());
+ add_notebook_page (_("Route Groups"), _route_groups->widget ());
+ add_notebook_page (_("Ranges & Marks"), _locations->widget ());
+
+ _the_notebook.set_show_tabs (true);
+ _the_notebook.set_scrollable (true);
+ _the_notebook.popup_disable ();
+ _the_notebook.set_tab_pos (Gtk::POS_RIGHT);
+ _the_notebook.show_all ();
+
post_maximal_editor_width = 0;
post_maximal_horizontal_pane_position = 0;
post_maximal_editor_height = 0;
post_maximal_vertical_pane_position = 0;
+ _notebook_shrunk = false;
editor_summary_pane.pack1(edit_packer);
Button* summary_arrows_left_left = manage (new Button);
summary_arrows_left_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE)));
- summary_arrows_left_left->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press)));
- summary_arrows_left_left->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_release));
+ summary_arrows_left_left->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), LEFT)));
+ summary_arrows_left_left->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release));
+
Button* summary_arrows_left_right = manage (new Button);
summary_arrows_left_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE)));
- summary_arrows_left_right->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press)));
- summary_arrows_left_right->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_release));
+ summary_arrows_left_right->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), RIGHT)));
+ summary_arrows_left_right->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release));
+
VBox* summary_arrows_left = manage (new VBox);
summary_arrows_left->pack_start (*summary_arrows_left_left);
summary_arrows_left->pack_start (*summary_arrows_left_right);
- Button* summary_arrows_right_left = manage (new Button);
- summary_arrows_right_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE)));
- summary_arrows_right_left->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press)));
- summary_arrows_right_left->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_release));
- Button* summary_arrows_right_right = manage (new Button);
- summary_arrows_right_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE)));
- summary_arrows_right_right->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press)));
- summary_arrows_right_right->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_release));
+ Button* summary_arrows_right_up = manage (new Button);
+ summary_arrows_right_up->add (*manage (new Arrow (ARROW_UP, SHADOW_NONE)));
+ summary_arrows_right_up->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), UP)));
+ summary_arrows_right_up->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release));
+
+ Button* summary_arrows_right_down = manage (new Button);
+ summary_arrows_right_down->add (*manage (new Arrow (ARROW_DOWN, SHADOW_NONE)));
+ summary_arrows_right_down->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), DOWN)));
+ summary_arrows_right_down->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release));
+
VBox* summary_arrows_right = manage (new VBox);
- summary_arrows_right->pack_start (*summary_arrows_right_left);
- summary_arrows_right->pack_start (*summary_arrows_right_right);
+ summary_arrows_right->pack_start (*summary_arrows_right_up);
+ summary_arrows_right->pack_start (*summary_arrows_right_down);
Frame* summary_frame = manage (new Frame);
summary_frame->set_shadow_type (Gtk::SHADOW_ETCHED_IN);
+
summary_frame->add (*_summary);
summary_frame->show ();
editor_summary_pane.pack2 (_summary_hbox);
edit_pane.pack1 (editor_summary_pane, true, true);
- edit_pane.pack2 (the_notebook, false, true);
+ edit_pane.pack2 (_the_notebook, false, true);
editor_summary_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&editor_summary_pane)));
_snap_mode = SnapOff;
set_snap_mode (_snap_mode);
set_mouse_mode (MouseObject, true);
+ pre_internal_mouse_mode = MouseObject;
set_edit_point_preference (EditAtMouse, true);
_playlist_selector = new PlaylistSelector();
window_icons.push_back (icon);
}
if (!window_icons.empty()) {
- set_icon_list (window_icons);
+ // set_icon_list (window_icons);
set_default_icon_list (window_icons);
}
_show_marker_lines = false;
_over_region_trim_target = false;
+ /* Button bindings */
+
+ button_bindings = new Bindings;
+
+ XMLNode* node = button_settings();
+ if (node) {
+ for (XMLNodeList::const_iterator i = node->children().begin(); i != node->children().end(); ++i) {
+ button_bindings->load (**i);
+ }
+ }
+
constructed = true;
instant_save ();
image_socket_listener = 0 ;
}
#endif
-
+
+ delete button_bindings;
delete _routes;
delete _route_groups;
delete track_canvas;
delete _drags;
}
+XMLNode*
+Editor::button_settings () const
+{
+ XMLNode* settings = ARDOUR_UI::instance()->editor_settings();
+ XMLNode* node = find_named_node (*settings, X_("Buttons"));
+
+ if (!node) {
+ cerr << "new empty Button node\n";
+ node = new XMLNode (X_("Buttons"));
+ }
+
+ return node;
+}
+
void
Editor::add_toplevel_controls (Container& cont)
{
if (!is_visible ()) {
show_all ();
+ /* XXX: this is a bit unfortunate; it would probably
+ be nicer if we could just call show () above rather
+ than needing the show_all ()
+ */
+
/* re-hide stuff if necessary */
editor_list_button_toggled ();
parameter_changed ("show-summary");
- parameter_changed ("show-edit-group-tabs");
+ parameter_changed ("show-group-tabs");
parameter_changed ("show-zoom-tools");
/* now reset all audio_time_axis heights, because widgets might need
tv = (static_cast<TimeAxisView*>(*i));
tv->reset_height ();
}
+
+ if (current_mixer_strip) {
+ current_mixer_strip->hide_things ();
+ }
}
present ();
Location* loc = _session->locations()->auto_loop_location();
if (loc == 0) {
loc = new Location (*_session, 0, _session->current_end_frame(), _("Loop"),(Location::Flags) (Location::IsAutoLoop | Location::IsHidden));
+
if (loc->start() == loc->end()) {
loc->set_end (loc->start() + 1);
}
+
_session->locations()->add (loc, false);
_session->set_auto_loop_location (loc);
} else {
}
loc = _session->locations()->auto_punch_location();
+
if (loc == 0) {
loc = new Location (*_session, 0, _session->current_end_frame(), _("Punch"), (Location::Flags) (Location::IsAutoPunch | Location::IsHidden));
+
if (loc->start() == loc->end()) {
loc->set_end (loc->start() + 1);
}
+
_session->locations()->add (loc, false);
_session->set_auto_punch_location (loc);
} else {
region_edit_menu_split_item = 0;
region_edit_menu_split_multichannel_item = 0;
+ /* we might try to use items that are currently attached to a crossfade menu,
+ so clear that, too.
+ */
+ track_crossfade_context_menu.items().clear ();
+
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
if (rtv) {
boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
- /* Don't offer a region submenu if we are in internal edit mode, as we don't select regions in this
- mode and so offering region context is somewhat confusing.
- */
- if ((tr = rtv->track()) && ((pl = tr->playlist())) && !internal_editing()) {
- framepos_t const framepos = (framepos_t) floor ((double) get_preferred_edit_position() * tr->speed());
- uint32_t regions_at = pl->count_regions_at (framepos);
- add_region_context_items (edit_items, regions_at > 1);
+ if ((tr = rtv->track())) {
+ add_region_context_items (edit_items, tr);
}
}
MenuList& edit_items = track_crossfade_context_menu.items();
edit_items.clear ();
+ /* we might try to use items that are currently attached to a crossfade menu,
+ so clear that, too.
+ */
+ track_region_context_menu.items().clear ();
+
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_axisview);
if (atv) {
if ((tr = atv->track()) && ((pl = tr->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) != 0)) {
AudioPlaylist::Crossfades xfades;
+ framepos_t where;
+ bool ignored;
- apl->crossfades_at (get_preferred_edit_position (), xfades);
+ /* The xfade menu is a bit of a special case, as we always use the mouse position
+ to decide whether or not to display it (rather than the edit point). No particularly
+ strong reasons for this, other than it is a bit surprising to right-click on a xfade
+ and not get a menu.
+ */
+ mouse_frame (where, ignored);
+ apl->crossfades_at (where, xfades);
- bool many = xfades.size() > 1;
+ bool const many = xfades.size() > 1;
for (AudioPlaylist::Crossfades::iterator i = xfades.begin(); i != xfades.end(); ++i) {
add_crossfade_context_items (atv->audio_view(), (*i), edit_items, many);
}
- framepos_t framepos = (framepos_t) floor ((double) get_preferred_edit_position() * tr->speed());
- uint32_t regions_at = pl->count_regions_at (framepos);
- add_region_context_items (edit_items, regions_at > 1);
+ add_region_context_items (edit_items, tr);
}
}
}
void
-Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, bool multiple_regions_at_position)
+Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, boost::shared_ptr<Track> track)
{
using namespace Menu_Helpers;
the standard items.
*/
- /* we have to hack up the region name because "_" has a special
- meaning for menu titles.
- */
-
RegionSelection rs = get_regions_from_selection_and_entered ();
string::size_type pos = 0;
string menu_item_name = (rs.size() == 1) ? rs.front()->region()->name() : _("Selected Regions");
+ /* we have to hack up the region name because "_" has a special
+ meaning for menu titles.
+ */
+
while ((pos = menu_item_name.find ("_", pos)) != string::npos) {
menu_item_name.replace (pos, 1, "__");
pos += 2;
_popup_region_menu_item->set_label (menu_item_name);
}
+ /* Use the mouse position rather than the edit point to decide whether to show the `choose top region'
+ dialogue. If we use the edit point it gets a bit messy because the user still has to click over
+ *some* region in order to get the region context menu stuff to be displayed at all.
+ */
+
+ framepos_t mouse;
+ bool ignored;
+ mouse_frame (mouse, ignored);
+
edit_items.push_back (*_popup_region_menu_item);
- if (multiple_regions_at_position && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
+ if (track->playlist()->count_regions_at (mouse) > 1 && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
edit_items.push_back (*manage (_region_actions->get_action ("choose-top-region")->create_menu_item ()));
}
edit_items.push_back (SeparatorElem());
set_default_size (g.base_width, g.base_height);
move (x, y);
-
+
if (_session && (prop = node.property ("playhead"))) {
framepos_t pos;
sscanf (prop->value().c_str(), "%" PRIi64, &pos);
set_mouse_mode (MouseObject, true);
}
- if ((prop = node.property ("left-frame")) != 0){
+ if ((prop = node.property ("left-frame")) != 0) {
framepos_t pos;
if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) {
reset_x_origin (pos);
}
if ((prop = node.property (X_("editor-list-page")))) {
- the_notebook.set_current_page (atoi (prop->value ()));
+ _the_notebook.set_current_page (atoi (prop->value ()));
}
if ((prop = node.property (X_("show-marker-lines")))) {
geometry->add_property("y-off", string(buf));
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&edit_pane)->gobj()));
geometry->add_property("edit-horizontal-pane-pos", string(buf));
+ geometry->add_property("notebook-shrunk", _notebook_shrunk ? "1" : "0");
+ snprintf(buf,sizeof(buf), "%d",pre_maximal_horizontal_pane_position);
+ geometry->add_property("pre-maximal-horizontal-pane-position", string(buf));
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&editor_summary_pane)->gobj()));
geometry->add_property("edit-vertical-pane-pos", string(buf));
node->add_property (X_("show-editor-list"), tact->get_active() ? "yes" : "no");
}
- snprintf (buf, sizeof (buf), "%d", the_notebook.get_current_page ());
+ snprintf (buf, sizeof (buf), "%d", _the_notebook.get_current_page ());
node->add_property (X_("editor-list-page"), buf);
+ if (button_bindings) {
+ XMLNode* bb = new XMLNode (X_("Buttons"));
+ button_bindings->save (*bb);
+ node->add_child_nocopy (*bb);
+ }
+
node->add_property (X_("show-marker-lines"), _show_marker_lines ? "yes" : "no");
node->add_child_nocopy (selection->get_state ());
_zoom_box.set_border_width (0);
zoom_in_button.set_name ("EditorTimeButton");
- zoom_in_button.set_image (*(manage (new Image (Stock::ZOOM_IN, Gtk::ICON_SIZE_MENU))));
+ zoom_in_button.set_image (*(manage (new Image (::get_icon ("zoom_in")))));
zoom_in_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false));
zoom_out_button.set_name ("EditorTimeButton");
- zoom_out_button.set_image (*(manage (new Image (Stock::ZOOM_OUT, Gtk::ICON_SIZE_MENU))));
+ zoom_out_button.set_image (*(manage (new Image (::get_icon ("zoom_out")))));
zoom_out_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true));
zoom_out_full_button.set_name ("EditorTimeButton");
- zoom_out_full_button.set_image (*(manage (new Image (Stock::ZOOM_100, Gtk::ICON_SIZE_MENU))));
+ zoom_out_full_button.set_image (*(manage (new Image (::get_icon ("zoom_full")))));
zoom_out_full_button.signal_clicked().connect (sigc::mem_fun(*this, &Editor::temporal_zoom_session));
zoom_focus_selector.set_name ("ZoomFocusSelector");
/* Track zoom buttons */
tav_expand_button.set_name ("TrackHeightButton");
- tav_expand_button.set_size_request(-1,20);
- tav_expand_button.add (*(manage (new Image (::get_icon("tav_exp")))));
- tav_expand_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), true));
+ tav_expand_button.set_size_request (-1, 20);
+ tav_expand_button.add (*(manage (new Image (::get_icon ("tav_exp")))));
+ RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("expand-tracks"));
+ act->connect_proxy (tav_expand_button);
tav_shrink_button.set_name ("TrackHeightButton");
- tav_shrink_button.set_size_request(-1,20);
- tav_shrink_button.add (*(manage (new Image (::get_icon("tav_shrink")))));
- tav_shrink_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), false));
+ tav_shrink_button.set_size_request (-1, 20);
+ tav_shrink_button.add (*(manage (new Image (::get_icon ("tav_shrink")))));
+ act = ActionManager::get_action (X_("Editor"), X_("shrink-tracks"));
+ act->connect_proxy (tav_shrink_button);
_zoom_box.pack_start (tav_shrink_button);
_zoom_box.pack_start (tav_expand_button);
toolbar_hbox.pack_start (*_tools_tearoff, false, false);
hbox->pack_start (snap_box, false, false);
- hbox->pack_start (*nudge_box, false, false);
+ if (!Profile->get_small_screen()) {
+ hbox->pack_start (*nudge_box, false, false);
+ } else {
+ ARDOUR_UI::instance()->editor_transport_box().pack_start (*nudge_box, false, false);
+ }
hbox->pack_start (panic_box, false, false);
hbox->show_all ();
}
void
-Editor::commit_reversible_command ()
+Editor::begin_reversible_command (GQuark q)
{
if (_session) {
- _session->commit_reversible_command ();
- }
-}
-
-void
-Editor::set_route_group_solo (Route& route, bool yn)
-{
- RouteGroup *route_group;
-
- if ((route_group = route.route_group()) != 0) {
- route_group->apply (&Route::set_solo, yn, this);
- } else {
- route.set_solo (yn, this);
+ _session->begin_reversible_command (q);
}
}
void
-Editor::set_route_group_mute (Route& route, bool yn)
+Editor::commit_reversible_command ()
{
- RouteGroup *route_group = 0;
-
- if ((route_group = route.route_group()) != 0) {
- route_group->apply (&Route::set_mute, yn, this);
- } else {
- route.set_mute (yn, this);
+ if (_session) {
+ _session->commit_reversible_command ();
}
}
return;
}
+ if (geometry && (prop = geometry->property ("notebook-shrunk"))) {
+ _notebook_shrunk = string_is_affirmative (prop->value ());
+ }
+
+ if (geometry && (prop = geometry->property ("pre-maximal-horizontal-pane-position"))) {
+ pre_maximal_horizontal_pane_position = atoi (prop->value ());
+ }
+
if (!geometry || (prop = geometry->property ("edit-horizontal-pane-pos")) == 0) {
/* initial allocation is 90% to canvas, 10% to notebook */
pos = (int) floor (alloc.get_width() * 0.90f);
if (GTK_WIDGET(edit_pane.gobj())->allocation.width > pos) {
edit_pane.set_position (pos);
- pre_maximal_horizontal_pane_position = pos;
+ if (pre_maximal_horizontal_pane_position == 0) {
+ pre_maximal_horizontal_pane_position = pos;
+ }
}
done = (Pane) (done | Horizontal);
}
}
+/** @param yn true to follow playhead, otherwise false.
+ * @param catch_up true to reset the editor view to show the playhead (if yn == true), otherwise false.
+ */
void
-Editor::set_follow_playhead (bool yn)
+Editor::set_follow_playhead (bool yn, bool catch_up)
{
if (_follow_playhead != yn) {
- if ((_follow_playhead = yn) == true) {
+ if ((_follow_playhead = yn) == true && catch_up) {
/* catch up */
reset_x_origin_to_follow_playhead ();
}
EditPoint ep = _edit_point;
if (entered_marker) {
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use entered marker @ %1\n", entered_marker->position()));
return entered_marker->position();
}
switch (ep) {
case EditAtPlayhead:
where = _session->audible_frame();
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where));
break;
case EditAtSelectedMarker:
} else {
where = loc->end();
}
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use selected marker @ %1\n", where));
break;
}
}
return 0;
}
snap_to (where);
+ DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use mouse @ %1\n", where));
break;
}
}
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
+
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
+
if (rtv) {
boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Playlist::RegionList* regions = pl->regions_at (
- (framepos_t) floor ( (double)where * tr->speed()));
+ (framepos_t) floor ( (double) where * tr->speed()));
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
RegionView* rv = rtv->view()->find_view (*i);
}
}
+/** Start with regions that are selected. Then add equivalent regions
+ * on tracks in the same active edit-enabled route group as any of
+ * the regions that we started with.
+ */
+
+RegionSelection
+Editor::get_regions_from_selection ()
+{
+ return get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+}
+
/** Get regions using the following method:
*
* Make an initial region list using the selected regions, unless
for (RegionSelection::iterator i = regions.begin (); i != regions.end(); ++i) {
RouteGroup* g = (*i)->get_time_axis_view().route_group ();
+
if (g && g->is_active() && g->is_edit()) {
tracks.add (axis_views_from_routes (g->route_list()));
}
-
}
if (!tracks.empty()) {
return regions;
}
+/** Start with regions that are selected, or the entered regionview if none are selected.
+ * Then add equivalent regions on tracks in the same active edit-enabled route group as any
+ * of the regions that we started with.
+ */
RegionSelection
Editor::get_regions_from_selection_and_entered ()
{
- RegionSelection rs = selection->regions;
+ RegionSelection regions = selection->regions;
- if (rs.empty() && entered_regionview) {
- rs.add (entered_regionview);
+ if (regions.empty() && entered_regionview) {
+ regions.add (entered_regionview);
}
- return rs;
+ return get_equivalent_regions (regions, ARDOUR::Properties::edit.property_id);
}
void
_summary->set_dirty ();
}
+void
+Editor::region_view_removed ()
+{
+ _summary->set_dirty ();
+}
+
TimeAxisView*
Editor::axis_view_from_route (boost::shared_ptr<Route> r) const
{
rtv->effective_gain_display ();
+ if (internal_editing()) {
+ rtv->enter_internal_edit_mode ();
+ } else {
+ rtv->leave_internal_edit_mode ();
+ }
+
rtv->view()->RegionViewAdded.connect (sigc::mem_fun (*this, &Editor::region_view_added));
+ rtv->view()->RegionViewRemoved.connect (sigc::mem_fun (*this, &Editor::region_view_removed));
}
_routes->routes_added (new_views);
+ _summary->routes_added (new_views);
if (show_editor_mixer_when_tracks_arrive) {
show_editor_mixer (true);
}
editor_list_button.set_sensitive (true);
-
- _summary->set_dirty ();
}
void
}
void
-Editor::hide_track_in_display (TimeAxisView* tv, bool /*temponly*/)
+Editor::hide_track_in_display (TimeAxisView* tv, bool apply_to_selection)
{
- RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+ if (apply_to_selection) {
+ for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ) {
- if (rtv && current_mixer_strip && (rtv->route() == current_mixer_strip->route())) {
- // this will hide the mixer strip
- set_selected_mixer_strip (*tv);
+ TrackSelection::iterator j = i;
+ ++j;
+
+ hide_track_in_display (*i, false);
+
+ i = j;
+ }
+ } else {
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+
+ if (rtv && current_mixer_strip && (rtv->route() == current_mixer_strip->route())) {
+ // this will hide the mixer strip
+ set_selected_mixer_strip (*tv);
+ }
+
+ _routes->hide_track_in_display (*tv);
}
-
- _routes->hide_track_in_display (*tv);
}
bool
}
bool
-Editor::horizontal_scroll_left_press ()
+Editor::scroll_press (Direction dir)
{
++_scroll_callbacks;
/* delay the first auto-repeat */
return true;
}
-
- double x = leftmost_position() - current_page_frames() / 5;
- if (x < 0) {
- x = 0;
- }
-
- reset_x_origin (x);
- /* do hacky auto-repeat */
- if (!_scroll_connection.connected ()) {
- _scroll_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press), 100);
- _scroll_callbacks = 0;
- }
+ switch (dir) {
+ case LEFT:
+ scroll_backward (1);
+ break;
- return true;
-}
+ case RIGHT:
+ scroll_forward (1);
+ break;
-void
-Editor::horizontal_scroll_left_release ()
-{
- _scroll_connection.disconnect ();
-}
+ case UP:
+ scroll_tracks_up_line ();
+ break;
-bool
-Editor::horizontal_scroll_right_press ()
-{
- ++_scroll_callbacks;
-
- if (_scroll_connection.connected() && _scroll_callbacks < 5) {
- /* delay the first auto-repeat */
- return true;
+ case DOWN:
+ scroll_tracks_down_line ();
+ break;
}
- reset_x_origin (leftmost_position() + current_page_frames() / 5);
-
/* do hacky auto-repeat */
if (!_scroll_connection.connected ()) {
- _scroll_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press), 100);
+
+ _scroll_connection = Glib::signal_timeout().connect (
+ sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), dir), 100
+ );
+
_scroll_callbacks = 0;
}
}
void
-Editor::horizontal_scroll_right_release ()
+Editor::scroll_release ()
{
_scroll_connection.disconnect ();
}
Editor::show_editor_list (bool yn)
{
if (yn) {
- the_notebook.show();
+ _the_notebook.show ();
} else {
- the_notebook.hide();
+ _the_notebook.hide ();
}
}
set_size_request_to_display_given_text (edit_point_selector, edit_point_strings, COMBO_FUDGE+10, 15);
}
+void
+Editor::add_notebook_page (string const & name, Gtk::Widget& widget)
+{
+ EventBox* b = manage (new EventBox);
+ b->signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::notebook_tab_clicked), &widget));
+ Label* l = manage (new Label (name));
+ l->set_angle (-90);
+ b->add (*l);
+ b->show_all ();
+ _the_notebook.append_page (widget, *b);
+}
+
+bool
+Editor::notebook_tab_clicked (GdkEventButton* ev, Gtk::Widget* page)
+{
+ if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
+ _the_notebook.set_current_page (_the_notebook.page_num (*page));
+ }
+
+ if (ev->type == GDK_2BUTTON_PRESS) {
+
+ /* double-click on a notebook tab shrinks or expands the notebook */
+
+ if (_notebook_shrunk) {
+ edit_pane.set_position (pre_maximal_horizontal_pane_position);
+ _notebook_shrunk = false;
+ } else {
+ pre_maximal_horizontal_pane_position = edit_pane.get_position ();
+ edit_pane.set_position (edit_pane.get_position() + page->get_width());
+ _notebook_shrunk = true;
+ }
+ }
+
+ return true;
+}
+
projects / ardour.git / blobdiff