ardour
/
livetrax
13
0
Fork 0
Code

Compare commits

base: ardour:b30e1470ef1a6f6ca6f45a3f6b526f943c92ecb1
Branches Tags
ardour:master
ardour:livetrax+10.1
...
compare: ardour:2b8967ac122f9c2bac231b202f1a85f1ea680346
Branches Tags
ardour:master
ardour:livetrax+10.1

5 Commits
b30e1470ef ... 2b8967ac12

Author SHA1 Message Date
Ben Loftis 2b8967ac12 L: tweaks to global track-header widget layout 2024-05-07 16:07:31 -05:00
Ben Loftis 7e2ebca512 L: pack the track-sizer menu atop track headers 2024-05-07 16:07:31 -05:00
Ben Loftis 796720b685 L: set Actions for marker buttons, incl "Add Section Marker" action 2024-05-07 16:07:31 -05:00
Ben Loftis 9134a6968a L: (backport?) add an action to explicitly create section markers 2024-05-07 16:07:31 -05:00
Ben Loftis 8b09ece660 L: Location markers and section markers must be separate (reverts 84f637) 2024-05-07 16:07:31 -05:00
11 changed files with 64 additions and 22 deletions
Show Stats Expand all files Collapse all files

4
gtk2_ardour/ardour_ui.cc
View File

@ -321,9 +321,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, editor_meter(0)
, _clear_editor_meter( true)
, _editor_meter_peaked (false)
, _livetrax_btn_rec_none (_("Rec None"))
, _livetrax_btn_peak_reset (_("Reset Peaks"))
, _livetrax_btn_marker_new (_("Marker"))
, _livetrax_btn_new_section (_("+Sec"))
, _livetrax_btn_new_location (_("+Loc"))
, _livetrax_btn_prev_marker (_("<< Prev"))
, _livetrax_btn_next_marker (_("Next >>"))
, _livetrax_centering_sizegroup (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))

4
gtk2_ardour/ardour_ui.h
View File

@ -657,10 +657,10 @@ private:
Gtk::HBox livetrax_prefs_bar;
Gtk::HBox livetrax_mixer_bar;
ArdourWidgets::ArdourButton _livetrax_btn_rec_none;
ArdourWidgets::ArdourButton _livetrax_btn_peak_reset;
ArdourWidgets::ArdourButton _livetrax_btn_marker_new;
ArdourWidgets::ArdourButton _livetrax_btn_new_section;
ArdourWidgets::ArdourButton _livetrax_btn_new_location;
ArdourWidgets::ArdourButton _livetrax_btn_prev_marker;
ArdourWidgets::ArdourButton _livetrax_btn_next_marker;

