projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update, bld tweaks, resize track booby, 10fps for images
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
shuttle.C
diff --git
a/cinelerra-5.1/cinelerra/shuttle.C
b/cinelerra-5.1/cinelerra/shuttle.C
index 22adeaf01180c29609e9d3280870313bc84ad403..df2850dc8e4f22a5c6915e7062ddb151378b74d4 100644
(file)
--- a/
cinelerra-5.1/cinelerra/shuttle.C
+++ b/
cinelerra-5.1/cinelerra/shuttle.C
@@
-619,6
+619,8
@@
static const struct shuttle_dev {
0x0b33, 0x0030 },
{ "/dev/input/by-id/usb-Contour_Design_ShuttlePro-event-if00",
0x0b33, 0x0030 },
0x0b33, 0x0030 },
{ "/dev/input/by-id/usb-Contour_Design_ShuttlePro-event-if00",
0x0b33, 0x0030 },
+ { "/dev/input/by-id/usb-Contour_Design_ShuttlePRO_v2-event-joystick",
+ 0x0b33, 0x0030 },
};
#ifdef HAVE_SHUTTLE_USB
};
#ifdef HAVE_SHUTTLE_USB
@@
-847,7
+849,7
@@
void Shuttle::run()
while( devsh && !done ) {
int len = 0;
static const int IN_ENDPOINT = 0x81;
while( devsh && !done ) {
int len = 0;
static const int IN_ENDPOINT = 0x81;
- unsigned char dat[
BCSTRLEN
];
+ unsigned char dat[
5
];
int ret = libusb_interrupt_transfer(devsh,
IN_ENDPOINT, dat, sizeof(dat), &len, 100);
if( ret != 0 ) {
int ret = libusb_interrupt_transfer(devsh,
IN_ENDPOINT, dat, sizeof(dat), &len, 100);
if( ret != 0 ) {