Browse Source

Merge branch 'master' of github.com:VCVRack/Rack into v0.6

tags/v0.6.1
Andrew Belt 6 years ago
parent
commit
1b3625acaa
2 changed files with 3 additions and 2 deletions
  1. +1
    -0
      src/audio.cpp
  2. +2
    -2
      src/midi.cpp

+ 1
- 0
src/audio.cpp View File

@@ -244,6 +244,7 @@ void AudioIO::openStream() {

RtAudio::StreamOptions options;
options.flags |= RTAUDIO_JACK_DONT_CONNECT;
options.streamName = "VCV Rack";

int closestSampleRate = deviceInfo.preferredSampleRate;
for (int sr : deviceInfo.sampleRates) {


+ 2
- 2
src/midi.cpp View File

@@ -138,7 +138,7 @@ void MidiInput::setDriver(int driver) {
}

if (driver >= 0) {
rtMidiIn = new RtMidiIn((RtMidi::Api) driver);
rtMidiIn = new RtMidiIn((RtMidi::Api) driver, "VCV Rack");
rtMidiIn->setCallback(midiInputCallback, this);
rtMidiIn->ignoreTypes(false, false, false);
rtMidi = rtMidiIn;
@@ -212,7 +212,7 @@ void MidiOutput::setDriver(int driver) {
}

if (driver >= 0) {
rtMidiOut = new RtMidiOut((RtMidi::Api) driver);
rtMidiOut = new RtMidiOut((RtMidi::Api) driver, "VCV Rack");
rtMidi = rtMidiOut;
this->driver = rtMidiOut->getCurrentApi();
}


Loading…
Cancel
Save