31
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -481,8 +481,9 @@ ARDOUR_UI::livetrax_setup_windows ()
int TCOL = 0;
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 (_livetrax_btn_new_section, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_l.attach (_livetrax_btn_new_location, TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_l.attach (_livetrax_btn_next_marker, TCOL+3, TCOL+4, 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_l.attach (sync_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4); TCOL++;
@ -500,16 +501,13 @@ ARDOUR_UI::livetrax_setup_windows ()
TCOL = 0;
livetrax_top_table_r.attach (*editor->mouse_mode_hbox, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (editor->_track_box, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL+=2;
livetrax_top_table_r.attach (_livetrax_btn_peak_reset, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (editor->_zoom_box, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
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_none, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4); TCOL+=2;
livetrax_top_table_r.attach (_livetrax_btn_peak_reset, TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*ev_dsp, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (disk_space_label, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
@ -593,6 +591,25 @@ ARDOUR_UI::livetrax_setup_windows ()
we_have_dependents ();
_livetrax_btn_prev_marker.set_tooltip_text(_("Jump to Prior Marker"));
_livetrax_btn_prev_marker.set_elements(ArdourButton::Element (ArdourButton::VectorIcon|ArdourButton::Edge|ArdourButton::Body));
_livetrax_btn_prev_marker.set_icon(ArdourWidgets::ArdourIcon::ScrollLeft);
act = ActionManager::get_action (X_("Common"), X_("jump-backward-to-mark"));
_livetrax_btn_prev_marker.set_related_action (act);
_livetrax_btn_next_marker.set_tooltip_text(_("Jump to Next Marker"));
_livetrax_btn_next_marker.set_icon(ArdourWidgets::ArdourIcon::ScrollRight);
act = ActionManager::get_action (X_("Common"), X_("jump-forward-to-mark"));
_livetrax_btn_next_marker.set_related_action (act);
_livetrax_btn_new_location.set_tooltip_text(_("Create a New Location at Playhead"));
act = ActionManager::get_action (X_("Common"), X_("add-location-from-playhead"));
_livetrax_btn_new_location.set_related_action (act);
_livetrax_btn_new_section.set_tooltip_text(_("Start a New Section at Playhead"));
act = ActionManager::get_action (X_("Common"), X_("add-section-from-playhead"));
_livetrax_btn_new_section.set_related_action (act);
/* order of addition affects order seen in initial window display */
main_vpacker.pack_start (menu_bar_base, false, false);

2
gtk2_ardour/ardour_ui_ed.cc
View File

@ -662,6 +662,8 @@ ARDOUR_UI::install_dependent_actions ()
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (common_actions, "add-location-from-playhead", _("Add Mark from Playhead"), sigc::mem_fun(editor, &PublicEditor::add_location_from_playhead_cursor));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (common_actions, "add-section-from-playhead", _("Add Section Marker from Playhead"), sigc::mem_fun(editor, &PublicEditor::add_section_marker_from_playhead_cursor));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (common_actions, "alternate-add-location-from-playhead", _("Add Mark from Playhead"), sigc::mem_fun(editor, &PublicEditor::add_location_from_playhead_cursor));
ActionManager::session_sensitive_actions.push_back (act);

18
gtk2_ardour/editor.cc
View File

@ -687,8 +687,19 @@ Editor::Editor ()
UI::instance()->set_tip (solo_btn, _("When active, something is soloed.\nClick to de-solo everything"));
solo_btn.set_related_action (ActionManager::get_action (X_("Main"), X_("cancel-solo")));
time_bars_hbox.pack_start (_livetrax_btn_rec_all, true, true);
time_bars_hbox.pack_start (solo_btn, true, true);
VBox *tsizer = manage(new VBox);
tsizer->pack_end(_track_box, false, false, 4);
VBox *rsizer = manage(new VBox);
rsizer->pack_end(_livetrax_btn_rec_all, false, false, 4);
VBox *ssizer = manage(new VBox);
ssizer->pack_end(solo_btn, false, false, 4);
time_bars_hbox.pack_start (*tsizer, true, true);
time_bars_hbox.pack_start (*manage(new Label()), true, true);
time_bars_hbox.pack_end (*rsizer, false, false, 12);
time_bars_hbox.pack_end (*ssizer, false, false);
time_bars_event_box.add (time_bars_hbox);
#else
time_bars_event_box.add (time_bars_vbox);
@ -3399,6 +3410,9 @@ Editor::setup_toolbar ()
mouse_mode_size_group->add_widget (zoom_focus_selector);
mouse_mode_size_group->add_widget (tav_shrink_button);
mouse_mode_size_group->add_widget (tav_expand_button);
#ifdef LIVETRAX
mouse_mode_size_group->add_widget (visible_tracks_selector);
#endif
} else {
mouse_mode_size_group->add_widget (zoom_preset_selector);
mouse_mode_size_group->add_widget (visible_tracks_selector);

1
gtk2_ardour/editor.h
View File

@ -1642,6 +1642,7 @@ private:
void toggle_location_at_playhead_cursor ();
void add_location_from_playhead_cursor ();
void add_section_marker_from_playhead_cursor ();
bool do_remove_location_at_playhead_cursor ();
void remove_location_at_playhead_cursor ();
bool select_new_marker;

12
gtk2_ardour/editor_ops.cc
View File

@ -2441,6 +2441,18 @@ Editor::add_location_from_playhead_cursor ()
add_location_mark (timepos_t (_session->audible_sample()));
}
void
Editor::add_section_marker_from_playhead_cursor ()
{
timepos_t where = timepos_t(_session->audible_sample());
add_location_mark (where);
Location *mark = _session->locations()->mark_at (where);
if (mark) {
mark->set_section(true);
}
}
bool
Editor::do_remove_location_at_playhead_cursor ()
{

1
gtk2_ardour/luainstance.cc
View File

@ -930,6 +930,7 @@ LuaInstance::register_classes (lua_State* L, bool sandbox)
.addFunction ("goto_nth_marker", &PublicEditor::goto_nth_marker)
.addFunction ("add_location_from_playhead_cursor", &PublicEditor::add_location_from_playhead_cursor)
.addFunction ("add_section_marker_from_playhead_cursor", &PublicEditor::add_section_marker_from_playhead_cursor)
.addFunction ("remove_location_at_playhead_cursor", &PublicEditor::remove_location_at_playhead_cursor)
.addFunction ("add_location_mark", &PublicEditor::add_location_mark)

1
gtk2_ardour/public_editor.h
View File

@ -257,6 +257,7 @@ public:
virtual void trigger_script (int nth) = 0;
virtual void add_bbt_marker_at_playhead_cursor () = 0;
virtual void add_location_from_playhead_cursor () = 0;
virtual void add_section_marker_from_playhead_cursor () = 0;
virtual void remove_location_at_playhead_cursor () = 0;
virtual void add_location_mark (Temporal::timepos_t const & where) = 0;
virtual void update_grid () = 0;

6
gtk2_ardour/route_time_axis.cc
View File

@ -187,9 +187,9 @@ RouteTimeAxisView::set_route (std::shared_ptr<Route> rt)
monitor_input_button->show ();
controls_table.attach (number_label, 0, 1, 0, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (*rec_enable_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (*mute_button, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (*solo_button, 5, 6, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (*mute_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (*solo_button, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_button_size_group->add_widget(*mute_button);
controls_button_size_group->add_widget(*solo_button);

6
libs/ardour/location.cc
View File

@ -1144,12 +1144,6 @@ Locations::add (Location *loc, bool make_current)
}
}
#ifdef LIVETRAX
if ( loc->flags() == Location::IsMark ) { //generic Location marker; upgrade to section marker
loc->set_section(true);
}
#endif
locations.push_back (loc);
if (make_current) {