X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fshuttle.C;h=e8d5572b82571425656773bae387a40f34bc9d0c;hp=22adeaf01180c29609e9d3280870313bc84ad403;hb=3d5faf45a6c261bb3e9973b42cf682415a1fde2e;hpb=2e28d225c343f02500594688bf8d0528df40600c

diff --git a/cinelerra-5.1/cinelerra/shuttle.C b/cinelerra-5.1/cinelerra/shuttle.C
index 22adeaf0..e8d5572b 100644
--- a/cinelerra-5.1/cinelerra/shuttle.C
+++ b/cinelerra-5.1/cinelerra/shuttle.C
@@ -603,6 +603,8 @@ void Shuttle::jogshuttle(unsigned short code, unsigned int value)
 	case EVENT_CODE_SHUTTLE:
 		shuttle(value);
 		break;
+	case EVENT_CODE_HI_JOG:  // redundant report of JOG value*120
+		break;
 	default:
 		fprintf(stderr, "jogshuttle(%d, %d) invalid code\n", code, value);
 		break;
@@ -619,6 +621,8 @@ static const struct shuttle_dev {
 		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
@@ -847,7 +851,7 @@ void Shuttle::run()
 	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 ) {
@@ -891,7 +895,7 @@ void Shuttle::run()
 			if( first_time ) break;
 			continue;
 		}
-		if( !ioctl(fd, EVIOCGRAB, 1) ) { // exclusive access
+		if( 1 || !ioctl(fd, EVIOCGRAB, 1) ) { // exclusive access
 			first_time = 0;
 			while( !done ) {
 				int ret = read(fd, &ev, sizeof(ev));