move auto-input into session options/properties dialog, move auto-play and auto-retur...

git-svn-id: svn://localhost/ardour2/branches/3.0@10507 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 729272b95bd81a44aab22b59999034f12482a5c2..cd1da334877b0b4de7434aa33b8e063046747cde 100644 (file)
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -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"

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 750480b5d7488758d41285b59f102b7022c4a37e..4fa21188b664fc9bc8156456bd0a76596c4af832 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -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);

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 076f9f2f5225019dc11423b5066d5f5ed70c638c..e663b149de3512c223720fb95892e62347657cef 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -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);

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index 38c420f73ae6e49446a396865f1efd4d12327646..b382fa1025f960759d1a185c80b123b5185a0130 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -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)")));