#include <iostream>
-#include <glibmm/regex.h>
+#include <boost/algorithm/string.hpp>
#include "gtkmm2ext/keyboard.h"
#include "ardour/instrument_info.h"
for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
bank != patch_banks.end();
++bank) {
- Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_");
- std::string replacement(" ");
-
Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
const PatchBank::PatchNameList& patches = (*bank)->patch_name_list();
for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
patch != patches.end();
++patch) {
- std::string name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement);
+ std::string name = (*patch)->name();
+ boost::replace_all (name, "_", " ");
patch_menus.push_back(
Gtk::Menu_Helpers::MenuElem(
(*patch)->patch_primary_key())) );
}
-
- std::string name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement);
+ std::string name = (*bank)->name();
+ boost::replace_all (name, "_", " ");
patch_bank_menus.push_back(
Gtk::Menu_Helpers::MenuElem(
#include "ardour/instrument_info.h"
#include "patch_change_dialog.h"
+#include "gui_thread.h"
#include "i18n.h"
set_active_bank_combo ();
bank_combo_changed ();
+ _info.Changed.connect (_info_changed_connection, invalidator (*this),
+ boost::bind (&PatchChangeDialog::instrument_info_changed, this), gui_context());
+
show_all ();
}
+void
+PatchChangeDialog::instrument_info_changed ()
+{
+ _bank_combo.clear ();
+ _patch_combo.clear ();
+ fill_bank_combo ();
+ fill_patch_combo ();
+}
+
Evoral::PatchChange<Evoral::MusicalTime>
PatchChangeDialog::patch () const
{
{
boost::shared_ptr<MIDI::Name::ChannelNameSet> cns = _info.get_patches (_channel.get_value_as_int() - 1);
+ if (!cns) {
+ return;
+ }
+
for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) {
string n = (*i)->name ();
boost::replace_all (n, "_", " ");
boost::shared_ptr<MIDI::Name::ChannelNameSet> cns = _info.get_patches (_channel.get_value_as_int() - 1);
+ if (!cns) {
+ return;
+ }
+
for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) {
string n = (*i)->name ();
boost::replace_all (n, "_", " ");
- MIDI::Name::PatchPrimaryKey const * key = (*i)->patch_primary_key ();
- if (key && (key->bank_number == _bank.get_value () - 1)) {
+ if ((*i)->number() == _bank.get_value () - 1) {
_current_patch_bank = *i;
_ignore_signals = true;
_bank_combo.set_active_text (n);
boost::shared_ptr<MIDI::Name::ChannelNameSet> cns = _info.get_patches (_channel.get_value_as_int() - 1);
+ if (!cns) {
+ return;
+ }
+
for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) {
string n = (*i)->name ();
boost::replace_all (n, "_", " ");
fill_patch_combo ();
set_active_patch_combo ();
- MIDI::Name::PatchPrimaryKey const * key = _current_patch_bank->patch_primary_key ();
- if (key) {
- _ignore_signals = true;
- _bank.set_value (key->bank_number + 1);
- _ignore_signals = false;
- }
+ _ignore_signals = true;
+ _bank.set_value (_current_patch_bank->number() + 1);
+ _ignore_signals = false;
}
/** Fill the contents of the patch combo */
}
const MIDI::Name::PatchBank::PatchNameList& patches = _current_patch_bank->patch_name_list ();
+
for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
string n = (*j)->name ();
boost::replace_all (n, "_", " ");
+ std::cerr << "Looking for " << n << " vs " << _patch_combo.get_active_text() << std::endl;
if (n == _patch_combo.get_active_text ()) {
- MIDI::Name::PatchPrimaryKey const & key = (*j)->patch_primary_key ();
_ignore_signals = true;
- _program.set_value (key.program_number + 1);
+ std::cerr << " reset pgm number to " << (int) (*j)->program_number() << std::endl;
+ _program.set_value ((*j)->program_number() + 1);
_ignore_signals = false;
+ break;
}
}
}
boost::shared_ptr<MIDI::Name::PatchBank> _current_patch_bank;
bool _ignore_signals;
+
+ void instrument_info_changed ();
+ PBD::ScopedConnection _info_changed_connection;
};
if (master_device != 0 && custom_device_mode != "") {
return master_device->channel_name_set_by_device_mode_and_channel(custom_device_mode, channel);
} else {
+ std::cerr << "No MD for " << model << " + " << custom_device_mode << std::endl;
return boost::shared_ptr<ChannelNameSet>();
}
}
boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
if (channel_name_set) {
+ std::cerr << "found CNS for " << model << " + " << custom_device_mode << std::endl;
return channel_name_set->find_patch(patch_key);
} else {
+ std::cerr << "no CNS for " << model << " + " << custom_device_mode << std::endl;
return boost::shared_ptr<Patch>();
}
}
return get_plugin_patch_name (p, bank, program, channel);
}
- MIDI::Name::PatchPrimaryKey patch_key (bank, program);
+ MIDI::Name::PatchPrimaryKey patch_key (program, bank);
boost::shared_ptr<MIDI::Name::Patch> patch =
MIDI::Name::MidiPatchManager::instance().find_patch (external_instrument_model,
for (n = 0, i = presets.begin(); i != presets.end(); ++i, ++n) {
if ((*i).number >= 0) {
- patch_list.push_back (boost::shared_ptr<Patch> (new Patch (string_compose ("%1", n), (*i).label)));
+ patch_list.push_back (boost::shared_ptr<Patch> (new Patch ((*i).label, n)));
} else {
- patch_list.push_back (boost::shared_ptr<Patch> (new Patch (string_compose ("%1", n),
- string_compose ("program %1", n))));
+ patch_list.push_back (boost::shared_ptr<Patch> (new Patch (string_compose ("program %1", n), n)));
}
}
} else {
for (int n = 0; n < 127; ++n) {
- patch_list.push_back (boost::shared_ptr<Patch> (new Patch (string_compose ("%1", n),
- string_compose ("program %1", n))));
+ patch_list.push_back (boost::shared_ptr<Patch> (new Patch (string_compose ("program %1", n), n)));
}
}
- boost::shared_ptr<PatchBank> pb (new PatchBank (p->name()));
+ boost::shared_ptr<PatchBank> pb (new PatchBank (0, p->name()));
pb->set_patch_name_list (patch_list);
ChannelNameSet::PatchBanks patch_banks;
{
if (_gm_patches.empty()) {
for (int n = 0; n < 128; n++) {
- _gm_patches.push_back (boost::shared_ptr<Patch> (new Patch (string_compose ("%1", n), general_midi_program_names[n])));
+ _gm_patches.push_back (boost::shared_ptr<Patch> (new Patch (general_midi_program_names[n], n)));
}
}
#ifndef MIDNAM_PATCH_H_
#define MIDNAM_PATCH_H_
+#include <algorithm>
#include <iostream>
#include <string>
#include <list>
#include <set>
#include <map>
+#include <stdint.h>
+
#include "midi++/event.h"
#include "pbd/xml++.h"
int bank_number;
int program_number;
- PatchPrimaryKey(int a_bank_number = -1, int a_program_number = -1) {
- bank_number = a_bank_number;
- program_number = a_program_number;
+ PatchPrimaryKey (uint8_t a_program_number = 0, uint16_t a_bank_number = 0) {
+ bank_number = std::min (a_bank_number, (uint16_t) 16384);
+ program_number = std::min (a_program_number, (uint8_t) 127);
}
bool is_sane() {
{
public:
- Patch (PatchBank* a_bank = 0);
- Patch(std::string a_number, std::string a_name, PatchBank* a_bank = 0);
+ Patch (std::string a_name = std::string(), uint8_t a_number = 0, uint16_t bank_number = 0);
virtual ~Patch() {};
const std::string& name() const { return _name; }
void set_name(const std::string a_name) { _name = a_name; }
- const std::string& number() const { return _number; }
- void set_number(const std::string a_number) { _number = a_number; }
-
+ uint8_t program_number() const { return _id.program_number; }
+ void set_program_number(uint8_t n) { _id.program_number = n; }
+
+ uint16_t bank_number() const { return _id.bank_number; }
+ void set_bank_number (uint16_t n) { _id.bank_number = n; }
+
const PatchPrimaryKey& patch_primary_key() const { return _id; }
- XMLNode& get_state (void);
+ XMLNode& get_state (void);
int set_state (const XMLTree&, const XMLNode&);
- int use_bank_info (PatchBank*);
-
private:
- std::string _number;
- std::string _name;
- PatchPrimaryKey _id;
+ std::string _name;
+ PatchPrimaryKey _id;
};
class PatchBank
public:
typedef std::list<boost::shared_ptr<Patch> > PatchNameList;
- PatchBank () : _id(0) {};
- PatchBank (std::string a_name, PatchPrimaryKey* an_id = 0) : _name(a_name), _id(an_id) {};
- virtual ~PatchBank() { delete _id; };
+ PatchBank (uint16_t n = 0, std::string a_name = std::string()) : _name(a_name), _number (n) {};
+ virtual ~PatchBank() { }
const std::string& name() const { return _name; }
void set_name(const std::string a_name) { _name = a_name; }
+ int number() const { return _number; }
+
const PatchNameList& patch_name_list() const { return _patch_name_list; }
const std::string& patch_list_name() const { return _patch_list_name; }
int set_patch_name_list (const PatchNameList&);
- const PatchPrimaryKey* patch_primary_key() const { return _id; }
-
- XMLNode& get_state (void);
+ XMLNode& get_state (void);
int set_state (const XMLTree&, const XMLNode&);
private:
std::string _name;
+ uint16_t _number;
PatchNameList _patch_name_list;
- PatchPrimaryKey* _id;
std::string _patch_list_name;
};
boost::shared_ptr<Patch> previous_patch(PatchPrimaryKey& key) {
assert(key.is_sane());
- std::cerr << "finding patch with " << key.bank_number << "/" <<key.program_number << std::endl;
for (PatchList::const_iterator i = _patch_list.begin();
i != _patch_list.end();
++i) {
if ((*i) == key) {
if (i != _patch_list.begin()) {
- std::cerr << "got it!" << std::endl;
--i;
return _patch_map[*i];
}
boost::shared_ptr<Patch> next_patch(PatchPrimaryKey& key) {
assert(key.is_sane());
- std::cerr << "finding patch with " << key.bank_number << "/" <<key.program_number << std::endl;
for (PatchList::const_iterator i = _patch_list.begin();
i != _patch_list.end();
++i) {
if ((*i) == key) {
if (++i != _patch_list.end()) {
- std::cerr << "got it!" << std::endl;
return _patch_map[*i];
} else {
--i;
namespace Name
{
-
-Patch::Patch (PatchBank* b)
-{
- use_bank_info (b);
-}
-
-Patch::Patch (std::string a_number, std::string a_name, PatchBank* a_bank)
- : _number (a_number)
- , _name (a_name)
-{
- use_bank_info (a_bank);
-}
-
-XMLNode&
-Patch::get_state (void)
+
+Patch::Patch (std::string name, uint8_t p_number, uint16_t b_number)
+ : _name (name)
+ , _id (p_number, b_number)
{
- XMLNode* node = new XMLNode("Patch");
- node->add_property("Number", _number);
- node->add_property("Name", _name);
- /*
- typedef std::list< boost::shared_ptr< Evoral::MIDIEvent<double> > > PatchMidiCommands;
- XMLNode* commands = node->add_child("PatchMIDICommands");
- for (PatchMidiCommands::const_iterator event = _patch_midi_commands.begin();
- event != _patch_midi_commands.end();
- ++event) {
- commands->add_child_copy(*((((Evoral::MIDIEvent&)*event)).to_xml()));
- }
- */
-
- return *node;
}
int initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* node)
return 0;
}
+XMLNode&
+Patch::get_state (void)
+{
+ XMLNode* node = new XMLNode("Patch");
+
+ /* XXX this is totally wrong */
+
+ node->add_property("Number", string_compose ("%1", _id.program_number));
+ node->add_property("Name", _name);
+
+ /*
+ typedef std::list< boost::shared_ptr< Evoral::MIDIEvent<double> > > PatchMidiCommands;
+ XMLNode* commands = node->add_child("PatchMIDICommands");
+ for (PatchMidiCommands::const_iterator event = _patch_midi_commands.begin();
+ event != _patch_midi_commands.end();
+ ++event) {
+ commands->add_child_copy(*((((Evoral::MIDIEvent&)*event)).to_xml()));
+ }
+ */
+
+ return *node;
+}
+
int
Patch::set_state (const XMLTree&, const XMLNode& node)
{
if (!prop) {
return -1;
}
- _number = prop->value();
+ _id.program_number = PBD::atoi (prop->value());
prop = node.property ("Name");
_id.program_number = PBD::atoi(program_change);
}
- return 0;
-}
-
-int
-Patch::use_bank_info (PatchBank* bank)
-{
- if (bank) {
- if (bank->patch_primary_key() ) {
- _id.bank_number = bank->patch_primary_key()->bank_number;
- } else {
- return -1;
- }
- }
-
- if (!_id.is_sane()) {
- return -1;
- }
return 0;
}
return *node;
}
+
int
Note::set_state (const XMLTree&, const XMLNode& node)
{
XMLNode* commands = node.child("MIDICommands");
if (commands) {
- _id = new PatchPrimaryKey();
- if (initialize_primary_key_from_commands(*_id, commands)) {
+ PatchPrimaryKey id (0, 0);
+ if (initialize_primary_key_from_commands (id, commands)) {
return -1;
}
+ _number = id.bank_number;
}
XMLNode* patch_name_list = node.child("PatchNameList");
if (patch_name_list) {
const XMLNodeList patches = patch_name_list->children();
for (XMLNodeList::const_iterator i = patches.begin(); i != patches.end(); ++i) {
- boost::shared_ptr<Patch> patch(new Patch(this));
+ boost::shared_ptr<Patch> patch (new Patch (string(), 0, _number));
patch->set_state(tree, *(*i));
_patch_name_list.push_back(patch);
}
_patch_list_name = "";
for (PatchNameList::iterator p = _patch_name_list.begin(); p != _patch_name_list.end(); p++) {
- if ((*p)->use_bank_info (this)) {
- return -1;
- }
+ (*p)->set_bank_number (_number);
}
return 0;
}
if (node->name() == "PatchBank") {
- boost::shared_ptr<PatchBank> bank(new PatchBank());
+ boost::shared_ptr<PatchBank> bank (new PatchBank ());
bank->set_state(tree, *node);
_patch_banks.push_back(bank);
const PatchBank::PatchNameList& patches = bank->patch_name_list();
const XMLNodeList patches = (*i)->children();
for (XMLNodeList::const_iterator p = patches.begin(); p != patches.end(); ++p) {
- boost::shared_ptr<Patch> patch(new Patch());
+ boost::shared_ptr<Patch> patch (new Patch ());
patch->set_state(tree, *(*p));
patch_name_list.push_back(patch);
}
projects / ardour.git / commitdiff