diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 52 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 15 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 33 | ||||
| -rw-r--r-- | gtk2_ardour/keyboard.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 36 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.h | 5 |
6 files changed, 32 insertions, 115 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 71ef0387cf..bd2b7fced0 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -707,40 +707,6 @@ ARDOUR_UI::update_wall_clock () return TRUE; } -void -ARDOUR_UI::control_methods_adjusted () - -{ - int which_method; - - which_method = (int) online_control_button->adjustment.get_value(); - switch (which_method) { - case 0: - allow_mmc_and_local (); - break; - case 1: - allow_mmc_only (); - break; - case 2: - allow_local_only (); - break; - default: - fatal << _("programming error: impossible control method") << endmsg; - } -} - - -void -ARDOUR_UI::mmc_device_id_adjusted () - -{ -#if 0 - if (mmc) { - int dev_id = (int) mmc_id_button->adjustment.get_value(); - mmc->set_device_id (dev_id); - } -#endif -} gint ARDOUR_UI::session_menu (GdkEventButton *ev) @@ -1310,24 +1276,6 @@ ARDOUR_UI::map_transport_state () } void -ARDOUR_UI::allow_local_only () -{ - -} - -void -ARDOUR_UI::allow_mmc_only () -{ - -} - -void -ARDOUR_UI::allow_mmc_and_local () -{ - -} - -void ARDOUR_UI::GlobalClickBox::printer (char buf[32], Adjustment &adj, void *arg) { snprintf (buf, sizeof(buf), "%s", ((GlobalClickBox *) arg)->strings[ diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index dfef964c67..00d8deacbf 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -273,9 +273,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI GlobalClickBox *crossfade_time_button; vector<string> crossfade_time_strings; - GlobalClickBox *mmc_id_button; - vector<string> mmc_id_strings; - Gtk::ToggleButton preroll_button; Gtk::ToggleButton postroll_button; @@ -285,7 +282,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI int setup_windows (); void setup_transport (); void setup_clock (); - void setup_adjustables (); static ARDOUR_UI *theArdourUI; @@ -313,9 +309,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void start_blinking (); void stop_blinking (); - void control_methods_adjusted (); - void mmc_device_id_adjusted (); - void about_signal_response(int response); private: @@ -467,14 +460,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void transport_rec_enable_blink (bool onoff); - /* These change where we accept control from: - MMC, X (local) or both. - */ - - void allow_mmc_only (); - void allow_mmc_and_local (); - void allow_local_only (); - Gtk::Menu* session_popup_menu; struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord { diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 5f1f0e3b7b..bb7e306c8d 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -73,7 +73,6 @@ ARDOUR_UI::setup_windows () setup_clock (); setup_transport(); - setup_adjustables (); build_menu_bar (); top_packer.pack_start (menu_bar_base, false, false); @@ -85,38 +84,6 @@ ARDOUR_UI::setup_windows () } void -ARDOUR_UI::setup_adjustables () -{ - adjuster_table.set_homogeneous (true); - - online_control_strings.push_back (_("MMC + Local")); - online_control_strings.push_back (_("MMC")); - online_control_strings.push_back (_("Local")); - - online_control_button = new GlobalClickBox ("CONTROL", - online_control_strings); - - online_control_button->adjustment.signal_value_changed().connect(mem_fun(*this,&ARDOUR_UI::control_methods_adjusted)); - - mmc_id_strings.push_back ("1"); - mmc_id_strings.push_back ("2"); - mmc_id_strings.push_back ("3"); - mmc_id_strings.push_back ("4"); - mmc_id_strings.push_back ("5"); - mmc_id_strings.push_back ("6"); - mmc_id_strings.push_back ("7"); - mmc_id_strings.push_back ("8"); - mmc_id_strings.push_back ("9"); - - mmc_id_button = new GlobalClickBox (_("MMC ID"), mmc_id_strings); - - mmc_id_button->adjustment.signal_value_changed().connect (mem_fun(*this,&ARDOUR_UI::mmc_device_id_adjusted)); - - adjuster_table.attach (*online_control_button, 0, 2, 1, 2, FILL|EXPAND, FILL, 5, 5); - adjuster_table.attach (*mmc_id_button, 2, 3, 1, 2, FILL, FILL, 5, 5); -} - -void ARDOUR_UI::transport_stopped () { stop_button.set_visual_state (1); diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 517ef973d4..e7a537716e 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -76,12 +76,6 @@ Keyboard::Keyboard () } Meta = possible_meta[i]; - if (Meta) { - cerr << "Using " << possible_meta[i] << " for Meta\n"; - } else { - cerr << "NO Meta\n"; - } - snooper_id = gtk_key_snooper_install (_snooper, (gpointer) this); XMLNode* node = ARDOUR_UI::instance()->keyboard_settings(); diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 13acfbf5ab..79fe5dd2e3 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -75,6 +75,9 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) /* MIDI */ + mmc_device_id_adjustment (0.0, 0.0, (double) 0x7f, 1.0, 16.0), + mmc_device_id_spinner (mmc_device_id_adjustment), + /* Click */ click_table (2, 3), @@ -368,23 +371,28 @@ OptionEditor::setup_midi_options () ToggleButton* tb; RadioButton* rb; - Gtk::Table* table = manage (new Table (ports.size() + 4, 9)); + Gtk::Table* table = manage (new Table (ports.size() + 4, 10)); table->set_row_spacings (6); table->set_col_spacings (10); - table->attach (*(manage (new Label (X_("Port")))), 0, 1, 0, 1); - table->attach (*(manage (new Label (X_("Offline")))), 1, 2, 0, 1); - table->attach (*(manage (new Label (X_("Trace\nInput")))), 2, 3, 0, 1); - table->attach (*(manage (new Label (X_("Trace\nOutput")))), 3, 4, 0, 1); - table->attach (*(manage (new Label (X_("MTC")))), 4, 5, 0, 1); - table->attach (*(manage (new Label (X_("MMC")))), 6, 7, 0, 1); - table->attach (*(manage (new Label (X_("MIDI Parameter\nControl")))), 8, 9, 0, 1); + table->attach (*(manage (new Label (_("Port")))), 0, 1, 0, 1); + table->attach (*(manage (new Label (_("Offline")))), 1, 2, 0, 1); + table->attach (*(manage (new Label (_("Trace\nInput")))), 2, 3, 0, 1); + table->attach (*(manage (new Label (_("Trace\nOutput")))), 3, 4, 0, 1); + table->attach (*(manage (new Label (_("MTC")))), 4, 5, 0, 1); + table->attach (*(manage (new Label (_("MMC")))), 6, 7, 0, 1); + table->attach (*(manage (new Label (_("MIDI Parameter\nControl")))), 8, 9, 0, 1); table->attach (*(manage (new HSeparator())), 0, 9, 1, 2); table->attach (*(manage (new VSeparator())), 5, 6, 0, 8); table->attach (*(manage (new VSeparator())), 7, 8, 0, 8); + table->attach (*(manage (new Label (_("MMC Device ID")))), 9, 10, 0, 1); + table->attach (mmc_device_id_spinner, 9, 10, 1, 2); + + mmc_device_id_adjustment.signal_value_changed().connect (mem_fun (*this, &OptionEditor::mmc_device_id_adjusted)); + for (n = 0, i = ports.begin(); i != ports.end(); ++n, ++i) { pair<MIDI::Port*,vector<RadioButton*> > newpair; @@ -554,12 +562,22 @@ OptionEditor::map_port_online (MIDI::Port* port, ToggleButton* tb) } void +OptionEditor::mmc_device_id_adjusted () +{ + uint8_t id = (uint8_t) mmc_device_id_spinner.get_value(); + + if (id != Config->get_mmc_device_id()) { + Config->set_mmc_device_id (id); + } +} + +void OptionEditor::port_trace_in_toggled (MIDI::Port* port, ToggleButton* tb) { bool trace = tb->get_active(); if (port->input()->tracing() != trace) { - port->output()->trace (trace, &cerr, string (port->name()) + string (" input: ")); + port->input()->trace (trace, &cerr, string (port->name()) + string (" input: ")); } } diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index cc28a74e60..009ac90de4 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -111,6 +111,9 @@ class OptionEditor : public Gtk::Dialog Gtk::RadioButton::Group mmc_button_group; Gtk::RadioButton::Group midi_button_group; + Gtk::Adjustment mmc_device_id_adjustment; + Gtk::SpinButton mmc_device_id_spinner; + 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*); @@ -119,6 +122,8 @@ class OptionEditor : public Gtk::Dialog void mtc_port_chosen (MIDI::Port*,Gtk::RadioButton*); void midi_port_chosen (MIDI::Port*,Gtk::RadioButton*); + void mmc_device_id_adjusted (); + void map_port_online (MIDI::Port*, Gtk::ToggleButton*); void setup_midi_options(); |