try that one on for size (VST build fu)

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 013761a86a091b08cd76b23a7243042431efe863..3e461a85d7b475cad4ecaa169801d5c3cc8abff9 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -248,16 +248,16 @@ OptionEditor::add_session_paths ()
        click_emphasis_path_entry.set_sensitive (true);
        session_raid_entry.set_sensitive (true);
 
-       if (session->click_sound.length() == 0) {
+       if (Config->get_click_sound().empty()) {
                click_path_entry.set_text (_("internal"));
        } else {
-               click_path_entry.set_text (session->click_sound);
+               click_path_entry.set_text (Config->get_click_sound());
        }
 
-       if (session->click_emphasis_sound.length() == 0) {
+       if (Config->get_click_emphasis_sound().empty()) {
                click_emphasis_path_entry.set_text (_("internal"));
        } else {
-               click_emphasis_path_entry.set_text (session->click_emphasis_sound);
+               click_emphasis_path_entry.set_text (Config->get_click_emphasis_sound());
        }
 
        session_raid_entry.set_text(session->raid_path());
@@ -308,7 +308,7 @@ OptionEditor::short_xfade_adjustment_changed ()
                
                /* val is in msecs */
                
-               Crossfade::set_short_xfade_length ((jack_nframes_t) floor (session->frame_rate() * (val / 1000.0)));
+               Crossfade::set_short_xfade_length ((nframes_t) floor (session->frame_rate() * (val / 1000.0)));
        }
 }
 
@@ -318,11 +318,12 @@ OptionEditor::destructo_xfade_adjustment_changed ()
        float val = destructo_xfade_adjustment.get_value();
 
        /* val is in msecs */
+
        
        Config->set_destructive_xfade_msecs ((uint32_t) floor (val));
 
        if (session) {
-               DestructiveFileSource::setup_standard_crossfades (session->frame_rate());
+               SndFileSource::setup_standard_crossfades (session->frame_rate());
        } 
 }
 
@@ -366,7 +367,7 @@ void
 OptionEditor::smpte_offset_chosen()
 {
        if (session) {
-               jack_nframes_t frames = smpte_offset_clock.current_duration();
+               nframes_t frames = smpte_offset_clock.current_duration();
                session->set_smpte_offset (frames);
        }
 }
@@ -420,19 +421,19 @@ OptionEditor::setup_midi_options ()
                }
 
                tb->set_active (!(*i).second->input()->offline());
-               tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), (*i).second, tb));
+               tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), (*i).second, tb));
                (*i).second->input()->OfflineStatusChanged.connect (bind (mem_fun(*this, &OptionEditor::map_port_online), (*i).second, tb));
                table->attach (*tb, 1, 2, n+2, n+3, FILL|EXPAND, FILL);
 
                tb = manage (new ToggleButton ());
                tb->set_name ("OptionEditorToggleButton");
-               tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
+               tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
                tb->set_size_request (10, 10);
                table->attach (*tb, 2, 3, n+2, n+3, FILL|EXPAND, FILL);
 
                tb = manage (new ToggleButton ());
                tb->set_name ("OptionEditorToggleButton");
-               tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
+               tb->signal_toggled().connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
                tb->set_size_request (10, 10);
                table->attach (*tb, 3, 4, n+2, n+3, FILL|EXPAND, FILL);
 
@@ -544,15 +545,14 @@ OptionEditor::midi_port_chosen (MIDI::Port* port, Gtk::RadioButton* rb)
        }
 }
 
-gint
-OptionEditor::port_online_toggled (GdkEventButton* ev, MIDI::Port* port, ToggleButton* tb)
+void
+OptionEditor::port_online_toggled (MIDI::Port* port, ToggleButton* tb)
 {
-       bool wanted = tb->get_active(); /* it hasn't changed at this point */
-
+       bool wanted = tb->get_active();
+       
        if (wanted != port->input()->offline()) {
                port->input()->set_offline (wanted);
        } 
-       return stop_signal (*tb, "button_press_event");
 }
 
 void
@@ -567,24 +567,24 @@ OptionEditor::map_port_online (MIDI::Port* port, ToggleButton* tb)
        }
 }
 
-gint
-OptionEditor::port_trace_in_toggled (GdkEventButton* ev, MIDI::Port* port, ToggleButton* tb)
+void
+OptionEditor::port_trace_in_toggled (MIDI::Port* port, ToggleButton* tb)
 {
-       /* XXX not very good MVC style here */
+       bool trace = tb->get_active();
 
-       port->input()->trace (!tb->get_active(), &cerr, string (port->name()) + string (" input: "));
-       tb->set_active (!tb->get_active());
-       return stop_signal (*tb, "button_press_event");
+       if (port->input()->tracing() != trace) {
+               port->output()->trace (trace, &cerr, string (port->name()) + string (" input: "));
+       }
 }
 
-gint
-OptionEditor::port_trace_out_toggled (GdkEventButton* ev,MIDI::Port* port, ToggleButton* tb)
+void
+OptionEditor::port_trace_out_toggled (MIDI::Port* port, ToggleButton* tb)
 {
-       /* XXX not very good MVC style here */
+       bool trace = tb->get_active();
 
-       port->output()->trace (!tb->get_active(), &cerr, string (port->name()) + string (" output: "));
-       tb->set_active (!tb->get_active());
-       return stop_signal (*tb, "button_press_event");
+       if (port->output()->tracing() != trace) {
+               port->output()->trace (trace, &cerr, string (port->name()) + string (" output: "));
+       }
 }
 
 void
@@ -607,7 +607,7 @@ void
 OptionEditor::raid_path_changed ()
 {
        if (session) {
-               session->set_raid_path (session_raid_entry.get_text());
+               Config->set_raid_path (session_raid_entry.get_text());
        }
 }
 
@@ -655,22 +655,22 @@ OptionEditor::click_sound_changed ()
        if (session) {
                string path = click_path_entry.get_text();
 
-               if (path == session->click_sound) {
+               if (path == Config->get_click_sound()) {
                        return;
                }
 
-               if (path.length() == 0) {
+               if (path.empty()) {
 
-                       session->set_click_sound ("");
+                       Config->set_click_sound ("");
 
                } else {
 
                        strip_whitespace_edges (path);
                        
                        if (path == _("internal")) {
-                               session->set_click_sound ("");
+                               Config->set_click_sound ("");
                        } else {
-                               session->set_click_sound (path);
+                               Config->set_click_sound (path);
                        }
                }
        }
@@ -682,22 +682,22 @@ OptionEditor::click_emphasis_sound_changed ()
        if (session) {
                string path = click_emphasis_path_entry.get_text();
 
-               if (path == session->click_emphasis_sound) {
+               if (path == Config->get_click_emphasis_sound()) {
                        return;
                }
 
-               if (path.length() == 0) {
+               if (path.empty()) {
 
-                       session->set_click_emphasis_sound ("");
+                       Config->set_click_emphasis_sound ("");
 
                } else {
 
                        strip_whitespace_edges (path);
 
                        if (path == _("internal")) {
-                               session->set_click_emphasis_sound ("");
+                               Config->set_click_emphasis_sound ("");
                        } else {
-                               session->set_click_emphasis_sound (path);
+                               Config->set_click_emphasis_sound (path);
                        }
                }
        }