New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Virtual device #41

Merged
merged 122 commits into from Oct 2, 2017
Commits
Jump to file or symbol
Failed to load files and symbols.
+6 −0
Diff settings

Always

Just for now

Viewing a subset of changes. View all

z1: fix info exposure in connect to static info

Signed-off-by: Harry van Haaren <harryhaaren@gmail.com>
  • Loading branch information...
harryhaaren committed Sep 7, 2017
commit 581c7a6e8f629078e0e17dc12bc6f01a770dad20
Copy path View file
@@ -303,6 +303,8 @@ ni_kontrol_z1_disconnect(struct ctlra_dev_t *base)
return 0;
}
struct ctlra_dev_info_t ctlra_ni_kontrol_z1_info;
struct ctlra_dev_t *
ctlra_ni_kontrol_z1_connect(ctlra_event_func event_func,
void *userdata, void *future)
@@ -312,6 +314,7 @@ ctlra_ni_kontrol_z1_connect(ctlra_event_func event_func,
if(!dev)
goto fail;
#if 0
snprintf(dev->base.info.vendor, sizeof(dev->base.info.vendor),
"%s", "Native Instruments");
snprintf(dev->base.info.device, sizeof(dev->base.info.device),
@@ -322,6 +325,9 @@ ctlra_ni_kontrol_z1_connect(ctlra_event_func event_func,
dev->base.info.control_info[CTLRA_EVENT_BUTTON] = &buttons_info,
dev->base.info.control_info[CTLRA_EVENT_SLIDER] = &sliders_info,
dev->base.info.get_name = ni_kontrol_z1_control_get_name;
#else
dev->base.info = ctlra_ni_kontrol_z1_info;
#endif
int err = ctlra_dev_impl_usb_open(&dev->base,
NI_VENDOR, NI_KONTROL_Z1);
ProTip! Use n and p to navigate between commits in a pull request.