Browse Source

Fix Core Note handle, fix AudioIO::toJson when no device

tags/v1.0.0
Andrew Belt 6 years ago
parent
commit
72edae5a69
2 changed files with 6 additions and 6 deletions
  1. +4
    -5
      src/Core/Blank.cpp
  2. +2
    -1
      src/audio.cpp

+ 4
- 5
src/Core/Blank.cpp View File

@@ -33,11 +33,10 @@ struct ModuleResizeHandle : virtual Widget {
ModuleResizeHandle() { ModuleResizeHandle() {
box.size = Vec(RACK_GRID_WIDTH * 1, RACK_GRID_HEIGHT); box.size = Vec(RACK_GRID_WIDTH * 1, RACK_GRID_HEIGHT);
} }
void onHover(const event::Hover &e) override {
// TODO
// if (e.button == 0) {
// e.target = this;
// }
void onButton(const event::Button &e) override {
if (e.button == GLFW_MOUSE_BUTTON_LEFT) {
e.consume(this);
}
} }
void onDragStart(const event::DragStart &e) override { void onDragStart(const event::DragStart &e) override {
dragX = context()->scene->rackWidget->lastMousePos.x; dragX = context()->scene->rackWidget->lastMousePos.x;


+ 2
- 1
src/audio.cpp View File

@@ -323,7 +323,8 @@ json_t *IO::toJson() {
json_t *rootJ = json_object(); json_t *rootJ = json_object();
json_object_set_new(rootJ, "driver", json_integer(driver)); json_object_set_new(rootJ, "driver", json_integer(driver));
std::string deviceName = getDeviceName(device); std::string deviceName = getDeviceName(device);
json_object_set_new(rootJ, "deviceName", json_string(deviceName.c_str()));
if (!deviceName.empty())
json_object_set_new(rootJ, "deviceName", json_string(deviceName.c_str()));
json_object_set_new(rootJ, "offset", json_integer(offset)); json_object_set_new(rootJ, "offset", json_integer(offset));
json_object_set_new(rootJ, "maxChannels", json_integer(maxChannels)); json_object_set_new(rootJ, "maxChannels", json_integer(maxChannels));
json_object_set_new(rootJ, "sampleRate", json_integer(sampleRate)); json_object_set_new(rootJ, "sampleRate", json_integer(sampleRate));


Loading…
Cancel
Save