diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-17 16:14:44 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-17 16:14:44 +0000 |
commit | 5f37d769351d03acfa6e1704fb9f54fcf57c3c60 (patch) | |
tree | a113b60b3c020c03131b9a9ad82965ef374ca16b /gtk2_ardour | |
parent | 98d93c221a8bd45d90369ff1b52e3f43dad35233 (diff) |
fixes for MIDI port setup; options editor now sets trace options correctly (still not saved); MTC now sent immediately after asking for it, not after first stop; add svn_revision.h to avoid compile errors
git-svn-id: svn://localhost/ardour2/trunk@1138 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/option_editor.cc | 41 | ||||
-rw-r--r-- | gtk2_ardour/option_editor.h | 6 |
3 files changed, 22 insertions, 26 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 962683ebea..0f5f5987a3 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -269,7 +269,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt Gtk::Requisition requisition; scrollbar.size_request (requisition); scrollbar_height = requisition.height; - cerr << "scrollbar height = " << scrollbar_height << endl; } EventBox* spacer = manage (new EventBox); diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 8f50cfc975..3e461a85d7 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -322,8 +322,6 @@ OptionEditor::destructo_xfade_adjustment_changed () Config->set_destructive_xfade_msecs ((uint32_t) floor (val)); - cerr << "set destructo fade to " << Config->get_destructive_xfade_msecs () << endl; - if (session) { SndFileSource::setup_standard_crossfades (session->frame_rate()); } @@ -423,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); @@ -547,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 @@ -570,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 diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index d3235164a6..2076da3935 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -116,9 +116,9 @@ class OptionEditor : public Gtk::Dialog Gtk::RadioButton::Group mmc_button_group; Gtk::RadioButton::Group midi_button_group; - gint port_online_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*); - gint port_trace_in_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*); - gint port_trace_out_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*); + void port_online_toggled (MIDI::Port*,Gtk::ToggleButton*); + void port_trace_in_toggled (MIDI::Port*,Gtk::ToggleButton*); + void port_trace_out_toggled (MIDI::Port*,Gtk::ToggleButton*); void mmc_port_chosen (MIDI::Port*,Gtk::RadioButton*); void mtc_port_chosen (MIDI::Port*,Gtk::RadioButton*); |