From 915a840119132b7994e25796859d3bcdd6f9a775 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Wed, 7 Jan 2015 14:13:24 -0600 Subject: remove Skip Ranges menu item for now --- gtk2_ardour/ardour.menus.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index e713f99c6e..c609724957 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -62,7 +62,9 @@ +#if 0 +#endif -- cgit v1.2.3 From a4f7c21ec38e59281b4755b6b96651f0b310cdd2 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Wed, 7 Jan 2015 15:31:05 -0600 Subject: now that regions and range selections are exclusive, the separate actions to set ranges or zoom to selections are redundant. save some menu entries and keybindings by consolidating them. also consolidate some code with new function get_selection_extents(). as a side-effect, this checkin fixes the assert failure in play_with_preroll --- gtk2_ardour/ardour.menus.in | 12 +-- gtk2_ardour/ardour_ui_ed.cc | 2 +- gtk2_ardour/editor.cc | 6 +- gtk2_ardour/editor.h | 3 +- gtk2_ardour/editor_actions.cc | 6 +- gtk2_ardour/editor_ops.cc | 199 ++++++++++++++---------------------- gtk2_ardour/mnemonic-us.bindings.in | 4 +- 7 files changed, 90 insertions(+), 142 deletions(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index c609724957..2bfbac6451 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -51,8 +51,6 @@ - - @@ -65,14 +63,8 @@ #if 0 #endif - - - - - - - - + + diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 0b237526ac..ed0ea95c43 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -267,7 +267,7 @@ if (Profile->get_mixbus()) act = ActionManager::register_action (transport_actions, X_("Loop"), _("Play Loop Range"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_auto_loop)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); - act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selected Range"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection)); + act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selection"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("PlayPreroll"), _("Play Selection w/Preroll"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_preroll)); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 217d55bb9a..eecf5e79d2 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1860,9 +1860,9 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items) edit_items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_time_selection))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Set Loop from Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), false))); - edit_items.push_back (MenuElem (_("Set Punch from Range"), sigc::mem_fun(*this, &Editor::set_punch_from_selection))); - edit_items.push_back (MenuElem (_("Set Session Start/End from Range"), sigc::mem_fun(*this, &Editor::set_session_extents_from_selection))); + edit_items.push_back (MenuElem (_("Set Loop from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), false))); + edit_items.push_back (MenuElem (_("Set Punch from Selection"), sigc::mem_fun(*this, &Editor::set_punch_from_selection))); + edit_items.push_back (MenuElem (_("Set Session Start/End from Selection"), sigc::mem_fun(*this, &Editor::set_session_extents_from_selection))); edit_items.push_back (SeparatorElem()); edit_items.push_back (MenuElem (_("Add Range Markers"), sigc::mem_fun (*this, &Editor::add_location_from_selection))); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 83b1a074e2..674ee716d8 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -242,6 +242,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* selection */ Selection& get_selection() const { return *selection; } + bool get_selection_extents ( framepos_t &start, framepos_t &end ); // the time extents of the current selection, whether Range, Region(s), Control Points, or Notes Selection& get_cut_buffer() const { return *cut_buffer; } void track_mixer_selection (); @@ -1425,9 +1426,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_session_extents_from_selection (); - void set_loop_from_edit_range (bool play); void set_loop_from_region (bool play); - void set_punch_from_edit_range (); void set_loop_range (framepos_t start, framepos_t end, std::string cmd); void set_punch_range (framepos_t start, framepos_t end, std::string cmd); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 49b39397cd..5af1fe92a2 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -295,9 +295,9 @@ Editor::register_actions () toggle_reg_sens (editor_actions, "toggle-skip-playback", _("Use Skip Ranges"), sigc::mem_fun(*this, &Editor::toggle_skip_playback)); - reg_sens (editor_actions, "set-loop-from-edit-range", _("Set Loop from Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_edit_range), false)); - reg_sens (editor_actions, "set-punch-from-edit-range", _("Set Punch from Edit Range"), sigc::mem_fun(*this, &Editor::set_punch_from_edit_range)); - reg_sens (editor_actions, "set-session-from-edit-range", _("Set Session Start/End from Edit Range"), sigc::mem_fun(*this, &Editor::set_session_extents_from_selection)); + reg_sens (editor_actions, "set-loop-from-edit-range", _("Set Loop from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), false)); + reg_sens (editor_actions, "set-punch-from-edit-range", _("Set Punch from Selection"), sigc::mem_fun(*this, &Editor::set_punch_from_selection)); + reg_sens (editor_actions, "set-session-from-edit-range", _("Set Session Start/End from Selection"), sigc::mem_fun(*this, &Editor::set_session_extents_from_selection)); /* this is a duplicated action so that the main menu can use a different label */ reg_sens (editor_actions, "main-menu-play-selected-regions", _("Play Selected Regions"), sigc::mem_fun (*this, &Editor::play_selected_region)); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 529a524d8c..4ce5d09f3b 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -1712,29 +1712,9 @@ Editor::temporal_zoom_region (bool both_axes) framepos_t end = 0; set tracks; - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { - return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - - tracks.insert (&((*i)->get_time_axis_view())); - } - - if ((start == 0 && end == 0) || end < start) { + if ( !get_selection_extents(start, end) ) return; - } - + calc_extra_zoom_edges (start, end); /* if we're zooming on both axes we need to save track heights etc. @@ -1772,6 +1752,46 @@ Editor::temporal_zoom_region (bool both_axes) } +bool +Editor::get_selection_extents ( framepos_t &start, framepos_t &end ) +{ + start = max_framepos; + end = 0; + bool ret = true; + + //ToDo: if notes are selected, set extents to that selection + + //ToDo: if control points are selected, set extents to that selection + + if ( !selection->regions.empty() ) { + RegionSelection rs = get_regions_from_selection_and_entered (); + + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + + if ((*i)->region()->position() < start) { + start = (*i)->region()->position(); + } + + if ((*i)->region()->last_frame() + 1 > end) { + end = (*i)->region()->last_frame() + 1; + } + } + + } else if (!selection->time.empty()) { + start = selection->time.start(); + end = selection->time.end_frame(); + } else + ret = false; //no selection found + + //range check + if ((start == 0 && end == 0) || end < start) { + ret = false; + } + + return ret; +} + + void Editor::temporal_zoom_selection (bool both_axes) { @@ -1788,16 +1808,14 @@ Editor::temporal_zoom_selection (bool both_axes) //if a range is selected, zoom to that if (!selection->time.empty()) { - framepos_t start = selection->time.start(); - framepos_t end = selection->time.end_frame(); - - calc_extra_zoom_edges(start, end); - - temporal_zoom_by_frame (start, end); - + framepos_t start, end; + if (get_selection_extents (start, end)) { + calc_extra_zoom_edges(start, end); + temporal_zoom_by_frame (start, end); + } + if (both_axes) fit_selected_tracks(); - } } @@ -2342,11 +2360,15 @@ Editor::play_from_edit_point_and_return () void Editor::play_selection () { - if (selection->time.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - _session->request_play_range (&selection->time, true); + AudioRange ar (start, end, 0); + list lar; + lar.push_back (ar); + + _session->request_play_range (&lar, true); } framepos_t @@ -2379,16 +2401,17 @@ Editor::maybe_locate_with_edit_preroll ( framepos_t location ) void Editor::play_with_preroll () { - if (selection->time.empty()) { - return; - } else { + { framepos_t preroll = get_preroll(); - framepos_t start = 0; - if (selection->time[clicked_selection].start > preroll) - start = selection->time[clicked_selection].start - preroll; + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; + + if (start > preroll) + start = start - preroll; - framepos_t end = selection->time[clicked_selection].end + preroll; + end = end + preroll; //"post-roll" AudioRange ar (start, end, 0); list lar; @@ -5858,37 +5881,16 @@ Editor::select_prev_route() void Editor::set_loop_from_selection (bool play) -{ - if (_session == 0 || selection->time.empty()) { - return; - } - - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; - - set_loop_range (start, end, _("set loop range from selection")); - - if (play) { - _session->request_locate (start, true); - _session->request_play_loop (true); - } -} - -void -Editor::set_loop_from_edit_range (bool play) { if (_session == 0) { return; } - framepos_t start; - framepos_t end; - - if (!get_edit_op_range (start, end)) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - set_loop_range (start, end, _("set loop range from edit range")); + set_loop_range (start, end, _("set loop range from selection")); if (play) { _session->request_locate (start, true); @@ -5899,23 +5901,9 @@ Editor::set_loop_from_edit_range (bool play) void Editor::set_loop_from_region (bool play) { - framepos_t start = max_framepos; - framepos_t end = 0; - - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - } set_loop_range (start, end, _("set loop range from region")); @@ -5928,12 +5916,13 @@ Editor::set_loop_from_region (bool play) void Editor::set_punch_from_selection () { - if (_session == 0 || selection->time.empty()) { + if (_session == 0) { return; } - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; set_punch_range (start, end, _("set punch range from selection")); } @@ -5941,15 +5930,16 @@ Editor::set_punch_from_selection () void Editor::set_session_extents_from_selection () { - if (_session == 0 || selection->time.empty()) { + if (_session == 0) { return; } + + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; begin_reversible_command (_("set session start/stop from selection")); - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; - Location* loc; if ((loc = _session->locations()->session_range_location()) == 0) { _session->set_session_extents ( start, end ); // this will create a new session range; no need for UNDO @@ -5966,43 +5956,12 @@ Editor::set_session_extents_from_selection () } } -void -Editor::set_punch_from_edit_range () -{ - if (_session == 0) { - return; - } - - framepos_t start; - framepos_t end; - - if (!get_edit_op_range (start, end)) { - return; - } - - set_punch_range (start, end, _("set punch range from edit range")); -} - void Editor::set_punch_from_region () { - framepos_t start = max_framepos; - framepos_t end = 0; - - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - } set_punch_range (start, end, _("set punch range from region")); } diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 8660b2c99e..b2aa557bfa 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -98,7 +98,7 @@ This mode provides many different operations on both regions and control points, @eep|Editor/cycle-edit-point-with-marker|<@PRIMARY@>grave|next EP w/marker @trans|Transport/ToggleRoll|space|toggle roll -@epp|Editor/play-edit-range|<@SECONDARY@>space|play edit range +@epp|Editor/PlaySelection|<@SECONDARY@>space|play edit range @epp|Editor/play-from-edit-point-and-return|<@LEVEL4@>space|play from EP \& return @trans|Transport/ToggleRollMaybe|<@PRIMARY@><@SECONDARY@>space|stop (keep loop/range play) @trans|Transport/ToggleRollForgetCapture|<@PRIMARY@>space|stop and destroy @@ -119,10 +119,8 @@ This mode provides many different operations on both regions and control points, @eep|Editor/trim-to-next-region|<@PRIMARY@>k|trim region to start of next region @ranges|Editor/set-loop-from-edit-range|bracketright|set loop range from edit range -@ranges|Region/set-loop-from-region|<@SECONDARY@>bracketright|set loop range from region(s) @ranges|Editor/set-punch-from-edit-range|bracketleft|set punch range from edit range -@ranges|Region/set-punch-from-region|<@SECONDARY@>bracketleft|set punch range from region(s) @rop|Region/boost-region-gain|asciicircum|increase region gain @rop|Region/cut-region-gain|ampersand|reduce region gain -- cgit v1.2.3 From fbfd6796f91a10ada1b85033020fc5343d3e9140 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 8 Jan 2015 09:47:31 -0600 Subject: continuing menu and keybinding consolidation --- gtk2_ardour/ardour.menus.in | 97 +++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 48 deletions(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 2bfbac6451..cb1278af31 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -53,16 +53,18 @@ + - - + #if 0 #endif + + @@ -180,7 +182,6 @@ - @@ -209,6 +210,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -227,12 +271,12 @@ + - - + @@ -376,49 +420,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From f7e3d1be2c3cad8e3c7ac9910970c6bd87d3f536 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 8 Jan 2015 16:00:36 -0600 Subject: change Split menu entry to say Split/Separate (it was already doing that anyway). also fix a bug so you can drag the playhead and split at the playhead location --- gtk2_ardour/ardour.menus.in | 1 - gtk2_ardour/editor.cc | 8 +++++++- gtk2_ardour/editor_actions.cc | 2 +- gtk2_ardour/editor_ops.cc | 17 +++++++++++------ gtk2_ardour/mnemonic-us.bindings.in | 1 - 5 files changed, 19 insertions(+), 10 deletions(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index cb1278af31..d292e6791b 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -184,7 +184,6 @@ - diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 7107040db1..da1c25f374 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4638,7 +4638,13 @@ Editor::get_preferred_edit_position (bool ignore_playhead, bool from_context_men switch (ep) { case EditAtPlayhead: - where = _session->audible_frame(); + if (_dragging_playhead) { + if (!mouse_frame (where, ignored)) { + /* XXX not right but what can we do ? */ + return 0; + } + } else + where = _session->audible_frame(); DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where)); break; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index d6fcf7d27f..8c7c74858b 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -1989,7 +1989,7 @@ Editor::register_region_actions () reg_sens (_region_actions, "set-region-sync-position", _("Set Sync Position"), sigc::mem_fun (*this, &Editor::set_region_sync_position)); reg_sens (_region_actions, "place-transient", _("Place Transient"), sigc::mem_fun (*this, &Editor::place_transient)); - reg_sens (_region_actions, "split-region", _("Split"), sigc::mem_fun (*this, &Editor::split_region)); + reg_sens (_region_actions, "split-region", _("Split/Separate"), sigc::mem_fun (*this, &Editor::split_region)); reg_sens (_region_actions, "trim-front", _("Trim Start at Edit Point"), sigc::mem_fun (*this, &Editor::trim_region_front)); reg_sens (_region_actions, "trim-back", _("Trim End at Edit Point"), sigc::mem_fun (*this, &Editor::trim_region_back)); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 4ce5d09f3b..ec196874d6 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -5794,20 +5794,25 @@ Editor::set_playhead_cursor () void Editor::split_region () { + //if a range is selected, separate it if ( !selection->time.empty()) { separate_regions_between (selection->time); return; } - RegionSelection rs = get_regions_from_selection_and_edit_point (); + //if no range was selected, try to find some regions to split + if (current_mouse_mode() == MouseObject) { //don't try this for Internal Edit, Stretch, Draw, etc. + + RegionSelection rs = get_regions_from_selection_and_edit_point (); - framepos_t where = get_preferred_edit_position (); + framepos_t where = get_preferred_edit_position (); - if (rs.empty()) { - return; - } + if (rs.empty()) { + return; + } - split_regions_at (where, rs); + split_regions_at (where, rs); + } } struct EditorOrderRouteSorter { diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index b2aa557bfa..4055129e47 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -182,7 +182,6 @@ This mode provides many different operations on both regions and control points, @sess|Common/Save|<@PRIMARY@>s|save session @sess|Main/Snapshot|<@PRIMARY@><@TERTIARY@>s|snapshot session @trans|Editor/track-solo-toggle|<@SECONDARY@>s|toggle track solo status -@-group|Editor/editor-separate|<@PRIMARY@><@SECONDARY@>s|some text @mmode|MouseMode/set-mouse-mode-draw|d|note-draw mode @rop|Region/duplicate-region|<@SECONDARY@>d|duplicate region (once) @rop|Region/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi) -- cgit v1.2.3 From 5b5e10568061dfa8058880e4ca5e3adfa074b84c Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 8 Jan 2015 16:27:24 -0600 Subject: stash Bring Into Session inside the Cleanup submenu --- gtk2_ardour/ardour.menus.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index d292e6791b..63e273c737 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -29,8 +29,8 @@ - + -- cgit v1.2.3 From c7affd79c24a6a633c9b400de9662087d210ac60 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Sun, 11 Jan 2015 11:46:36 -0600 Subject: remove track-selection requirement so fit_selected_tracks works as coded. change name to fit-selection. remove action to zoom (both axes) because this can trivially be accomplished by clicking (f)it and (z)oom sequentially, and it frees a keybinding. remaining bug: Fitting a selection of MIDI regions doesnt work right --- gtk2_ardour/ardour.menus.in | 4 ++-- gtk2_ardour/editor.cc | 4 ++-- gtk2_ardour/editor.h | 2 +- gtk2_ardour/editor_actions.cc | 4 +--- gtk2_ardour/editor_ops.cc | 4 ++-- gtk2_ardour/mnemonic-us.bindings.in | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 63e273c737..a26101a1cd 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -364,7 +364,7 @@ - + @@ -405,7 +405,7 @@ - + diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 3ec3a73066..a29c1ebeef 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3660,7 +3660,7 @@ Editor::build_track_count_menu () visible_tracks_selector.AddMenuElem (MenuElem (X_("24"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 24))); visible_tracks_selector.AddMenuElem (MenuElem (X_("32"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32))); visible_tracks_selector.AddMenuElem (MenuElem (X_("64"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 64))); - visible_tracks_selector.AddMenuElem (MenuElem (_("Selected"), sigc::mem_fun(*this, &Editor::fit_selected_tracks))); + visible_tracks_selector.AddMenuElem (MenuElem (_("Selection"), sigc::mem_fun(*this, &Editor::fit_selection))); visible_tracks_selector.AddMenuElem (MenuElem (_("All"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0))); } else { visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 1 track"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 1))); @@ -3672,7 +3672,7 @@ Editor::build_track_count_menu () visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 32 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32))); visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 48 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 48))); visible_tracks_selector.AddMenuElem (MenuElem (_("Fit All tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0))); - visible_tracks_selector.AddMenuElem (MenuElem (_("Fit Selected tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks))); + visible_tracks_selector.AddMenuElem (MenuElem (_("Fit Selection"), sigc::mem_fun(*this, &Editor::fit_selection))); zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 10 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10))); zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 100 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 100))); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 7e1d1702f0..b5382735c8 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -2129,7 +2129,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD RhythmFerret* rhythm_ferret; void fit_tracks (TrackViewList &); - void fit_selected_tracks (); + void fit_selection (); void set_track_height (Height); void remove_tracks (); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 8c7c74858b..b1314a8493 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -262,7 +262,6 @@ Editor::register_actions () reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false)); reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session)); reg_sens (editor_actions, "zoom-to-selection", _("Zoom to Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), false)); - reg_sens (editor_actions, "zoom-to-selection-both-axes", _("Zoom to Selection (Width and Height)"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), true)); reg_sens (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state)); reg_sens (editor_actions, "expand-tracks", _("Expand Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), false)); @@ -409,8 +408,7 @@ Editor::register_actions () } ActionManager::track_selection_sensitive_actions.push_back (act); - act = reg_sens (editor_actions, "fit-tracks", _("Fit Selected Tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks)); - ActionManager::track_selection_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "fit-selection", _("Fit Selection (Vertical)"), sigc::mem_fun(*this, &Editor::fit_selection)); act = reg_sens (editor_actions, "track-height-largest", _("Largest"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest)); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index ec196874d6..f6064dd72b 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -1815,7 +1815,7 @@ Editor::temporal_zoom_selection (bool both_axes) } if (both_axes) - fit_selected_tracks(); + fit_selection(); } } @@ -6918,7 +6918,7 @@ Editor::insert_time ( } void -Editor::fit_selected_tracks () +Editor::fit_selection () { if (!selection->tracks.empty()) { fit_tracks (selection->tracks); diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 4055129e47..a2065a709f 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -186,7 +186,7 @@ This mode provides many different operations on both regions and control points, @rop|Region/duplicate-region|<@SECONDARY@>d|duplicate region (once) @rop|Region/multi-duplicate-region|<@TERTIARY@>d|duplicate region (multi) @select|Editor/select-all-in-punch-range|<@PRIMARY@>d|select all in punch range -@vis|Editor/fit-tracks|f|fit tracks vertically +@vis|Editor/fit-selection|f|fit selection vertically @trans|Editor/toggle-follow-playhead|<@PRIMARY@>f|toggle playhead tracking @trans|Transport/ToggleFollowEdits|<@TERTIARY@>f|toggle playhead follows edits @wvis|Common/ToggleMaximalEditor|<@PRIMARY@><@SECONDARY@>f|maximise editor space -- cgit v1.2.3 From 3812925a6218f30236a4c8db947e349909483b94 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 21 Mar 2015 19:40:13 +0100 Subject: consistent ordering of Ruler Actions. --- gtk2_ardour/ardour.menus.in | 2 ++ gtk2_ardour/ruler_dialog.cc | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index a26101a1cd..bb658686a3 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -422,11 +422,13 @@ + + diff --git a/gtk2_ardour/ruler_dialog.cc b/gtk2_ardour/ruler_dialog.cc index 991bd3eb87..ce34d70ad3 100644 --- a/gtk2_ardour/ruler_dialog.cc +++ b/gtk2_ardour/ruler_dialog.cc @@ -29,16 +29,16 @@ RulerDialog::RulerDialog () { add_button (Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT); - get_vbox()->pack_start (samples_button); - get_vbox()->pack_start (timecode_button); get_vbox()->pack_start (minsec_button); + get_vbox()->pack_start (timecode_button); + get_vbox()->pack_start (samples_button); get_vbox()->pack_start (bbt_button); - get_vbox()->pack_start (tempo_button); get_vbox()->pack_start (meter_button); - get_vbox()->pack_start (loop_punch_button); + get_vbox()->pack_start (tempo_button); get_vbox()->pack_start (range_button); - get_vbox()->pack_start (mark_button); + get_vbox()->pack_start (loop_punch_button); get_vbox()->pack_start (cdmark_button); + get_vbox()->pack_start (mark_button); get_vbox()->pack_start (video_button); get_vbox()->show_all (); -- cgit v1.2.3 From e3b22a2a184354a85a569ae9c13694fa8c6b9910 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 5 Apr 2015 15:25:06 -0400 Subject: remove non-existence menu item --- gtk2_ardour/ardour.menus.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index bb658686a3..efc1fcf66f 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -488,9 +488,6 @@ - - - -- cgit v1.2.3 From 2bbe4baf297808a064a0e34fbd4a83183561c07f Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 7 Apr 2015 05:20:06 +0200 Subject: windows can’t rename open files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This needs a better solution after 4.0. --- gtk2_ardour/ardour.menus.in | 2 ++ gtk2_ardour/wscript | 2 +- wscript | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour/ardour.menus.in') diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index efc1fcf66f..b081b58342 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -8,7 +8,9 @@ +#ifndef WINDOWS // can't move open files. +#endif diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 9cc2a508aa..7df6c1855d 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -640,7 +640,7 @@ def build(bld): obj.command_is_external = True obj.no_inputs = True obj.argv = menus_argv - obj.dep_vars = ['GTKOSX'] + obj.dep_vars = ['GTKOSX', 'WINDOWS'] obj.stdin = program + '.menus.in' obj.stdout = program + '.menus' bld.install_files (bld.env['CONFDIR'], program + '.menus') diff --git a/wscript b/wscript index bd82a1f475..7395d92a20 100644 --- a/wscript +++ b/wscript @@ -880,6 +880,7 @@ def configure(conf): # see http://gareus.org/wiki/ardour_windows_gdk_and_cairo conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') + conf.define ('WINDOWS', 1) if Options.options.dist_target == 'msvc': conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS') @@ -891,6 +892,7 @@ def configure(conf): conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') # MORE STUFF PROBABLY NEEDED HERE + conf.define ('WINDOWS', 1) # Tell everyone that this is a waf build -- cgit v1.2.3