eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-18 05:40:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not list inactive controls, issue #77

Browse Source
This commit is contained in:
c0ntrol
2016-03-16 19:39:51 +01:00
parent 50e5c8e017
commit 12604b28a8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
veejay-current/veejay-server/libstream/v4l2utils.c
View File

@@ -1648,7 +1648,7 @@ void v4l2_get_controls( void *d, void *port )
queryctrl.id = ctrl_id; queryctrl.id = ctrl_id;
if( 0 == vioctl( v->fd, VIDIOC_QUERYCTRL, &queryctrl ) ) { if( 0 == vioctl( v->fd, VIDIOC_QUERYCTRL, &queryctrl ) ) {
if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED || queryctrl.flags & V4L2_CTRL_FLAG_INACTIVE )
continue; continue;
int id = find_property_id( queryctrl.id ); int id = find_property_id( queryctrl.id );
@@ -1687,7 +1687,7 @@ int32_t v4l2_get_control( void *d, int32_t type )
if( vioctl( v->fd, VIDIOC_QUERYCTRL, &queryctrl) == -1 ) { if( vioctl( v->fd, VIDIOC_QUERYCTRL, &queryctrl) == -1 ) {
return -1; return -1;
} else if ( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) { } else if ( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED || queryctrl.flags & V4L2_CTRL_FLAG_INACTIVE ) {
veejay_msg( VEEJAY_MSG_DEBUG, "v4l2: property type %x disabled",type ); veejay_msg( VEEJAY_MSG_DEBUG, "v4l2: property type %x disabled",type );
return -1; return -1;
} else { } else {
@@ -1723,7 +1723,7 @@ void v4l2_set_control( void *d, uint32_t type, int32_t value )
} else { } else {
veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: property type %s not supported",v4l2_get_property_name(type) ); veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: property type %s not supported",v4l2_get_property_name(type) );
} }
} else if ( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED ) { } else if ( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED || queryctrl.flags & V4L2_CTRL_FLAG_INACTIVE ) {
veejay_msg( VEEJAY_MSG_DEBUG, "v4l2: property type %s not supported (disabld)",v4l2_get_property_name(type) ); veejay_msg( VEEJAY_MSG_DEBUG, "v4l2: property type %s not supported (disabld)",v4l2_get_property_name(type) );
} else { } else {
memset(&control,0,sizeof(control)); memset(&control,0,sizeof(control));