X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_midi_cc_track_dialog.cc;h=c3ccd92f3c3d9d199fcaa8486f26c524b6bfe9e2;hb=6ab6ad5bb732512d04593b1a5d566d5e787d45ed;hp=8402f47ea1a6aa3859349f5c5c8b101abb4b6ada;hpb=133a66920bbdd3bc11bd4ae866048b0f1f52ecd4;p=ardour.git

diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc
index 8402f47ea1..c3ccd92f3c 100644
--- a/gtk2_ardour/add_midi_cc_track_dialog.cc
+++ b/gtk2_ardour/add_midi_cc_track_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,54 +19,67 @@
 
 #include <cstdio>
 #include <cmath>
+#include <cassert>
 
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
-#include <pbd/error.h>
-#include <pbd/convert.h>
+#include "pbd/error.h"
+#include "pbd/convert.h"
 
 #include "utils.h"
 #include "add_midi_cc_track_dialog.h"
 #include "i18n.h"
 
 using namespace Gtk;
-using namespace sigc;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
 AddMidiCCTrackDialog::AddMidiCCTrackDialog ()
-	: Dialog (_("ardour: add midi controller track")),
-	  _cc_num_adjustment (1, 0, 127, 1, 10),
-	  _cc_num_spinner (_cc_num_adjustment)
+	: Dialog (_("Add MIDI Controller Track"))
+	, _chan_adjustment (1, 1, 16, 1, 8, 8)
+	, _chan_spinner (_chan_adjustment)
+	, _cc_num_adjustment (1, 1, 128, 1, 10, 10)
+	, _cc_num_spinner (_cc_num_adjustment)
 {
 	set_name ("AddMidiCCTrackDialog");
-	set_wmclass (X_("ardour_add_track_bus"), "Ardour");
+	set_wmclass (X_("ardour_add_track_bus"), PROGRAM_NAME);
 	set_position (Gtk::WIN_POS_MOUSE);
 	set_resizable (false);
 
-
+	_chan_spinner.set_name ("AddMidiCCTrackDialogSpinner");
 	_cc_num_spinner.set_name ("AddMidiCCTrackDialogSpinner");
-	
-	HBox *hbox = manage (new HBox());
-
-	hbox->pack_start(*manage(new Label("Controller Number: ")), true, true, 4);
-	hbox->pack_start(_cc_num_spinner, false, false, 4);
 
-	get_vbox()->pack_start(*hbox, true, true, 4);
+	HBox *chan_box = manage (new HBox());
+	Label *chan_label = manage(new Label("Channel: "));
+	chan_box->pack_start(*chan_label, true, true, 4);
+	chan_box->pack_start(_chan_spinner, false, false, 4);
+	get_vbox()->pack_start(*chan_box, true, true, 4);
 
-	show_all();
+	HBox* num_box = manage (new HBox());
+	Label *num_label = manage(new Label("Controller: "));
+	num_box->pack_start(*num_label, true, true, 4);
+	num_box->pack_start(_cc_num_spinner, false, false, 4);
+	get_vbox()->pack_start(*num_box, true, true, 4);
 
 	add_button (Stock::CANCEL, RESPONSE_CANCEL);
 	add_button (Stock::ADD, RESPONSE_ACCEPT);
+
+	_chan_spinner.show();
+	chan_box->show();
+	chan_label->show();
+	_cc_num_spinner.show();
+	num_box->show();
+	num_label->show();
 }
 
 
-ARDOUR::Parameter
+Evoral::Parameter
 AddMidiCCTrackDialog::parameter ()
 {
-	int cc_num = _cc_num_spinner.get_value_as_int();
+	int chan   = _chan_spinner.get_value_as_int() - 1;
+	int cc_num = _cc_num_spinner.get_value_as_int() - 1;
 
-	return Parameter(MidiCCAutomation, cc_num);
+	return Evoral::Parameter(MidiCCAutomation, chan, cc_num);
 }