smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-21 12:55:57 +01:00
Code Issues Projects Releases Wiki Activity

add set-loop-from-region variants; no grabber cursor in object mode (for SAE); fixup add track dialog for SAE profile (no track mode selector)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2727 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-11-29 18:07:32 +00:00
parent 156ddbbd4f
commit 54cbca8aa3
8 changed files with 52 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/add_route_dialog.cc
View file

@ -129,7 +129,9 @@ AddRouteDialog::AddRouteDialog ()
ccframe.set_shadow_type (SHADOW_IN);
dvbox->pack_start (channel_combo, true, false, 5);
dvbox->pack_start (track_mode_combo, true, false, 5);
if (!ARDOUR::Profile->get_sae()) {
dvbox->pack_start (track_mode_combo, true, false, 5);
}
dhbox->pack_start (*dvbox, true, false, 5);
ccframe.add (*dhbox);
@ -181,6 +183,10 @@ AddRouteDialog::count ()
ARDOUR::TrackMode
AddRouteDialog::mode ()
{
if (ARDOUR::Profile->get_sae()) {
return ARDOUR::Normal;
}
Glib::ustring str = track_mode_combo.get_active_text();
if (str == _("Normal")) {
return ARDOUR::Normal;

12
gtk2_ardour/ardour-sae.bindings.in
View file

@ -50,7 +50,7 @@
; (gtk_accel_path "<Actions>/Editor/playhead-to-range-start" "")
; (gtk_accel_path "<Actions>/Editor/Subframes" "")
; (gtk_accel_path "<Actions>/Editor/Smpte2997drop" "")
; (gtk_accel_path "<Actions>/Main/AddTrackBus" "")
(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%SECONDARY%>n")
(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%LEVEL4%>a")
; (gtk_accel_path "<Actions>/JACK/JACKDisconnect" "")
; (gtk_accel_path "<Actions>/options/MeterFalloffFast" "")
@ -78,11 +78,11 @@
; (gtk_accel_path "<Actions>/Snap/snap-to-smpte-minutes" "")
; (gtk_accel_path "<Actions>/Main/FlushWastebasket" "")
(gtk_accel_path "<Actions>/Editor/normalize-region" "n")
(gtk_accel_path "<Actions>/Editor/nudge-forward" "KP_Add")
(gtk_accel_path "<Actions>/Editor/nudge-forward" "h")
; (gtk_accel_path "<Actions>/RegionList/SortByRegionEndinFile" "")
; (gtk_accel_path "<Actions>/Editor/ToggleMeasureVisibility" "")
; (gtk_accel_path "<Actions>/Zoom/zoom-focus-center" "")
(gtk_accel_path "<Actions>/Editor/nudge-backward" "KP_Subtract")
(gtk_accel_path "<Actions>/Editor/nudge-backward" "g")
; (gtk_accel_path "<Actions>/options/LatchedSolo" "")
; (gtk_accel_path "<Actions>/options/MeterHoldOff" "")
; (gtk_accel_path "<Actions>/options/OutputAutoConnectMaster" "")
@ -221,7 +221,6 @@
(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
; (gtk_accel_path "<Actions>/Editor/Crossfades" "")
; (gtk_accel_path "<Actions>/Editor/PullupPlus4" "")
(gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "KP_Enter")
; (gtk_accel_path "<Actions>/Main/MeteringHoldTime" "")
; (gtk_accel_path "<Actions>/Editor/PullupPlus1" "")
; (gtk_accel_path "<Actions>/Editor/Smpte24976" "")
@ -301,7 +300,8 @@
(gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
; (gtk_accel_path "<Actions>/options/UseSoftwareMonitoring" "")
; (gtk_accel_path "<Actions>/Editor/Subframes100" "")
(gtk_accel_path "<Actions>/Editor/mute-unmute-region" "m")
(gtk_accel_path "<Actions>/Editor/mute-unmute-region" "<%SECONDARY%>m")
(gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "m")
; (gtk_accel_path "<Actions>/options/OutputAutoConnectManual" "")
; (gtk_accel_path "<Actions>/Snap/snap-to-region-sync" "")
(gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
@ -334,4 +334,6 @@
(gtk_accel_path "<Actions>/Transport/focus-on-clock" "KP_Divide")
(gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "bracketright")
(gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "bracketleft")
(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%PRIMARY%><%SECONDARY%>bracketright")
(gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>bracketright")

3
gtk2_ardour/ardour-sae.menus
View file

@ -33,7 +33,7 @@
<menuitem action='record-roll'/>
<menuitem action='ToggleRollForgetCapture'/>
<menuitem action='Loop'/>
<menuitem action='PlaySelection'/>
<menuitem action='loop-region'/>
<menuitem action='set-playhead'/>
<menuitem action='Forward'/>
<menuitem action='Rewind'/>
@ -69,6 +69,7 @@
<menuitem action='toggle-follow-playhead'/>
<separator/>
<menuitem action='set-loop-from-edit-range'/>
<menuitem action='set-loop-from-region'/>
<menuitem action='set-punch-from-edit-range'/>
</menu>
<menu name='Edit' action='Edit'>

4
gtk2_ardour/ardour_ui2.cc
View file

@ -398,7 +398,9 @@ ARDOUR_UI::setup_transport ()
transport_tearoff_hbox.pack_start (*svbox, false, false, 3);
transport_tearoff_hbox.pack_start (auto_loop_button, false, false);
transport_tearoff_hbox.pack_start (play_selection_button, false, false);
if (!Profile->get_sae()) {
transport_tearoff_hbox.pack_start (play_selection_button, false, false);
}
transport_tearoff_hbox.pack_start (roll_button, false, false);
transport_tearoff_hbox.pack_start (stop_button, false, false);
transport_tearoff_hbox.pack_start (rec_button, false, false, 6);

1
gtk2_ardour/editor.h
View file

@ -1102,6 +1102,7 @@ class Editor : public PublicEditor
void set_punch_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 (nframes_t start, nframes_t end, std::string cmd);

4
gtk2_ardour/editor_actions.cc
View file

@ -254,6 +254,10 @@ Editor::register_actions ()
act = ActionManager::register_action (editor_actions, "set-loop-from-edit-range", _("Set Loop From Edit Range"), bind (mem_fun(*this, &Editor::set_loop_from_edit_range), false));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "set-loop-from-region", _("Set Loop From Region"), bind (mem_fun(*this, &Editor::set_loop_from_region), false));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "loop-region", _("Loop Region"), bind (mem_fun(*this, &Editor::set_loop_from_region), true));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "set-punch-from-edit-range", _("Set Punch From Edit Range"), mem_fun(*this, &Editor::set_punch_from_edit_range));
ActionManager::session_sensitive_actions.push_back (act);

10
gtk2_ardour/editor_mouse.cc
View file

@ -243,7 +243,7 @@ Editor::set_mouse_mode (MouseMode m, bool force)
}
}
/* XXX the hack of unsetting all other buttongs should go
/* XXX the hack of unsetting all other buttons should go
away once GTK2 allows us to use regular radio buttons drawn like
normal buttons, rather than my silly GroupedButton hack.
*/
@ -258,7 +258,11 @@ Editor::set_mouse_mode (MouseMode m, bool force)
case MouseObject:
mouse_move_button.set_active (true);
current_canvas_cursor = grabber_cursor;
if (Profile->get_sae()) {
current_canvas_cursor = timebar_cursor;
} else {
current_canvas_cursor = grabber_cursor;
}
break;
case MouseGain:
@ -1154,7 +1158,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
set_verbose_canvas_cursor (cp->line.get_verbose_cursor_string (fraction), at_x, at_y);
show_verbose_canvas_cursor ();
if (is_drawable()) {
if (is_drawable() && !_scrubbing) {
track_canvas.get_window()->set_cursor (*fader_cursor);
}
}

21
gtk2_ardour/editor_ops.cc
View file

@ -4476,6 +4476,27 @@ Editor::set_loop_from_edit_range (bool play)
}
}
void
Editor::set_loop_from_region (bool play)
{
ensure_entered_region_selected (true);
if (selection->regions.empty()) {
info << _("cannot set loop: no region selected") << endmsg;
return;
}
nframes64_t start = selection->regions.front()->region()->first_frame();
nframes64_t end = selection->regions.front()->region()->last_frame() + 1;
set_loop_range (start, end, _("set loop range from region"));
if (play) {
session->request_play_loop (true);
session->request_locate (start, true);
}
}
void
Editor::set_punch_from_selection ()
{