Compare commits
9 Commits
8d7cd9f7a8
...
65544f104d
| Author | SHA1 | Date |
|---|---|---|
 Ben Loftis
|
65544f104d | |
|
Ben Loftis
|
a9ae1f22cb | |
|
Ben Loftis
|
eaeeb38b99 | |
|
Ben Loftis
|
265318612a | |
|
Ben Loftis
|
462d3bd6cf | |
|
Ben Loftis
|
f81c9c83de | |
|
Ben Loftis
|
76771cd935 | |
|
Ben Loftis
|
f74dbbeb25 | |
|
Ben Loftis
|
3cefc29296 |
|
|
@ -342,12 +342,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
|
|||
, dsp_statistics_window (X_("dsp-statistics"), _("Performance Meters"))
|
||||
, transport_masters_window (X_("transport-masters"), _("Transport Masters"))
|
||||
, livetrax_track_dialog (nullptr)
|
||||
, _livetrax_toolbar_sizegroup (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_VERTICAL))
|
||||
, _livetrax_centering_sizegroup (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
|
||||
, _livetrax_btn_rec_all (_("Rec All"))
|
||||
, _livetrax_btn_rec_none (_("Rec None"))
|
||||
, _livetrax_btn_peak_reset (_("Reset Peak Hold"))
|
||||
, _livetrax_btn_marker_new (_("New"))
|
||||
, _livetrax_btn_prev_marker (_("Prev"))
|
||||
, _livetrax_btn_next_marker (_("Next"))
|
||||
, _livetrax_btn_marker_new (_("Marker"))
|
||||
, _livetrax_btn_prev_marker (_("<< Prev"))
|
||||
, _livetrax_btn_next_marker (_("Next >>"))
|
||||
, session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
|
||||
, add_video_dialog (X_("add-video"), _("Add Video"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
|
||||
, bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@
|
|||
#include <gtkmm/menubar.h>
|
||||
#include <gtkmm/textbuffer.h>
|
||||
#include <gtkmm/adjustment.h>
|
||||
#include <gtkmm/sizegroup.h>
|
||||
|
||||
#include "gtkmm2ext/gtk_ui.h"
|
||||
#include "gtkmm2ext/bindings.h"
|
||||
|
|
@ -641,7 +642,8 @@ private:
|
|||
|
||||
/* LiveTrax */
|
||||
|
||||
Gtk::Table livetrax_top_table;
|
||||
Gtk::Table livetrax_top_table_l;
|
||||
Gtk::Table livetrax_top_table_r;
|
||||
Gtk::Table livetrax_edit_table;
|
||||
Gtk::HBox livetrax_meter_bar;
|
||||
Gtk::HBox livetrax_editor_bar;
|
||||
|
|
@ -656,6 +658,9 @@ private:
|
|||
ArdourWidgets::ArdourButton _livetrax_btn_prev_marker;
|
||||
ArdourWidgets::ArdourButton _livetrax_btn_next_marker;
|
||||
|
||||
Glib::RefPtr<Gtk::SizeGroup> _livetrax_centering_sizegroup;
|
||||
Glib::RefPtr<Gtk::SizeGroup> _livetrax_toolbar_sizegroup;
|
||||
|
||||
TimeInfoBox* livetrax_time_info_box;
|
||||
ArdourWidgets::ArdourButton* livetrax_multi_out_button;
|
||||
ArdourWidgets::ArdourButton* livetrax_stereo_out_button;
|
||||
|
|
|
|||
|
|
@ -418,7 +418,8 @@ ARDOUR_UI::livetrax_setup_windows ()
|
|||
Gtkmm2ext::Bindings* bindings;
|
||||
Glib::RefPtr<Action> act;
|
||||
|
||||
livetrax_top_table.set_border_width (4);
|
||||
livetrax_top_table_l.set_border_width (4);
|
||||
livetrax_top_table_r.set_border_width (4);
|
||||
|
||||
EventBox* ev_dsp = manage (new EventBox);
|
||||
EventBox* ev_timecode = manage (new EventBox);
|
||||
|
|
@ -467,6 +468,10 @@ ARDOUR_UI::livetrax_setup_windows ()
|
|||
act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-mixer"));
|
||||
livetrax_mixer_view_button->set_related_action (act);
|
||||
|
||||
livetrax_sr_button = manage (new ArdourButton (ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body), true));
|
||||
act = ActionManager::get_action (X_("Window"), X_("toggle-audio-midi-setup"));
|
||||
livetrax_sr_button->set_related_action (act);
|
||||
|
||||
HBox *view_box = manage (new HBox);
|
||||
view_box->set_spacing(4);
|
||||
view_box->pack_start (*livetrax_meter_view_button, false, false);
|
||||
|
|
@ -480,49 +485,62 @@ ARDOUR_UI::livetrax_setup_windows ()
|
|||
|
||||
int TCOL = 0;
|
||||
|
||||
livetrax_top_table.attach (*livetrax_lock_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (*livetrax_view_in_folder_button, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (*livetrax_prefs_view_button, TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (*view_box, TCOL, TCOL+3, 1, 2, FILL, FILL, 4, 4); TCOL+=3;
|
||||
livetrax_top_table_l.attach (_livetrax_btn_prev_marker, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_l.attach (_livetrax_btn_marker_new, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_l.attach (_livetrax_btn_next_marker, TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_l.attach (transport_ctrl, TCOL, TCOL+4, 1, 2, FILL, FILL, 4, 4); TCOL+=4;
|
||||
|
||||
livetrax_top_table.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
|
||||
livetrax_top_table_l.attach (sync_button, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_l.attach (*primary_clock, TCOL, TCOL+2, 1, 2, FILL, FILL, 4, 4); TCOL+=2;
|
||||
|
||||
livetrax_top_table.attach (transport_ctrl, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
livetrax_top_table_l.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (_livetrax_btn_prev_marker, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (_livetrax_btn_marker_new, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (_livetrax_btn_next_marker, TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (*primary_clock, TCOL, TCOL+3, 1, 2, FILL, FILL, 4, 4); TCOL+=3;
|
||||
livetrax_top_table_l.attach (*ev_dsp, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_l.attach (disk_space_label, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
// livetrax_top_table.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
|
||||
|
||||
|
||||
livetrax_top_table.attach (*icon_vb, TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (_livetrax_btn_rec_all, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (_livetrax_btn_rec_none, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (_livetrax_btn_peak_reset, TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
|
||||
|
||||
livetrax_top_table.attach (editor->_track_box, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (*editor->mouse_mode_hbox, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (editor->_zoom_box, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (sync_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (*livetrax_ff_dropdown, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (*livetrax_sr_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
livetrax_top_table_l.attach (*livetrax_ff_dropdown, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_l.attach (*livetrax_sr_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
// livetrax_top_table.attach (*cw, TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table.attach (*livetrax_stereo_out_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (*livetrax_multi_out_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
livetrax_top_table_l.attach (*livetrax_stereo_out_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_l.attach (*livetrax_multi_out_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
TCOL = 0;
|
||||
|
||||
livetrax_top_table_r.attach (*editor->mouse_mode_hbox, TCOL, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
|
||||
livetrax_top_table_r.attach (editor->_track_box, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_r.attach (editor->_zoom_box, TCOL+1, TCOL+2, 1, 2, FILL, FILL, 4, 4); TCOL+=2;
|
||||
|
||||
livetrax_top_table_r.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table_r.attach (_livetrax_btn_rec_all, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_r.attach (_livetrax_btn_rec_none, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_r.attach (_livetrax_btn_peak_reset, TCOL, TCOL+2, 1, 2, FILL, FILL, 4, 4); TCOL+=2;
|
||||
|
||||
livetrax_top_table_r.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
|
||||
|
||||
livetrax_top_table_r.attach (*livetrax_lock_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_r.attach (*livetrax_view_in_folder_button, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_r.attach (*livetrax_prefs_view_button, TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table_r.attach (*view_box, TCOL, TCOL+3, 1, 2, FILL, FILL, 4, 4); TCOL+=3;
|
||||
|
||||
//left & right tables should be equal width, so the logo is centered between them
|
||||
_livetrax_centering_sizegroup->add_widget(livetrax_top_table_l);
|
||||
_livetrax_centering_sizegroup->add_widget(livetrax_top_table_r);
|
||||
|
||||
//force some toolbar widget's height, to make all button heights equal
|
||||
_livetrax_toolbar_sizegroup->add_widget(*livetrax_stereo_out_button);
|
||||
_livetrax_toolbar_sizegroup->add_widget(*livetrax_multi_out_button);
|
||||
_livetrax_toolbar_sizegroup->add_widget(*livetrax_lock_button);
|
||||
_livetrax_toolbar_sizegroup->add_widget(*view_box);
|
||||
|
||||
Gtk::HBox *livetrax_top_bar = manage (new HBox);
|
||||
livetrax_top_bar->pack_start(livetrax_top_table_l, true, true);
|
||||
livetrax_top_bar->pack_start(*icon_vb, false, false, 12);
|
||||
livetrax_top_bar->pack_start(livetrax_top_table_r, true, true);
|
||||
|
||||
livetrax_top_table.attach (*ev_dsp, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
|
||||
livetrax_top_table.attach (disk_space_label, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
|
||||
|
||||
/* editor bar */
|
||||
|
||||
|
|
|
|||
|
|
@ -965,6 +965,7 @@ ARDOUR_UI::save_ardour_state ()
|
|||
main_window_node.set_property (X_("w"), mw);
|
||||
main_window_node.set_property (X_("h"), mh);
|
||||
|
||||
#ifndef LIVETRAX
|
||||
string current_tab;
|
||||
int current_page_number = _tabs.get_current_page ();
|
||||
if (current_page_number == _tabs.page_num (editor->contents())) {
|
||||
|
|
@ -975,13 +976,12 @@ ARDOUR_UI::save_ardour_state ()
|
|||
current_tab = "recorder";
|
||||
} else if (current_page_number == _tabs.page_num (trigger_page->contents())) {
|
||||
current_tab = "trigger";
|
||||
#ifndef LIVETRAX
|
||||
} else if (current_page_number == _tabs.page_num (rc_option_editor->contents())) {
|
||||
current_tab = "preferences";
|
||||
#endif
|
||||
}
|
||||
|
||||
main_window_node.set_property (X_("current-tab"), current_tab);
|
||||
#endif
|
||||
|
||||
/* Windows */
|
||||
|
||||
|
|
|
|||
|
|
@ -82,6 +82,10 @@ Editor::editor_list_button_toggled ()
|
|||
void
|
||||
Editor::show_editor_mixer (bool yn)
|
||||
{
|
||||
#ifdef LIVETRAX
|
||||
yn = false;
|
||||
#endif
|
||||
|
||||
std::shared_ptr<ARDOUR::Route> r;
|
||||
|
||||
show_editor_mixer_when_tracks_arrive = false;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,310 @@
|
|||
; this is a template file processed by tools/fmt-bindings to generate either
|
||||
; a gtk accelmap file or a LaTeX key binding cheat sheet.
|
||||
;
|
||||
; it is the reference for any bindings or cheatsheets
|
||||
;
|
||||
;
|
||||
; FORMAT:
|
||||
; $text -> defines cheatsheet title as "text", which may contain LaTeX markup
|
||||
;
|
||||
; %group owner text -> defines a binding group called "group" which will have the title "text" on the cheatsheet.
|
||||
; may be followed by zero or more lines of descriptive text,
|
||||
; which may contain LaTeX markup. When generating native ardour
|
||||
; bindings, the definition for a binding in group "group" will
|
||||
; be placed in the "owner" block of the bindings file. The
|
||||
; "owner" field is otherwise ignored.
|
||||
;
|
||||
; If the group name starts with "-", the binding will not appear
|
||||
; on the cheetsheet.
|
||||
;
|
||||
; @group|action|binding|description -> defines an action+binding with description, as a member of a binding group
|
||||
; if group starts with '-' it will not be printed in the cheatsheet.
|
||||
; if group starts with '+' it will be printed in the cheatsheet no matter what
|
||||
; if the group is a mouse binding group, action should contain a ':', and
|
||||
; have the binding before the colon, and the target area after it
|
||||
|
||||
;; Title
|
||||
$ARDOUR Shortcuts \linebreak Mnemonic US-Keypad
|
||||
|
||||
;; GROUP DEFINITIONS
|
||||
|
||||
%trans Global Global Transport \& Recording Control
|
||||
|
||||
%sess Global Global Session \& File Handling
|
||||
|
||||
%edit Editor Basic Editing
|
||||
|
||||
%vis Editor Changing What's Visible
|
||||
|
||||
%vws Editor Editor Views
|
||||
|
||||
%numpad Global Global NumPad Transport Functions
|
||||
|
||||
%gedt Global Global Editing Operations
|
||||
|
||||
%wvis Global Global Window Visibility
|
||||
|
||||
%edtrk Editor Track Actions from the Editor
|
||||
|
||||
%eep Editor Editing with Edit Point
|
||||
Most edit functions operate on a single "Edit Point". The edit point can be any of: playhead (default), the mouse or an active marker. The choice of Edit Point (by default) also sets the Zoom Focus.
|
||||
|
||||
%aep Editor Aligning with the Edit Point
|
||||
Align operations move regions so that their start/end/sync point is at the edit point. "Relative" operations
|
||||
just align the first region and moves other selected regions to maintain relative positioning.
|
||||
|
||||
%gmark Global Global Marker Operations
|
||||
|
||||
%gmode Global Global Transport Modes
|
||||
|
||||
%gmon Global Global Monitor Operations
|
||||
|
||||
%movp Global Global Playhead Operations
|
||||
A left click in the rulers positions the playhead unless Ardour is recording. You can use {\tt KP$\_$n} to move the
|
||||
playhead to the n-th marker.
|
||||
|
||||
%emov Editor Moving the Playhead in the Editor
|
||||
|
||||
%rop Editor Region Operations
|
||||
|
||||
%grid Editor Grid Settings + Editor Modes
|
||||
|
||||
%select Editor Selecting
|
||||
|
||||
%gselect Global Selecting
|
||||
|
||||
%ranges Editor Defining Loop, Punch Range and Tempo Changes
|
||||
|
||||
%markers Editor Markers \& Locations
|
||||
The "move" commands all move the active marker(s). Jump to the first 9 markers using
|
||||
the keypad digits 1-9 (requires numlock).
|
||||
|
||||
%mmode Editor Mouse Modes
|
||||
|
||||
%mouse Editor Mouse Usage
|
||||
Right click on most objects and controls displays a context menu
|
||||
Shift+Right click deletes most objects.
|
||||
OS X users without a 3 button mouse can use {\tt Option+Ctrl+Left} to simulate "Middle" for some purposes.
|
||||
Use F1 to step through mouse modes.
|
||||
|
||||
%mobject Editor Mouse Object Mode
|
||||
This mode provides many different operations on both regions and control points, partially depending on where you click/drag with the mouse. The "body" of a region is the area where the waveform is displayed.
|
||||
|
||||
%mzoom Editor Mouse Zoom Mode
|
||||
%mops Editor Mouse Ops on Solo/Mute/Rec-enable
|
||||
%mopsolo Editor Mouse Ops on Solo Buttons only
|
||||
%mopsfader Editor Mouse Ops on Faders \& Plugin Controls
|
||||
|
||||
%midi Global Global MIDI commands
|
||||
|
||||
%notes MIDI Note Editing
|
||||
|
||||
%rec Recorder Recorder Page
|
||||
|
||||
;; END GROUP DEFINITIONS
|
||||
|
||||
;; punctuation
|
||||
|
||||
@vis|Editor/temporal-zoom-in| equal|zoom in
|
||||
@vis|Editor/temporal-zoom-out| minus|zoom out
|
||||
@vis|Editor/zoom-to-session| <@SECONDARY@><@TERTIARY@>underscore|zoom to session
|
||||
|
||||
@trans|Transport/ToggleRoll| space|toggle roll
|
||||
@trans|Transport/ToggleRollForgetCapture| <@PRIMARY@>space|stop and destroy
|
||||
@trans|Transport/record-roll| <@TERTIARY@>space|start recording
|
||||
|
||||
@gmark|Common/add-location-from-playhead| Tab|add marker
|
||||
|
||||
@ranges|Editor/set-loop-from-edit-range| bracketright|set loop range from edit range
|
||||
|
||||
;; Alt+number row: region operations
|
||||
@rop|Region/toggle-region-mute| <@SECONDARY@>1|mute/unmute
|
||||
@rop|Region/normalize-region| <@SECONDARY@>3|normalize
|
||||
@rop|Region/boost-region-gain| <@SECONDARY@>6|increase region gain
|
||||
@rop|Region/cut-region-gain| <@SECONDARY@>7|reduce region gain
|
||||
|
||||
;; letters
|
||||
;; TOP ROW
|
||||
|
||||
;; note that ctrl-w is special and consumed by the keyboard snooper
|
||||
|
||||
@gmark|Common/jump-backward-to-mark| q|to previous mark
|
||||
@sess|Common/Quit| <@PRIMARY@>q|quit
|
||||
@gmark|Common/jump-forward-to-mark| w|to next mark
|
||||
@sess|Main/QuickExport| <@PRIMARY@>e|quick export session
|
||||
@rop|Region/export-region| <@PRIMARY@><@SECONDARY@>e|export selected region(s)
|
||||
@sess|Main/StemExport| <@SECONDARY@><@TERTIARY@>e|stem export selected tracks
|
||||
@mmode|MouseMode/set-mouse-mode-range| r|range mode
|
||||
@edit|Editor/redo| <@PRIMARY@>r|redo
|
||||
@trans|Transport/Record| <@TERTIARY@>r|engage record
|
||||
@edit|Editor/alternate-redo| <@PRIMARY@>y|redo
|
||||
@sess|Common/addExistingAudioFiles| <@PRIMARY@>i|import audio files
|
||||
@gselect|Common/invert-selection| <@PRIMARY@><@TERTIARY@>i|invert selection
|
||||
@sess|Main/Open| <@PRIMARY@>o|open an existing session
|
||||
@sess|Main/Recent| <@PRIMARY@><@TERTIARY@>o|open a recent session
|
||||
@edit|Editor/set-playhead| p|set playhead position
|
||||
|
||||
;; MIDDLE ROW
|
||||
|
||||
@trans|Transport/solo-selection| a|solo selection
|
||||
@select|Editor/select-all-objects| <@PRIMARY@>a|select all objects
|
||||
@wvis|Window/toggle-audio-connection-manager| <@SECONDARY@><@TERTIARY@>a|toggle audio patchbay
|
||||
@rop|Editor/split-region| s|split/separate
|
||||
@sess|Common/Save| <@PRIMARY@>s|save session
|
||||
@vis|Editor/fit-selection| f|fit selection vertically
|
||||
@edit|Editor/toggle-stationary-playhead| <@TERTIARY@>f|toggle stationary playhead
|
||||
@mmode|MouseMode/set-mouse-mode-object| g|object mode
|
||||
@edit|Editor/group-selected-regions| <@PRIMARY@>g|group selected regions
|
||||
@edit|Editor/ungroup-selected-regions| <@PRIMARY@><@TERTIARY@>g|ungroup selected regions
|
||||
@trans|Transport/Loop| l|loop play (the loop range)
|
||||
|
||||
;; BOTTOM ROW
|
||||
|
||||
@mmode|Editor/zoom-to-selection| z|zoom to selection
|
||||
@edit|Editor/undo| <@PRIMARY@>z|undo
|
||||
@edit|Editor/alternate-alternate-redo| <@PRIMARY@><@TERTIARY@>z|redo
|
||||
@edit|Editor/editor-cut| <@PRIMARY@>x|cut
|
||||
@mmode|MouseMode/set-mouse-mode-cut| c|cut mode
|
||||
@edit|Editor/editor-copy| <@PRIMARY@>c|copy
|
||||
@edit|Editor/editor-crop| <@PRIMARY@><@SECONDARY@>c|crop range
|
||||
@edit|Editor/editor-paste| <@PRIMARY@>v|paste
|
||||
@sess|Main/AddTrackBus| <@PRIMARY@><@TERTIARY@>n|add track(s) or bus(ses)
|
||||
@sess|Main/New| <@PRIMARY@>n|open a new session
|
||||
|
||||
;; arrow keys, navigation etc.
|
||||
|
||||
@vis|Editor/step-tracks-up| Up|scroll up (step)
|
||||
@select|Editor/select-prev-route| <@SECONDARY@>Up|select previous track/bus
|
||||
@select|Editor/select-prev-stripable| <@SECONDARY@><@TERTIARY@>Up|select previous strip
|
||||
@vis|Editor/move-selected-tracks-up| <@PRIMARY@>Up|move selected tracks up
|
||||
|
||||
@vis|Editor/step-tracks-down| Down|scroll down (step)
|
||||
@select|Editor/select-next-route| <@SECONDARY@>Down|select next track/bus
|
||||
@select|Editor/select-next-stripable| <@SECONDARY@><@TERTIARY@>Down|select next strip
|
||||
@vis|Editor/move-selected-tracks-down| <@PRIMARY@>Down|move selected tracks down
|
||||
|
||||
@movp|Common/playhead-backward-to-grid| Left|to previous grid point
|
||||
@movp|Common/playhead-forward-to-grid| Right|to next grid point
|
||||
|
||||
@vis|Editor/scroll-tracks-down| Page_Down|scroll down (page)
|
||||
@vis|Editor/scroll-tracks-up| Page_Up|scroll up (page)
|
||||
@movp|Transport/GotoStart| Home|to start marker
|
||||
@movp|Transport/GotoEnd| End|to end marker
|
||||
@edit|Editor/editor-delete| Delete|delete
|
||||
@edit|Editor/alternate-editor-delete| BackSpace|backspace (delete)
|
||||
|
||||
;; this one is super-global, so we put it in the session group but don't show
|
||||
;; it on cheat sheets etc.
|
||||
@gedt|Main/Escape|Escape|break drag or deselect all
|
||||
|
||||
;; keypad
|
||||
|
||||
@gmark|Common/alternate-jump-forward-to-mark| <@PRIMARY@>KP_Right|to next mark
|
||||
@gmark|Common/alternate-jump-backward-to-mark| <@PRIMARY@>KP_Left|to previous mark
|
||||
|
||||
@gedt|Common/start-range| comma|some text
|
||||
@gedt|Common/finish-range| period|some text
|
||||
|
||||
@gmark|Common/alternate-add-location-from-playhead| KP_Enter|add mark at playhead
|
||||
@gmark|Common/alternate-remove-location-from-playhead|<@PRIMARY@>KP_Enter|add mark at playhead
|
||||
|
||||
@numpad|Transport/numpad-decimal| KP_Decimal|numpad decimal should initiate and finalize a locate-to-marker
|
||||
@numpad|Transport/alternate-numpad-decimal| KP_Separator|(some keybd layouts have separator instead of decimal)
|
||||
|
||||
@numpad|Transport/numpad-0|KP_0|some text
|
||||
@numpad|Transport/numpad-1|KP_1|some text
|
||||
@numpad|Transport/numpad-2|KP_2|some text
|
||||
@numpad|Transport/numpad-3|KP_3|some text
|
||||
@numpad|Transport/numpad-4|KP_4|some text
|
||||
@numpad|Transport/numpad-5|KP_5|some text
|
||||
@numpad|Transport/numpad-6|KP_6|some text
|
||||
@numpad|Transport/numpad-7|KP_7|some text
|
||||
@numpad|Transport/numpad-8|KP_8|some text
|
||||
@numpad|Transport/numpad-9|KP_9|some text
|
||||
|
||||
;; F-N keys
|
||||
|
||||
@vws|Editor/save-visual-state-1|<@PRIMARY@>F1|some text
|
||||
@vws|Editor/save-visual-state-2|<@PRIMARY@>F2|some text
|
||||
@vws|Editor/save-visual-state-3|<@PRIMARY@>F3|some text
|
||||
@vws|Editor/save-visual-state-4|<@PRIMARY@>F4|some text
|
||||
@vws|Editor/save-visual-state-5|<@PRIMARY@>F5|some text
|
||||
@vws|Editor/save-visual-state-6|<@PRIMARY@>F6|some text
|
||||
@vws|Editor/save-visual-state-7|<@PRIMARY@>F7|some text
|
||||
@vws|Editor/save-visual-state-8|<@PRIMARY@>F8|some text
|
||||
@vws|Editor/save-visual-state-9|<@PRIMARY@>F9|some text
|
||||
@vws|Editor/save-visual-state-10|<@PRIMARY@>F10|some text
|
||||
@vws|Editor/save-visual-state-11|<@PRIMARY@>F11|some text
|
||||
@vws|Editor/save-visual-state-12|<@PRIMARY@>F12|some text
|
||||
|
||||
@vws|Editor/goto-visual-state-1|F1|some text
|
||||
@vws|Editor/goto-visual-state-2|F2|some text
|
||||
@vws|Editor/goto-visual-state-3|F3|some text
|
||||
@vws|Editor/goto-visual-state-4|F4|some text
|
||||
@vws|Editor/goto-visual-state-5|F5|some text
|
||||
@vws|Editor/goto-visual-state-6|F6|some text
|
||||
@vws|Editor/goto-visual-state-7|F7|some text
|
||||
@vws|Editor/goto-visual-state-8|F8|some text
|
||||
@vws|Editor/goto-visual-state-9|F9|some text
|
||||
@vws|Editor/goto-visual-state-10|F10|some text
|
||||
@vws|Editor/goto-visual-state-11|F11|some text
|
||||
@vws|Editor/goto-visual-state-12|F12|some text
|
||||
|
||||
|
||||
;; numbers
|
||||
|
||||
@trans|Transport/ToggleExternalSync| <@SECONDARY@>grave|toggle external sync
|
||||
@gmode|Transport/ToggleAutoReturn| 7|toggle auto return
|
||||
|
||||
; mouse stuff
|
||||
|
||||
@+mobject|foo|left-click:on body|select
|
||||
@+mobject|foo|<@TERTIARY@>left-click:on body|extend selection
|
||||
@+mobject|foo|<@PRIMARY@>left-click:on body|add/remove selection
|
||||
@+mobject|foo|left-drag:on body|move region(s)
|
||||
@+mobject|foo|<@PRIMARY@>left-drag:on body|copy+move region(s)
|
||||
@+mobject|foo|<@PRIMARY@>middle-drag:on body|fixed time copy+move
|
||||
@+mobject|foo|middle-drag:on body|fixed time move
|
||||
@+mobject|foo|<@SECONDARY@><@TERTIARY@>midde:on body|lower region
|
||||
@+mobject|foo|<@TERTIARY@>middle:on body|raise region
|
||||
@+mobject|foo|<@PRIMARY@>left-drag:in trim bar|slip audio in region
|
||||
@+mobject|foo|left-click:in trim bar|set region start
|
||||
@+mobject|foo|middle:in trim bar|set region end
|
||||
@+mobject|foo|left-drag:near ends of trim bar|adjust region edges
|
||||
@+mobject|foo|left-click:in auto track|add control point
|
||||
@+mobject|foo|left-drag:on point|move control point
|
||||
@+mobject|foo|middle-drag:on point|fixed time adjust
|
||||
@+mobject|foo|<@PRIMARY@>left-drag:on point|move point+later points
|
||||
@+mobject|foo|<@PRIMARY@>middle-drag:on point|fixed time move
|
||||
@+mobject|foo|left-drag:on line|move line segment
|
||||
@+mobject|foo|<@PRIMARY@><@SECONDARY@>left-drag:on regions|rubber-band select
|
||||
@+mobject|foo|left-drag:in auto track|rubber-band select\linebreak control points
|
||||
@+mobject|foo|left-drag:empty space|rubber-band select
|
||||
|
||||
; mouse zoom
|
||||
@+mzoom|foo|<@PRIMARY@>middle|zoom to session
|
||||
@+mzoom|foo|middle-click|zoom out
|
||||
@+mzoom|foo|left-click|zoom in
|
||||
@+mzoom|foo|left+drag |define the new visible area
|
||||
|
||||
; mouse solo etc.
|
||||
@+mops|foo|<@PRIMARY@>middle-click|learn MIDI control
|
||||
@+mops|foo|<@PRIMARY@><@TERTIARY@>left-click|apply to all tracks/busses
|
||||
@+mops|foo|<@PRIMARY@>left-click|apply to group
|
||||
@+mops|foo|middle-click|momentary switch
|
||||
@+mops|foo|left-click|apply to track or active group
|
||||
|
||||
; mouse solo
|
||||
|
||||
@+mopsolo|foo|<@PRIMARY@><@SECONDARY@>left-click|exclusive solo
|
||||
@+mopsolo|foo|<@TERTIARY@>left-click|temporary latched solo
|
||||
|
||||
; mouse fader etc.
|
||||
|
||||
@+mopsfader|foo|<@PRIMARY@>middle-click|learn MIDI control
|
||||
@+mopsfader|foo|<@TERTIARY@>left-click|reset to default
|
||||
@+mopsfader|foo|<@PRIMARY@><@SECONDARY@>left-drag|finest-drag control
|
||||
@+mopsfader|foo|<@PRIMARY@>left-drag|fine-drag control
|
||||
@+mopsfader|foo|left-drag|adjust
|
||||
|
||||
;; MIDI Editing
|
||||
|
|
@ -14,7 +14,6 @@
|
|||
<menuitem action='addExistingAudioFiles'/>
|
||||
<menu name='Export' action='Export'>
|
||||
<menuitem action='QuickExport'/>
|
||||
<menuitem action='ExportAudio'/>
|
||||
<menuitem action='StemExport'/>
|
||||
</menu>
|
||||
#ifdef __APPLE__
|
||||
|
|
@ -32,6 +31,8 @@
|
|||
<menuitem action='ToggleRoll'/>
|
||||
<menuitem action='Record'/>
|
||||
<separator/>
|
||||
<menuitem action='record-roll'/>
|
||||
<separator/>
|
||||
<menu action="MovePlayHeadMenu">
|
||||
<menuitem action='add-location-from-playhead'/>
|
||||
<menuitem action='jump-forward-to-mark'/>
|
||||
|
|
@ -39,6 +40,9 @@
|
|||
<menuitem action='GotoStart'/>
|
||||
<menuitem action='GotoEnd'/>
|
||||
</menu>
|
||||
<menuitem action='solo-selection'/>
|
||||
<separator/>
|
||||
<menuitem action='set-playhead'/>
|
||||
<separator/>
|
||||
<menuitem action='ToggleFollowEdits'/>
|
||||
<menuitem action='ToggleAutoReturn'/>
|
||||
|
|
@ -48,10 +52,12 @@
|
|||
<menu name='Edit' action='Edit'>
|
||||
<menuitem action='undo'/>
|
||||
<menuitem action='redo'/>
|
||||
<separator/>
|
||||
<menuitem action='editor-cut'/>
|
||||
<menuitem action='editor-copy'/>
|
||||
<menuitem action='editor-paste'/>
|
||||
<menuitem action='editor-cut'/>
|
||||
<menuitem action='editor-delete'/>
|
||||
<menuitem action='editor-crop'/>
|
||||
<separator/>
|
||||
<menuitem action='select-loop-range'/>
|
||||
<separator/>
|
||||
|
|
@ -93,6 +99,8 @@
|
|||
<menuitem action="toggle-arrangement-ruler"/>
|
||||
<menuitem action="toggle-scene-marker-ruler"/>
|
||||
<menu action="ZoomMenu">
|
||||
<menuitem action="fit-selection"/>
|
||||
<menuitem action="zoom-to-selection"/>
|
||||
<menuitem action='temporal-zoom-in'/>
|
||||
<menuitem action='temporal-zoom-out'/>
|
||||
<menuitem action='zoom-to-session'/>
|
||||
|
|
@ -100,8 +108,13 @@
|
|||
</menu>
|
||||
|
||||
<menu action = 'WindowMenu'>
|
||||
<menuitem action='toggle-audio-midi-setup'/>
|
||||
<separator/>
|
||||
<menuitem action='toggle-transport-masters'/>
|
||||
<separator/>
|
||||
<menuitem action='toggle-audio-connection-manager'/>
|
||||
<menuitem action='toggle-midi-connection-manager'/>
|
||||
<separator/>
|
||||
<menuitem action='NewMIDITracer'/>
|
||||
</menu>
|
||||
</menubar>
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
<Color name="theme:bg" value="4a4a4cff"/>
|
||||
<Color name="theme:bg1" value="383737ff"/>
|
||||
<Color name="theme:bg2" value="000000ff"/>
|
||||
<Color name="theme:contrasting clock" value="df7b15ff"/>
|
||||
<Color name="theme:contrasting less" value="D68839"/>
|
||||
<Color name="theme:contrasting selection" value="D68839"/> <!--same as contrasting less-->
|
||||
<Color name="theme:contrasting clock" value="E57F42ff"/>
|
||||
<Color name="theme:contrasting less" value="C4915Cff"/>
|
||||
<Color name="theme:contrasting selection" value="C4915Cff"/> <!--same as contrasting less-->
|
||||
<Color name="theme:contrast" value="CCA336ff"/>
|
||||
<Color name="theme:contrast2" value="65ACCCff"/>
|
||||
<Color name="neutral:backgroundest" value="000000ff"/> <!--border color-->
|
||||
|
|
|
|||
|
|
@ -51,7 +51,11 @@ UI_CONFIG_VARIABLE (bool, new_automation_points_on_lane, "new-automation-points-
|
|||
UI_CONFIG_VARIABLE (bool, automation_edit_cancels_auto_hide, "automation-edit-cancels-auto-hide", false)
|
||||
UI_CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi")
|
||||
UI_CONFIG_VARIABLE (std::string, keyboard_layout_name, "keyboard-layout-name", "ansi")
|
||||
#ifndef LIVETRAX
|
||||
UI_CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour")
|
||||
#else
|
||||
UI_CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "livetrax")
|
||||
#endif
|
||||
UI_CONFIG_VARIABLE (std::string, vkeybd_layout, "vkeybd-layout", "QWERTY Single")
|
||||
UI_CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", true)
|
||||
UI_CONFIG_VARIABLE (bool, autoplay_files, "autoplay-files", false)
|
||||
|
|
@ -134,12 +138,12 @@ UI_CONFIG_VARIABLE (bool, use_wm_visibility, "use-wm-visibility", true)
|
|||
UI_CONFIG_VARIABLE (bool, use_palette_for_new_track, "use-palette-for-new-track", true)
|
||||
UI_CONFIG_VARIABLE (bool, use_palette_for_new_bus, "use-palette-for-new-bus", true)
|
||||
UI_CONFIG_VARIABLE (bool, use_palette_for_new_vca, "use-palette-for-new-vca", true)
|
||||
UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#4752E3:#41E9FA:#5AAA52:#DBC439:#FF8842:#FF4FFE:#435AFA:#38FFD0:#FF8842:#FFC52B:#B4A1FF:#93F0FA:#93FF8A:#FFEA78:#FFAC7D:#FEA6FF:#98A6FA:#8FFFE3:#C1FF7D:#FFDC82") /* Gtk::ColorSelection::palette_to_string */
|
||||
UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#AA3939:#FFAAAA:#D46A6A:#801515:#550000:#AA8E39:#FFEAAA:#D4BA6A:#806515:#554000:#343477:#8080B3:#565695:#1A1A59:#09093B:#2D882D:#88CC88:#55AA55:#116611:#004400") /* Gtk::ColorSelection::palette_to_string */
|
||||
#else
|
||||
UI_CONFIG_VARIABLE (bool, use_palette_for_new_track, "use-palette-for-new-track", false)
|
||||
UI_CONFIG_VARIABLE (bool, use_palette_for_new_bus, "use-palette-for-new-bus", false)
|
||||
UI_CONFIG_VARIABLE (bool, use_palette_for_new_vca, "use-palette-for-new-vca", false)
|
||||
UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#AA3939:#FFAAAA:#D46A6A:#801515:#550000:#AA8E39:#FFEAAA:#D4BA6A:#806515:#554000:#343477:#8080B3:#565695:#1A1A59:#09093B:#2D882D:#88CC88:#55AA55:#116611:#004400") /* Gtk::ColorSelection::palette_to_string */
|
||||
UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#5577D7:#41E9FA:#5AAA52:#DBC439:#FF8842:#FF4FFE:#435AFA:#38FFD0:#FF8842:#FFC52B:#B4A1FF:#93F0FA:#93FF8A:#FFEA78:#FFAC7D:#FEA6FF:#98A6FA:#8FFFE3:#C1FF7D:#FFDC82") /* Gtk::ColorSelection::palette_to_string */
|
||||
#endif
|
||||
UI_CONFIG_VARIABLE (bool, use_note_bars_for_velocity, "use-note-bars-for-velocity", true)
|
||||
UI_CONFIG_VARIABLE (bool, use_note_color_for_velocity, "use-note-color-for-velocity", true)
|
||||
|
|
|
|||
|
|
@ -925,7 +925,7 @@ def build(bld):
|
|||
# explicitly state the use of perl here so that it works on windows too
|
||||
#
|
||||
a_rule = 'perl %s/tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap 1 ${SRC[0].abspath()} >${TGT}' % (bld.top_dir, sys.platform, bld.env['WINDOWS_KEY'] )
|
||||
for b in [ 'ardour' ] :
|
||||
for b in [ 'ardour', 'livetrax' ] :
|
||||
obj = bld(
|
||||
target = b + '.keys',
|
||||
source = [ b + '.keys.in', 'mixer.bindings' ],
|
||||
|
|
|
|||
|
|
@ -90,7 +90,11 @@ CONFIG_VARIABLE (bool, videotimeline_pullup, "videotimeline-pullup", true)
|
|||
CONFIG_VARIABLE (double, wave_amplitude_zoom, "wave-amplitude-zoom", 0.0)
|
||||
CONFIG_VARIABLE (uint16_t, wave_zoom_factor, "wave-zoom-factor", 2)
|
||||
CONFIG_VARIABLE (bool, show_summary, "show-summary", true)
|
||||
#ifndef LIVETRAX
|
||||
CONFIG_VARIABLE (bool, show_group_tabs, "show-group-tabs", true)
|
||||
#else
|
||||
CONFIG_VARIABLE (bool, show_group_tabs, "show-group-tabs", false)
|
||||
#endif
|
||||
CONFIG_VARIABLE (bool, show_region_fades, "show-region-fades", true)
|
||||
CONFIG_VARIABLE (bool, show_busses_on_meterbridge, "show-busses-on-meterbridge", false)
|
||||
CONFIG_VARIABLE (bool, show_master_on_meterbridge, "show-master-on-meterbridge", true)
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
ardour {
|
||||
["type"] = "SessionInit",
|
||||
name = "Advanced Session",
|
||||
description = [[Allow to configure master-bus and autoconnect settings]],
|
||||
master_bus = 0
|
||||
}
|
||||
|
||||
function factory () return function ()
|
||||
|
||||
local auto_connect_in = {
|
||||
[0] = "Manually",
|
||||
[1] = "automatically to physical inputs",
|
||||
}
|
||||
|
||||
local auto_connect_out = {
|
||||
[0] = "Manually",
|
||||
[1] = "automatically to physical outputs",
|
||||
[2] = "automatically to master bus",
|
||||
}
|
||||
|
||||
local dialog_options = {
|
||||
{ type = "heading", title = "Customize Session: " .. Session:name () },
|
||||
{ type = "number", key = "master", title = "Master bus channels", min = 0, max = 24, step = 1, digits = 0, default = 2 },
|
||||
{ type = "checkbox", key = "monitor", title = "Add monitor section", default = ARDOUR.config():get_use_monitor_bus () },
|
||||
{ type = "dropdown", key = "ac_input", title = "Autoconnect Inputs",
|
||||
values = {
|
||||
[auto_connect_in[0]] = 0,
|
||||
[auto_connect_in[1]] = 1,
|
||||
},
|
||||
default = auto_connect_in[ARDOUR.config():get_input_auto_connect ()]
|
||||
},
|
||||
{ type = "dropdown", key = "ac_output", title = "Autoconnect Outputs",
|
||||
values = {
|
||||
[auto_connect_out[0]] = 0,
|
||||
[auto_connect_out[1]] = 1,
|
||||
[auto_connect_out[2]] = 2,
|
||||
},
|
||||
default = auto_connect_out[ARDOUR.config():get_output_auto_connect ()]
|
||||
},
|
||||
}
|
||||
|
||||
local dlg = LuaDialog.Dialog ("Template Setup", dialog_options)
|
||||
local rv = dlg:run()
|
||||
if (not rv) then return end
|
||||
|
||||
if rv['master'] > 0 then
|
||||
local count = ARDOUR.ChanCount ( ARDOUR.DataType("audio"), rv['master'])
|
||||
Session:add_master_bus (count)
|
||||
end
|
||||
|
||||
if rv['monitor'] then
|
||||
ARDOUR.config():set_use_monitor_bus (true)
|
||||
end
|
||||
|
||||
ARDOUR.config():set_input_auto_connect (rv['ac_input'])
|
||||
ARDOUR.config():set_output_auto_connect (rv['ac_output'])
|
||||
|
||||
Session:save_state("");
|
||||
end end
|
||||
Loading…
Reference in New Issue