smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

locations now follow session time domain, always (probably) (GUI edition)

Browse source
This commit is contained in:
Paul Davis 2023-07-21 15:34:37 -06:00
parent 1b9f4999df
commit d14a3b924e
4 changed files with 0 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/editor.h
View file

@ -1849,7 +1849,6 @@ private:
void toggle_tempo_type (); void toggle_tempo_type ();
void ramp_to_next_tempo (); void ramp_to_next_tempo ();
void toggle_marker_menu_lock (); void toggle_marker_menu_lock ();
void toggle_marker_menu_glue ();
void marker_menu_hide (); void marker_menu_hide ();
void marker_menu_set_origin (); void marker_menu_set_origin ();
void marker_menu_loop_range (); void marker_menu_loop_range ();

46
gtk2_ardour/editor_markers.cc
View file

@ -1104,12 +1104,6 @@ Editor::build_marker_menu (Location* loc)
lock_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_lock)); lock_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_lock));
} }
items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
glue_item->set_active (loc->position_time_domain() == Temporal::BeatTime);
glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
@ -1138,13 +1132,6 @@ Editor::build_range_marker_menu (Location* loc, bool loop_or_punch, bool session
items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range))); items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
items.push_back (SeparatorElem());
items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
glue_item->set_active (loc->position_time_domain() == Temporal::BeatTime);
glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Loudness Assistant..."), sigc::mem_fun(*this, &Editor::loudness_assistant_marker))); items.push_back (MenuElem (_("Loudness Assistant..."), sigc::mem_fun(*this, &Editor::loudness_assistant_marker)));
items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range))); items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range)));
@ -1959,39 +1946,6 @@ Editor::jump_to_loop_marker (bool start)
} }
} }
void
Editor::toggle_marker_menu_glue ()
{
ArdourMarker* marker;
if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
Location* loc;
bool ignored;
loc = find_location_from_marker (marker, ignored);
if (!loc) {
return;
}
begin_reversible_command (_("change marker lock style"));
XMLNode &before = _session->locations()->get_state();
if (loc->position_time_domain() == Temporal::BeatTime) {
loc->set_position_time_domain (Temporal::AudioTime);
} else {
loc->set_position_time_domain (Temporal::BeatTime);
}
XMLNode &after = _session->locations()->get_state();
_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
commit_reversible_command ();
}
void void
Editor::toggle_marker_lines () Editor::toggle_marker_lines ()
{ {

36
gtk2_ardour/location_ui.cc
View file

@ -67,7 +67,6 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
, cd_check_button (_("CD")) , cd_check_button (_("CD"))
, hide_check_button (_("Hide")) , hide_check_button (_("Hide"))
, lock_check_button (_("Lock")) , lock_check_button (_("Lock"))
, glue_check_button (_("Glue"))
, _clock_group (0) , _clock_group (0)
{ {
@ -83,7 +82,6 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
cd_check_button.set_name ("LocationEditCdButton"); cd_check_button.set_name ("LocationEditCdButton");
hide_check_button.set_name ("LocationEditHideButton"); hide_check_button.set_name ("LocationEditHideButton");
lock_check_button.set_name ("LocationEditLockButton"); lock_check_button.set_name ("LocationEditLockButton");
glue_check_button.set_name ("LocationEditGlueButton");
isrc_label.set_name ("LocationEditNumberLabel"); isrc_label.set_name ("LocationEditNumberLabel");
isrc_entry.set_name ("LocationEditNameEntry"); isrc_entry.set_name ("LocationEditNameEntry");
scms_check_button.set_name ("LocationEditCdButton"); scms_check_button.set_name ("LocationEditCdButton");
@ -168,7 +166,6 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
cd_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::cd_toggled)); cd_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::cd_toggled));
hide_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::hide_toggled)); hide_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::hide_toggled));
lock_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::lock_toggled)); lock_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::lock_toggled));
glue_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::glue_toggled));
remove_button.signal_clicked.connect(sigc::mem_fun(*this, &LocationEditRow::remove_button_pressed)); remove_button.signal_clicked.connect(sigc::mem_fun(*this, &LocationEditRow::remove_button_pressed));
@ -250,7 +247,6 @@ LocationEditRow::set_location (Location *loc)
if (!hide_check_button.get_parent()) { if (!hide_check_button.get_parent()) {
item_table.attach (hide_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0); item_table.attach (hide_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0);
item_table.attach (lock_check_button, 6, 7, 0, 1, FILL, Gtk::FILL, 4, 0); item_table.attach (lock_check_button, 6, 7, 0, 1, FILL, Gtk::FILL, 4, 0);
item_table.attach (glue_check_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0);
Glib::DateTime gdt(Glib::DateTime::create_now_local (location->timestamp())); Glib::DateTime gdt(Glib::DateTime::create_now_local (location->timestamp()));
string date = gdt.format ("%F %H:%M"); string date = gdt.format ("%F %H:%M");
@ -259,7 +255,6 @@ LocationEditRow::set_location (Location *loc)
} }
hide_check_button.set_active (location->is_hidden()); hide_check_button.set_active (location->is_hidden());
lock_check_button.set_active (location->locked()); lock_check_button.set_active (location->locked());
glue_check_button.set_active (location->position_time_domain() == Temporal::BeatTime);
if (location->is_auto_loop() || location-> is_auto_punch()) { if (location->is_auto_loop() || location-> is_auto_punch()) {
// use label instead of entry // use label instead of entry
@ -304,7 +299,6 @@ LocationEditRow::set_location (Location *loc)
hide_check_button.show(); hide_check_button.show();
lock_check_button.show(); lock_check_button.show();
glue_check_button.show();
} }
start_clock.set (location->start(), true); start_clock.set (location->start(), true);
@ -359,7 +353,6 @@ LocationEditRow::set_location (Location *loc)
location->Changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::location_changed, this), gui_context()); location->Changed.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::location_changed, this), gui_context());
location->FlagsChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::flags_changed, this), gui_context()); location->FlagsChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::flags_changed, this), gui_context());
location->LockChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::lock_changed, this), gui_context()); location->LockChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::lock_changed, this), gui_context());
location->TimeDomainChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::time_domain_changed, this), gui_context());
} }
void void
@ -565,20 +558,6 @@ LocationEditRow::lock_toggled ()
} }
} }
void
LocationEditRow::glue_toggled ()
{
if (i_am_the_modifier || !location) {
return;
}
if (location->position_time_domain() == Temporal::AudioTime) {
location->set_position_time_domain (Temporal::BeatTime);
} else {
location->set_position_time_domain (Temporal::AudioTime);
}
}
void void
LocationEditRow::remove_button_pressed () LocationEditRow::remove_button_pressed ()
{ {
@ -689,7 +668,6 @@ LocationEditRow::flags_changed ()
cd_check_button.set_active (location->is_cd_marker()); cd_check_button.set_active (location->is_cd_marker());
hide_check_button.set_active (location->is_hidden()); hide_check_button.set_active (location->is_hidden());
glue_check_button.set_active (location->position_time_domain() == Temporal::BeatTime);
i_am_the_modifier--; i_am_the_modifier--;
} }
@ -710,20 +688,6 @@ LocationEditRow::lock_changed ()
i_am_the_modifier--; i_am_the_modifier--;
} }
void
LocationEditRow::time_domain_changed ()
{
if (!location) {
return;
}
i_am_the_modifier++;
glue_check_button.set_active (location->position_time_domain() == Temporal::BeatTime);
i_am_the_modifier--;
}
void void
LocationEditRow::focus_name() LocationEditRow::focus_name()
{ {

3
gtk2_ardour/location_ui.h
View file

@ -98,7 +98,6 @@ protected:
Gtk::CheckButton cd_check_button; Gtk::CheckButton cd_check_button;
Gtk::CheckButton hide_check_button; Gtk::CheckButton hide_check_button;
Gtk::CheckButton lock_check_button; Gtk::CheckButton lock_check_button;
Gtk::CheckButton glue_check_button;
ArdourWidgets::ArdourButton remove_button; ArdourWidgets::ArdourButton remove_button;
@ -134,7 +133,6 @@ protected:
void cd_toggled (); void cd_toggled ();
void hide_toggled (); void hide_toggled ();
void lock_toggled (); void lock_toggled ();
void glue_toggled ();
void remove_button_pressed (); void remove_button_pressed ();
void scms_toggled (); void scms_toggled ();
@ -146,7 +144,6 @@ protected:
void location_changed (); void location_changed ();
void flags_changed (); void flags_changed ();
void lock_changed (); void lock_changed ();
void time_domain_changed ();
void set_clock_editable_status (); void set_clock_editable_status ();
void show_cd_track_details (); void show_cd_track_details ();