ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Apply x42's patch from #4207; rename MIDI control 

preferences to just MIDI.


git-svn-id: svn://localhost/ardour2/branches/3.0@9948 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-08-03 11:15:01 +00:00
parent ad4f943f5a
commit 9e6eb3e0c7
4 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/midi_region_view.cc
View File

@ -80,6 +80,8 @@ using namespace Editing;
using namespace ArdourCanvas;
using Gtkmm2ext::Keyboard;
#define MIDI_BP_ZERO ((Config->get_first_midi_bank_is_zero())?0:1)
MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color const & basic_color)
: RegionView (parent, tv, r, spu, basic_color)
@ -112,6 +114,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
_note_group->raise_to_top();
PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
connect_to_diskstream ();
}
@ -148,6 +151,16 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
connect_to_diskstream ();
}
void
MidiRegionView::parameter_changed (std::string const & p)
{
if (p == "diplay-first-midi-bank-as-zero") {
if (_enable_display) {
redisplay_model();
}
}
}
MidiRegionView::MidiRegionView (const MidiRegionView& other)
: sigc::trackable(other)
, RegionView (other)
@ -269,6 +282,7 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
ui_bind(&MidiRegionView::snap_changed, this),
gui_context());
Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
connect_to_diskstream ();
}
@ -1158,6 +1172,7 @@ MidiRegionView::display_patch_changes ()
if (chn_mask & (1<<i)) {
display_patch_changes_on_channel (i);
}
/* TODO gray-out patch instad of not displaying it */
}
}
@ -1180,8 +1195,8 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
add_canvas_patch_change (*i, patch->name());
} else {
char buf[16];
/* program and bank numbers are zero-based: convert to one-based */
snprintf (buf, 16, "%d\n%d", (*i)->program() + 1, (*i)->bank() + 1);
/* program and bank numbers are zero-based: convert to one-based: MIDI_BP_ZERO */
snprintf (buf, 16, "%d %d", (*i)->program() + MIDI_BP_ZERO , (*i)->bank() + MIDI_BP_ZERO);
add_canvas_patch_change (*i, buf);
}
}
@ -2956,7 +2971,7 @@ MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev)
{
ostringstream s;
/* XXX should get patch name if we can */
s << _("Bank:") << (ev->patch()->bank() + 1) << '\n' << _("Program:") << ((int) ev->patch()->program() + 1);
s << _("Bank:") << (ev->patch()->bank() + MIDI_BP_ZERO) << '\n' << _("Program:") << ((int) ev->patch()->program()) + MIDI_BP_ZERO << '\n' << _("Channel:") << ((int) ev->patch()->channel() + 1);
show_verbose_cursor (s.str(), 10, 20);
}

2
gtk2_ardour/midi_region_view.h
View File

@ -299,6 +299,8 @@ protected:
void reset_width_dependent_items (double pixel_width);
void parameter_changed (std::string const & p);
private:
friend class EditNoteDialog;

26
gtk2_ardour/rc_option_editor.cc
View File

@ -1343,7 +1343,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_main_outs)
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new BoolOption (
"send-midi-clock",
_("Send MIDI Clock"),
@ -1351,7 +1351,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock)
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new BoolOption (
"send-mtc",
_("Send MIDI Time Code"),
@ -1359,7 +1359,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mtc)
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new SpinOption<int> (
"mtc-qf-speed-tolerance",
_("Percentage either side of normal transport speed to transmit MTC"),
@ -1368,7 +1368,7 @@ RCOptionEditor::RCOptionEditor ()
0, 20, 1, 5
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new BoolOption (
"mmc-control",
_("Obey MIDI Machine Control commands"),
@ -1376,7 +1376,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_mmc_control)
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new BoolOption (
"send-mmc",
_("Send MIDI Machine Control commands"),
@ -1384,7 +1384,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mmc)
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new BoolOption (
"midi-feedback",
_("Send MIDI control feedback"),
@ -1392,7 +1392,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback)
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new SpinOption<uint8_t> (
"mmc-receive-device-id",
_("Inbound MMC device ID"),
@ -1401,7 +1401,7 @@ RCOptionEditor::RCOptionEditor ()
0, 128, 1, 10
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new SpinOption<uint8_t> (
"mmc-send-device-id",
_("Outbound MMC device ID"),
@ -1410,7 +1410,7 @@ RCOptionEditor::RCOptionEditor ()
0, 128, 1, 10
));
add_option (_("MIDI control"),
add_option (_("MIDI"),
new SpinOption<int32_t> (
"initial-program-change",
_("Initial program change"),
@ -1419,6 +1419,14 @@ RCOptionEditor::RCOptionEditor ()
-1, 65536, 1, 10
));
add_option (_("MIDI"),
new BoolOption (
"diplay-first-midi-bank-as-zero",
_("Display first MIDI bank/program as 0"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero)
));
/* CONTROL SURFACES */
add_option (_("Control surfaces"), new ControlSurfacesOptions (*this));

1
libs/ardour/ardour/rc_configuration_vars.h
View File

@ -44,6 +44,7 @@ CONFIG_VARIABLE (int32_t, mmc_receive_device_id, "mmc-receive-device-id", 0x7f)
CONFIG_VARIABLE (int32_t, mmc_send_device_id, "mmc-send-device-id", 0)
CONFIG_VARIABLE (int32_t, initial_program_change, "initial-program-change", -1)
CONFIG_VARIABLE (int, mtc_qf_speed_tolerance, "mtc-qf-speed-tolerance", 5)
CONFIG_VARIABLE (bool, first_midi_bank_is_zero, "diplay-first-midi-bank-as-zero", false)
/* control surfaces */