remove "New Return" menu option from processor box; make return toggle processor...

[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 fcd3ebbe40a012ce2f2907b5a0d58f7e9269f29f..455a9f7715321974b36af5c42c0af75c3ed0f56c 100644 (file)
--- 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,11 +19,12 @@
 
 #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"
@@ -37,9 +38,9 @@ using namespace ARDOUR;
 
 AddMidiCCTrackDialog::AddMidiCCTrackDialog ()
        : Dialog (_("ardour: add midi controller track"))
-       , _chan_adjustment (1, 1, 16, 8)
+       , _chan_adjustment (1, 1, 16, 1, 8, 8)
        , _chan_spinner (_chan_adjustment)
-       , _cc_num_adjustment (1, 0, 127, 1, 10)
+       , _cc_num_adjustment (1, 1, 128, 1, 10, 10)
        , _cc_num_spinner (_cc_num_adjustment)
 {
        set_name ("AddMidiCCTrackDialog");
@@ -49,7 +50,7 @@ AddMidiCCTrackDialog::AddMidiCCTrackDialog ()
 
        _chan_spinner.set_name ("AddMidiCCTrackDialogSpinner");
        _cc_num_spinner.set_name ("AddMidiCCTrackDialogSpinner");
-       
+
        HBox *chan_box = manage (new HBox());
        Label *chan_label = manage(new Label("Channel: "));
        chan_box->pack_start(*chan_label, true, true, 4);
@@ -64,7 +65,7 @@ AddMidiCCTrackDialog::AddMidiCCTrackDialog ()
 
        add_button (Stock::CANCEL, RESPONSE_CANCEL);
        add_button (Stock::ADD, RESPONSE_ACCEPT);
-       
+
        _chan_spinner.show();
        chan_box->show();
        chan_label->show();
@@ -74,12 +75,12 @@ AddMidiCCTrackDialog::AddMidiCCTrackDialog ()
 }
 
 
-ARDOUR::Parameter
+Evoral::Parameter
 AddMidiCCTrackDialog::parameter ()
 {
        int chan   = _chan_spinner.get_value_as_int() - 1;
-       int cc_num = _cc_num_spinner.get_value_as_int();
+       int cc_num = _cc_num_spinner.get_value_as_int() - 1;
 
-       return Parameter(MidiCCAutomation, cc_num, chan);
+       return Evoral::Parameter(MidiCCAutomation, chan, cc_num);
 }