merge from 2.0-ongoing by hand, minus key binding editor

[ardour.git] / gtk2_ardour / add_midi_cc_track_dialog.cc

diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc
index c80b64135826755a5d4b67e83b376e73de8ab116..e1a3a89bd6bbdd73eb0150c1836d699725183e6e 100644 (file)
--- a/gtk2_ardour/add_midi_cc_track_dialog.cc
+++ b/gtk2_ardour/add_midi_cc_track_dialog.cc
@@ -49,24 +49,27 @@ AddMidiCCTrackDialog::AddMidiCCTrackDialog ()
        _cc_num_spinner.set_name ("AddMidiCCTrackDialogSpinner");
        
        HBox *hbox = manage (new HBox());
+       Label *label = manage(new Label("Controller Number: "));
 
-       hbox->pack_start(*manage(new Label("Controller Number: ")), true, true, 4);
+       hbox->pack_start(*label, true, true, 4);
        hbox->pack_start(_cc_num_spinner, false, false, 4);
 
        get_vbox()->pack_start(*hbox, true, true, 4);
 
-       show_all();
-
        add_button (Stock::CANCEL, RESPONSE_CANCEL);
        add_button (Stock::ADD, RESPONSE_ACCEPT);
+
+       _cc_num_spinner.show();
+       hbox->show();
+       label->show();
 }
 
 
-ARDOUR::ParamID
+ARDOUR::Parameter
 AddMidiCCTrackDialog::parameter ()
 {
        int cc_num = _cc_num_spinner.get_value_as_int();
 
-       return ParamID(MidiCCAutomation, cc_num);
+       return Parameter(MidiCCAutomation, cc_num);
 }