ardour/livetrax
13
0
Fork 0
Code

Compare commits

base: ardour:e88711624a075da03acd33bb689bbf0cab11be67
Branches Tags
ardour:master
ardour:livetrax+10.1
...
compare: ardour:31f1171225cf6ccbc4011d619e9c0186ba0dbe05
Branches Tags
ardour:master
ardour:livetrax+10.1

5 Commits
e88711624a ... 31f1171225

Author SHA1 Message Date
Ben Loftis
31f1171225 L: theme tweaks for conslidated ruler bars 2024-05-20 07:50:44 -05:00
Ben Loftis
52c7b57a9a L: fix a crash on session Close 2024-05-20 07:38:35 -05:00
Ben Loftis
b8f28c062c L: remove menu item for arrangement ruler; it is always shown now 2024-05-19 21:35:06 -05:00
Ben Loftis
d99cbdf04a L: consolidate ruler visibility checks to one place (instant.xml) 2024-05-19 21:34:40 -05:00
Ben Loftis
c81faa8f9e L: ensure the sensitivity of the Open button is correct for the open tab 2024-05-19 21:32:17 -05:00
5 changed files with 41 additions and 24 deletions
Show Stats Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -365,8 +365,10 @@ ARDOUR_UI::unload_session (bool hide_stuff, bool force_unload)
if (hide_stuff) {
close_all_dialogs ();
editor->hide ();
#ifndef LIVETRAX
mixer->hide ();
meterbridge->hide ();
#endif
audio_port_matrix->hide();
midi_port_matrix->hide();
route_params->hide();

30
gtk2_ardour/editor_rulers.cc
View File

@ -439,6 +439,20 @@ Editor::restore_ruler_visibility ()
ruler_section_action->set_active (td == Temporal::BeatTime);
}
if (ARDOUR::Profile->get_livetrax()){
ruler_minsec_action->set_active (false);
ruler_timecode_action->set_active (false);
ruler_samples_action->set_active (false);
ruler_bbt_action->set_active (false);
ruler_meter_action->set_active (false);
ruler_tempo_action->set_active (false);
ruler_timecode_action->set_active (true);
ruler_range_action->set_active (true);
ruler_marker_action->set_active (true);
ruler_section_action->set_active (true);
}
no_ruler_shown_update = false;
update_ruler_visibility ();
}
@ -475,7 +489,7 @@ Editor::update_ruler_visibility ()
videotl_label.hide();
#endif
if (!Profile->get_livetrax() && ruler_minsec_action->get_active()) {
if (ruler_minsec_action->get_active()) {
old_unit_pos = minsec_ruler->position().y;
if (tbpos != old_unit_pos) {
minsec_ruler->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@ -491,7 +505,7 @@ Editor::update_ruler_visibility ()
minsec_label.hide();
}
if (!Profile->get_livetrax() && ruler_samples_action->get_active()) {
if (ruler_samples_action->get_active()) {
old_unit_pos = samples_ruler->position().y;
if (tbpos != old_unit_pos) {
samples_ruler->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@ -507,7 +521,7 @@ Editor::update_ruler_visibility ()
samples_label.hide();
}
if (!Profile->get_livetrax() && ruler_bbt_action->get_active()) {
if (ruler_bbt_action->get_active()) {
old_unit_pos = bbt_ruler->position().y;
if (tbpos != old_unit_pos) {
bbt_ruler->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@ -523,7 +537,7 @@ Editor::update_ruler_visibility ()
bbt_label.hide();
}
if (!Profile->get_livetrax() && ruler_tempo_action->get_active()) {
if (ruler_tempo_action->get_active()) {
old_unit_pos = tempo_group->position().y;
if (tbpos != old_unit_pos) {
tempo_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@ -538,7 +552,7 @@ Editor::update_ruler_visibility ()
tempo_label.hide();
}
if (!Profile->get_livetrax() && ruler_meter_action->get_active()) {
if (ruler_meter_action->get_active()) {
old_unit_pos = meter_group->position().y;
if (tbpos != old_unit_pos) {
meter_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@ -553,7 +567,7 @@ Editor::update_ruler_visibility ()
meter_label.hide();
}
if (!Profile->get_livetrax() && ruler_range_action->get_active()) {
if (ruler_range_action->get_active()) {
old_unit_pos = range_marker_group->position().y;
if (tbpos != old_unit_pos) {
range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@ -609,7 +623,7 @@ Editor::update_ruler_visibility ()
update_marker_display();
}
if (!Profile->get_livetrax() && ruler_video_action->get_active()) {
if (ruler_video_action->get_active()) {
old_unit_pos = videotl_group->position().y;
if (tbpos != old_unit_pos) {
videotl_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@ -626,7 +640,7 @@ Editor::update_ruler_visibility ()
update_video_timeline(true);
}
if (Profile->get_livetrax() || ruler_timecode_action->get_active()) {
if (ruler_timecode_action->get_active()) {
old_unit_pos = timecode_ruler->position().y;
if (tbpos != old_unit_pos) {
timecode_ruler->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));

3
gtk2_ardour/livetrax.menus.in
View File

@ -96,7 +96,6 @@
<menuitem action="primary-clock-samples"/>
</menu>
<menuitem action='ToggleGroupTabs'/>
<menuitem action="toggle-arrangement-ruler"/>
<menu action="ZoomMenu">
<menuitem action="fit-selection"/>
<menuitem action="zoom-to-selection"/>
@ -125,8 +124,6 @@
<menuitem action="toggle-minsec-ruler"/>
<menuitem action="toggle-timecode-ruler"/>
<menuitem action="toggle-samples-ruler"/>
<separator/>
<menuitem action="toggle-arrangement-ruler"/>
</popup>
<popup name='ProcessorMenu' accelerators='true'>

23
gtk2_ardour/session_dialog.cc
View File

@ -166,13 +166,11 @@ SessionDialog::SessionDialog (DialogTab initial_tab, const std::string& session_
existing_session_chooser.show_all();
_tabs.show_all();
_tabs.set_current_page(0);
cancel_button = add_button ((cancel_not_quit ? Stock::CANCEL : Stock::QUIT), RESPONSE_CANCEL);
open_button = add_button (Stock::OPEN, RESPONSE_ACCEPT);
open_button->signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::open_button_pressed), false);
open_button->set_sensitive (false);
if (!template_name.empty()) {
load_template_override = template_name;
@ -204,9 +202,9 @@ SessionDialog::SessionDialog (DialogTab initial_tab, const std::string& session_
}
_tabs.signal_switch_page().connect (sigc::mem_fun (*this, &SessionDialog::tab_page_switched));
_tabs.set_current_page(3); //this will enforce a page-change, so correct widgets get sensitized
if (initial_tab==New) {
_tabs.set_current_page(0);
new_button.set_active_state (Gtkmm2ext::ExplicitActive);
} else if (initial_tab==Open) {
_tabs.set_current_page(2);
} else {
@ -227,6 +225,14 @@ SessionDialog::tab_page_switched(GtkNotebookPage*, guint page_number)
recent_button.set_active_state ( page_number==1 ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off);
existing_button.set_active_state (page_number==2 ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off);
prefs_button.set_active_state ( page_number==3 ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off);
//check the status of each tab and sensitize the 'open' button appropriately
open_button->set_sensitive(false);
switch (page_number) {
case 0: new_name_changed(); break;
case 1: recent_session_row_selected(); break;
case 2: existing_file_selected(); break;
}
}
uint32_t
@ -480,6 +486,11 @@ SessionDialog::setup_existing_box ()
void
SessionDialog::existing_file_selected ()
{
if (_tabs.get_current_page()!=2) {
//gtk filechooser is threaded; don't allow it to mess with open_button sensitivity when it's not actually visible
return;
}
open_button->set_sensitive(false);
float sr;
@ -534,8 +545,6 @@ SessionDialog::new_button_pressed (GdkEventButton*)
{
_tabs.set_current_page(0);
new_name_changed(); //checks for a valid name and (maybe) sensitizes the button
return true;
}
@ -544,8 +553,6 @@ SessionDialog::recent_button_pressed (GdkEventButton*)
{
_tabs.set_current_page(1);
recent_session_row_selected(); //checks for a selection and (maybe) sensitizes the open button
return true;
}
@ -554,8 +561,6 @@ SessionDialog::existing_button_pressed (GdkEventButton*)
{
_tabs.set_current_page(2);
existing_file_selected(); //checks for a selection and (maybe) sensitizes the open button
return true;
}

7
gtk2_ardour/themes/dark-livetrax.colors
View File

@ -195,8 +195,8 @@
<ColorAlias name="lock button: led active" alias="alert:red"/>
<ColorAlias name="lua action button: fill" alias="widget:bg"/>
<ColorAlias name="mapping bar" alias="neutral:background2"/>
<ColorAlias name="marker bar" alias="neutral:backgroundest"/>
<ColorAlias name="marker bar separator" alias="theme:bg2"/>
<ColorAlias name="marker bar" alias="neutral:background"/>
<ColorAlias name="marker bar separator" alias="neutral:backgroundest"/>
<ColorAlias name="marker drag line" alias="theme:contrasting clock"/>
<ColorAlias name="marker label" alias="neutral:backgroundest"/>
<ColorAlias name="marker track" alias="neutral:foreground2"/>
@ -359,7 +359,7 @@
<ColorAlias name="punch line" alias="alert:ruddy"/>
<ColorAlias name="range drag bar rect" alias="neutral:midground"/>
<ColorAlias name="range drag rect" alias="alert:ruddy"/>
<ColorAlias name="range marker bar" alias="neutral:background2"/>
<ColorAlias name="range marker bar" alias="neutral:background"/>
<ColorAlias name="record enable button: fill active" alias="alert:ruddy"/>
<ColorAlias name="record enable button: led active" alias="alert:red"/>
<ColorAlias name="recording rect" alias="alert:ruddy"/>
@ -386,7 +386,6 @@
<ColorAlias name="rude solo: led active" alias="alert:red"/>
<ColorAlias name="ruler base" alias="neutral:background"/>
<ColorAlias name="ruler text" alias="neutral:midground"/>
<ColorAlias name="scene marker bar" alias="neutral:background"/>
<ColorAlias name="scroomer" alias="alert:red"/>
<ColorAlias name="secondary clock: background" alias="theme:bg2"/>
<ColorAlias name="secondary clock: cursor" alias="theme:contrasting less"/>