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

Fix MidiPortOptions Preferences

Browse source 
* Show Treeview again if it was hidden
* Hide heading(s) and table when no ports are available
* Fix memory leak, unmanaged OptionEditorHeading
* remove unused members
This commit is contained in:
Robin Gareus 2021-01-17 00:15:13 +01:00
parent 0b0339f089
commit e49adb55c0
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

59
gtk2_ardour/rc_option_editor.cc
View file

@ -1992,32 +1992,32 @@ private:
class MidiPortOptions : public OptionEditorMiniPage, public sigc::trackable class MidiPortOptions : public OptionEditorMiniPage, public sigc::trackable
{ {
public: public:
MidiPortOptions() : refill_id (-1) { MidiPortOptions()
: input_heading (_("MIDI Inputs"))
, output_heading (_("MIDI Outputs"))
{
setup_midi_port_view (midi_output_view, false); setup_midi_port_view (midi_output_view, false);
setup_midi_port_view (midi_input_view, true); setup_midi_port_view (midi_input_view, true);
OptionEditorHeading* h = new OptionEditorHeading (_("MIDI Inputs")); input_heading.add_to_page (this);
h->add_to_page (this);
Gtk::ScrolledWindow* scroller = manage (new Gtk::ScrolledWindow); input_scroller.add (midi_input_view);
scroller->add (midi_input_view); input_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
scroller->set_policy (POLICY_NEVER, POLICY_AUTOMATIC); input_scroller.set_size_request (-1, 180);
scroller->set_size_request (-1, 180); input_scroller.show ();
int n = table.property_n_rows(); int n = table.property_n_rows();
table.attach (*scroller, 0, 3, n, n + 1, FILL | EXPAND); table.attach (input_scroller, 0, 3, n, n + 1, FILL | EXPAND);
h = new OptionEditorHeading (_("MIDI Outputs")); output_heading.add_to_page (this);
h->add_to_page (this);
scroller = manage (new Gtk::ScrolledWindow); output_scroller.add (midi_output_view);
scroller->add (midi_output_view); output_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
scroller->set_policy (POLICY_NEVER, POLICY_AUTOMATIC); output_scroller.set_size_request (-1, 180);
scroller->set_size_request (-1, 180); output_scroller.show ();
n = table.property_n_rows(); n = table.property_n_rows();
table.attach (*scroller, 0, 3, n, n + 1, FILL | EXPAND); table.attach (output_scroller, 0, 3, n, n + 1, FILL | EXPAND);
midi_output_view.show (); midi_output_view.show ();
midi_input_view.show (); midi_input_view.show ();
@ -2030,7 +2030,6 @@ class MidiPortOptions : public OptionEditorMiniPage, public sigc::trackable
void set_state_from_config() {} void set_state_from_config() {}
void on_map () { void on_map () {
refill (); refill ();
AudioEngine::instance()->PortRegisteredOrUnregistered.connect (connections, AudioEngine::instance()->PortRegisteredOrUnregistered.connect (connections,
@ -2052,19 +2051,20 @@ class MidiPortOptions : public OptionEditorMiniPage, public sigc::trackable
} }
void refill () { void refill () {
if (refill_midi_ports (true, midi_input_view)) { if (refill_midi_ports (true, midi_input_view)) {
input_label.show (); input_heading.tip_widget ().show ();
input_scroller.show ();
} else { } else {
input_label.hide (); input_heading.tip_widget ().hide ();
input_scroller.hide ();
} }
if (refill_midi_ports (false, midi_output_view)) { if (refill_midi_ports (false, midi_output_view)) {
output_label.show (); output_heading.tip_widget ().show ();
output_scroller.show ();
} else { } else {
output_label.hide (); output_heading.tip_widget ().hide ();
output_scroller.hide ();
} }
refill_id = -1;
} }
private: private:
@ -2095,9 +2095,11 @@ class MidiPortOptions : public OptionEditorMiniPage, public sigc::trackable
MidiPortColumns midi_port_columns; MidiPortColumns midi_port_columns;
Gtk::TreeView midi_input_view; Gtk::TreeView midi_input_view;
Gtk::TreeView midi_output_view; Gtk::TreeView midi_output_view;
Gtk::Label input_label;
Gtk::Label output_label; Gtk::ScrolledWindow input_scroller;
int refill_id; Gtk::ScrolledWindow output_scroller;
OptionEditorHeading input_heading;
OptionEditorHeading output_heading;
void setup_midi_port_view (Gtk::TreeView&, bool with_selection); void setup_midi_port_view (Gtk::TreeView&, bool with_selection);
bool refill_midi_ports (bool for_input, Gtk::TreeView&); bool refill_midi_ports (bool for_input, Gtk::TreeView&);
@ -2186,6 +2188,8 @@ MidiPortOptions::refill_midi_ports (bool for_input, Gtk::TreeView& view)
return false; return false;
} }
view.unset_model ();
Glib::RefPtr<ListStore> model = Gtk::ListStore::create (midi_port_columns); Glib::RefPtr<ListStore> model = Gtk::ListStore::create (midi_port_columns);
for (vector<string>::const_iterator s = ports.begin(); s != ports.end(); ++s) { for (vector<string>::const_iterator s = ports.begin(); s != ports.end(); ++s) {
@ -2203,6 +2207,7 @@ MidiPortOptions::refill_midi_ports (bool for_input, Gtk::TreeView& view)
} }
view.set_model (model); view.set_model (model);
view.show ();
return true; return true;
} }