diff options
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/client/DeprecatedLoader.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/DSSINode.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/MidiControlNode.cpp | 8 | ||||
| -rw-r--r-- | src/libs/engine/MidiNoteNode.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/MidiTriggerNode.cpp | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index 72c397d2..f174fb1e 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -329,7 +329,9 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); if ((!xmlStrcmp(cur->name, (const xmlChar*)"name"))) { + cerr << "NAME: " << (char*)key; path = parent.base() + Path::nameify((char*)key); + cerr << ", PATH: " << path << endl; } else if ((!xmlStrcmp(cur->name, (const xmlChar*)"polyphonic"))) { polyphonic = !strcmp((char*)key, "true"); } else if ((!xmlStrcmp(cur->name, (const xmlChar*)"type"))) { diff --git a/src/libs/engine/DSSINode.cpp b/src/libs/engine/DSSINode.cpp index bf81f5ec..6f00af0c 100644 --- a/src/libs/engine/DSSINode.cpp +++ b/src/libs/engine/DSSINode.cpp @@ -63,7 +63,7 @@ DSSINode::instantiate() if (has_midi_input()) { _ports = new Raul::Array<Port*>(_descriptor->PortCount + 1); - _midi_in_port = new InputPort<MidiMessage>(this, "MIDI_In", _ports->size()-1, 1, DataType::MIDI, _buffer_size); + _midi_in_port = new InputPort<MidiMessage>(this, "MIDIIn", _ports->size()-1, 1, DataType::MIDI, _buffer_size); _ports->at(_ports->size()-1) = _midi_in_port; } diff --git a/src/libs/engine/MidiControlNode.cpp b/src/libs/engine/MidiControlNode.cpp index 82db9b06..c5bbc13b 100644 --- a/src/libs/engine/MidiControlNode.cpp +++ b/src/libs/engine/MidiControlNode.cpp @@ -35,10 +35,10 @@ MidiControlNode::MidiControlNode(const string& path, size_t poly, Patch* parent, { _ports = new Raul::Array<Port*>(7); - _midi_in_port = new InputPort<MidiMessage>(this, "MIDI_In", 0, 1, DataType::MIDI, _buffer_size); + _midi_in_port = new InputPort<MidiMessage>(this, "MIDIIn", 0, 1, DataType::MIDI, _buffer_size); _ports->at(0) = _midi_in_port; - _param_port = new InputPort<Sample>(this, "Controller_Number", 1, 1, DataType::FLOAT, 1); + _param_port = new InputPort<Sample>(this, "ControllerNumber", 1, 1, DataType::FLOAT, 1); _ports->at(1) = _param_port; _log_port = new InputPort<Sample>(this, "Logarithmic", 2, 1, DataType::FLOAT, 1); @@ -50,10 +50,10 @@ MidiControlNode::MidiControlNode(const string& path, size_t poly, Patch* parent, _max_port = new InputPort<Sample>(this, "Max", 4, 1, DataType::FLOAT, 1); _ports->at(4) = _max_port; - _audio_port = new OutputPort<Sample>(this, "Out_(AR)", 5, 1, DataType::FLOAT, _buffer_size); + _audio_port = new OutputPort<Sample>(this, "Out(AR)", 5, 1, DataType::FLOAT, _buffer_size); _ports->at(5) = _audio_port; - _control_port = new OutputPort<Sample>(this, "Out_(CR)", 6, 1, DataType::FLOAT, 1); + _control_port = new OutputPort<Sample>(this, "Out(CR)", 6, 1, DataType::FLOAT, 1); _ports->at(6) = _control_port; plugin()->plug_label("midi_control_in"); diff --git a/src/libs/engine/MidiNoteNode.cpp b/src/libs/engine/MidiNoteNode.cpp index d0c14e23..fd274f62 100644 --- a/src/libs/engine/MidiNoteNode.cpp +++ b/src/libs/engine/MidiNoteNode.cpp @@ -40,7 +40,7 @@ MidiNoteNode::MidiNoteNode(const string& path, size_t poly, Patch* parent, Sampl { _ports = new Raul::Array<Port*>(5); - _midi_in_port = new InputPort<MidiMessage>(this, "MIDI_In", 0, 1, DataType::MIDI, _buffer_size); + _midi_in_port = new InputPort<MidiMessage>(this, "MIDIIn", 0, 1, DataType::MIDI, _buffer_size); _ports->at(0) = _midi_in_port; _freq_port = new OutputPort<Sample>(this, "Frequency", 1, poly, DataType::FLOAT, _buffer_size); diff --git a/src/libs/engine/MidiTriggerNode.cpp b/src/libs/engine/MidiTriggerNode.cpp index 3a7d1762..f4993e58 100644 --- a/src/libs/engine/MidiTriggerNode.cpp +++ b/src/libs/engine/MidiTriggerNode.cpp @@ -31,10 +31,10 @@ MidiTriggerNode::MidiTriggerNode(const string& path, size_t poly, Patch* parent, { _ports = new Raul::Array<Port*>(5); - _midi_in_port = new InputPort<MidiMessage>(this, "MIDI_In", 0, 1, DataType::MIDI, _buffer_size); + _midi_in_port = new InputPort<MidiMessage>(this, "MIDIIn", 0, 1, DataType::MIDI, _buffer_size); _ports->at(0) = _midi_in_port; - _note_port = new InputPort<Sample>(this, "Note_Number", 1, 1, DataType::FLOAT, 1); + _note_port = new InputPort<Sample>(this, "NoteNumber", 1, 1, DataType::FLOAT, 1); // new PortInfo("Note Number", CONTROL, INPUT, INTEGER, 60, 0, 127), 1); _ports->at(1) = _note_port; |