smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +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

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"))
, hide_check_button (_("Hide"))
, lock_check_button (_("Lock"))
, glue_check_button (_("Glue"))
, _clock_group (0)
{
@ -83,7 +82,6 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
cd_check_button.set_name ("LocationEditCdButton");
hide_check_button.set_name ("LocationEditHideButton");
lock_check_button.set_name ("LocationEditLockButton");
glue_check_button.set_name ("LocationEditGlueButton");
isrc_label.set_name ("LocationEditNumberLabel");
isrc_entry.set_name ("LocationEditNameEntry");
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));
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));
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));
@ -250,7 +247,6 @@ LocationEditRow::set_location (Location *loc)
if (!hide_check_button.get_parent()) {
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 (glue_check_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0);
Glib::DateTime gdt(Glib::DateTime::create_now_local (location->timestamp()));
string date = gdt.format ("%F %H:%M");
@ -259,7 +255,6 @@ LocationEditRow::set_location (Location *loc)
}
hide_check_button.set_active (location->is_hidden());
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()) {
// use label instead of entry
@ -304,7 +299,6 @@ LocationEditRow::set_location (Location *loc)
hide_check_button.show();
lock_check_button.show();
glue_check_button.show();
}
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->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->TimeDomainChanged.connect (connections, invalidator (*this), boost::bind (&LocationEditRow::time_domain_changed, this), gui_context());
}
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
LocationEditRow::remove_button_pressed ()
{
@ -689,7 +668,6 @@ LocationEditRow::flags_changed ()
cd_check_button.set_active (location->is_cd_marker());
hide_check_button.set_active (location->is_hidden());
glue_check_button.set_active (location->position_time_domain() == Temporal::BeatTime);
i_am_the_modifier--;
}
@ -710,20 +688,6 @@ LocationEditRow::lock_changed ()
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
LocationEditRow::focus_name()
{