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

move auto-input into session options/properties dialog, move auto-play and auto-return next to the transport buttons; show ">24hrs" when there is truly a lot of disk space available

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10507 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-11-09 17:29:23 +00:00
parent 121860f9d4
commit 17da9339c2
4 changed files with 52 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour3_widget_list.rc
View file

@ -392,3 +392,4 @@ widget "*MonitorSectionLabel" style:highest "very_small_text"
widget "*mute button" style:highest "small_text"
widget "*send alert button" style:highest "small_text"
widget "*solo button" style:highest "small_text"
widget "*transport option button" style:highest "small_text"

29
gtk2_ardour/ardour_ui.cc
View file

@ -1138,19 +1138,24 @@ ARDOUR_UI::update_disk_space()
int secs;
hrs = frames / (fr * 3600);
frames -= hrs * fr * 3600;
mins = frames / (fr * 60);
frames -= mins * fr * 60;
secs = frames / fr;
bool const low = (hrs == 0 && mins <= 30);
snprintf (
buf, sizeof(buf),
_("Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"),
low ? X_("red") : X_("green"),
hrs, mins, secs
);
if (hrs > 24) {
snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
} else {
frames -= hrs * fr * 3600;
mins = frames / (fr * 60);
frames -= mins * fr * 60;
secs = frames / fr;
bool const low = (hrs == 0 && mins <= 30);
snprintf (
buf, sizeof(buf),
_("Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"),
low ? X_("red") : X_("green"),
hrs, mins, secs
);
}
}
disk_space_label.set_markup (buf);

45
gtk2_ardour/ardour_ui2.cc
View file

@ -388,6 +388,27 @@ ARDOUR_UI::setup_transport ()
transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0);
/* transport related toggle controls */
HBox* toggle_box = manage(new HBox);
VBox* auto_box = manage (new VBox);
auto_box->set_spacing (2);
auto_box->set_homogeneous (true);
toggle_box->set_spacing (2);
toggle_box->set_homogeneous (true);
auto_box->pack_start (auto_play_button, true, false);
auto_box->pack_start (auto_return_button, true, false);
if (!Profile->get_small_screen()) {
toggle_box->pack_start (*auto_box, false, false);
}
//VBox* io_box = manage (new VBox);
//io_box->pack_start (auto_input_button, false, false);
//io_box->pack_start (click_button, false, false);
//if (!Profile->get_small_screen()) {
// toggle_box->pack_start (*io_box, false, false);
//}
transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
Table* time_controls_table = manage (new Table (2, 2));
time_controls_table->set_col_spacings (6);
time_controls_table->attach (sync_button, 0, 1, 0, 1, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0));
@ -401,27 +422,7 @@ ARDOUR_UI::setup_transport ()
time_info_box = manage (new TimeInfoBox);
transport_tearoff_hbox.pack_start (*time_info_box, false, false);
HBox* toggle_box = manage(new HBox);
VBox* auto_box = manage (new VBox);
auto_box->pack_start (auto_play_button, false, false);
auto_box->pack_start (auto_return_button, false, false);
if (!Profile->get_small_screen()) {
toggle_box->pack_start (*auto_box, false, false);
}
VBox* io_box = manage (new VBox);
io_box->pack_start (auto_input_button, false, false);
//io_box->pack_start (click_button, false, false);
if (!Profile->get_small_screen()) {
toggle_box->pack_start (*io_box, false, false);
}
/* desensitize */
set_transport_sensitivity (false);
transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
if (Profile->get_small_screen()) {
transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4);
}
@ -432,6 +433,10 @@ ARDOUR_UI::setup_transport ()
transport_tearoff_hbox.pack_end (*img, false, false, 6);
}
/* desensitize */
set_transport_sensitivity (false);
XMLNode* tnode = tearoff_settings ("transport");
if (tnode) {
transport_tearoff->set_state (*tnode);

9
gtk2_ardour/session_option_editor.cc
View file

@ -243,6 +243,15 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
add_option (_("Media"), spo);
/* Monitoring */
add_option (_("Monitoring"), new BoolOption (
"auto-input",
_("Monitoring automatically follows transport state (\"auto-input\")"),
sigc::mem_fun (*_session_config, &SessionConfiguration::get_auto_input),
sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_input)
));
/* Misc */
add_option (_("Misc"), new OptionEditorHeading (_("Layering (in overlaid mode)")));