diff options
Diffstat (limited to 'src/scanout.c')
| -rw-r--r-- | src/scanout.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/scanout.c b/src/scanout.c index a744a34..64e5574 100644 --- a/src/scanout.c +++ b/src/scanout.c @@ -60,13 +60,13 @@ static void set_prism(int *dmx, struct fixture *fix, int prism) if ( fix->cls->prism_flags[prism] & PRISM_ROTATE ) { float rotate_val; - rotate_val = (fix->prism_rotate + 1.0)/2.0; + rotate_val = (fix->v.prism_rotate + 1.0)/2.0; set_val(dmx, fix->base_addr, fix->cls->prism_rotate_offset, rotate_val, 0); } if ( fix->cls->prism_flags[prism] & PRISM_SPIN ) { float rotate_val; - rotate_val = (fix->prism_spin + 1.0)/2.0; + rotate_val = (fix->v.prism_spin + 1.0)/2.0; set_val(dmx, fix->base_addr, fix->cls->prism_spin_offset, rotate_val, 0); } } @@ -86,13 +86,13 @@ static void set_gobo(int *dmx, struct fixture *fix, int gobo) if ( fix->cls->gobo_flags[gobo] & GOBO_ROTATE ) { float rotate_val; - rotate_val = (fix->gobo_rotate + 1.0)/2.0; + rotate_val = (fix->v.gobo_rotate + 1.0)/2.0; set_val(dmx, fix->base_addr, fix->cls->gobo_rotate_offset, rotate_val, 0); } if ( fix->cls->gobo_flags[gobo] & GOBO_SPIN ) { float rotate_val; - rotate_val = (fix->gobo_spin + 1.0)/2.0; + rotate_val = (fix->v.gobo_spin + 1.0)/2.0; set_val(dmx, fix->base_addr, fix->cls->gobo_spin_offset, rotate_val, 0); } } @@ -128,14 +128,14 @@ int scanout_all(struct lightctx *nl) } if ( cls->attributes & INTENSITY ) { - set_val(dmx, fix->base_addr, cls->intensity_offset, fix->intensity, + set_val(dmx, fix->base_addr, cls->intensity_offset, fix->v.intensity, cls->attributes16 & INTENSITY); } if ( cls->attributes & PANTILT ) { float pan_val, tilt_val; - pan_val = (fix->pan + 1.0)/2.0; - tilt_val = (fix->tilt + 1.0)/2.0; + pan_val = (fix->v.pan + 1.0)/2.0; + tilt_val = (fix->v.tilt + 1.0)/2.0; if ( fix->flags & REVERSE_PAN ) pan_val = 1.0 - pan_val; if ( fix->flags & REVERSE_TILT ) tilt_val = 1.0 - tilt_val; set_val(dmx, fix->base_addr, cls->pan_offset, pan_val, @@ -145,49 +145,49 @@ int scanout_all(struct lightctx *nl) } if ( (cls->attributes & COLOUR) && (cls->properties & COL_CMY) ) { - set_val(dmx, fix->base_addr, cls->cyan_offset, fix->cyan, + set_val(dmx, fix->base_addr, cls->cyan_offset, fix->v.cyan, cls->attributes16 & COL_CMY); - set_val(dmx, fix->base_addr, cls->magenta_offset, fix->magenta, + set_val(dmx, fix->base_addr, cls->magenta_offset, fix->v.magenta, cls->attributes16 & COL_CMY); - set_val(dmx, fix->base_addr, cls->yellow_offset, fix->yellow, + set_val(dmx, fix->base_addr, cls->yellow_offset, fix->v.yellow, cls->attributes16 & COL_CMY); } if ( (cls->attributes & COLOUR) && (cls->properties & COL_RGB) ) { - set_val(dmx, fix->base_addr, cls->red_offset, fix->red, + set_val(dmx, fix->base_addr, cls->red_offset, fix->v.red, cls->attributes16 & COL_RGB); - set_val(dmx, fix->base_addr, cls->green_offset, fix->green, + set_val(dmx, fix->base_addr, cls->green_offset, fix->v.green, cls->attributes16 & COL_RGB); - set_val(dmx, fix->base_addr, cls->blue_offset, fix->blue, + set_val(dmx, fix->base_addr, cls->blue_offset, fix->v.blue, cls->attributes16 & COL_RGB); } if ( cls->attributes & FOCUS ) { - set_val(dmx, fix->base_addr, cls->focus_offset, fix->focus, + set_val(dmx, fix->base_addr, cls->focus_offset, fix->v.focus, cls->attributes16 & FOCUS); } if ( cls->attributes & ZOOM ) { - set_val(dmx, fix->base_addr, cls->zoom_offset, fix->zoom, + set_val(dmx, fix->base_addr, cls->zoom_offset, fix->v.zoom, cls->attributes16 & ZOOM); } if ( cls->attributes & FROST ) { - set_val(dmx, fix->base_addr, cls->frost_offset, fix->frost, + set_val(dmx, fix->base_addr, cls->frost_offset, fix->v.frost, cls->attributes16 & FROST); } if ( cls->attributes & IRIS ) { - set_val(dmx, fix->base_addr, cls->iris_offset, fix->iris, + set_val(dmx, fix->base_addr, cls->iris_offset, fix->v.iris, cls->attributes16 & IRIS); } if ( cls->attributes & GOBO ) { - set_gobo(dmx, fix, fix->gobo); + set_gobo(dmx, fix, fix->v.gobo); } if ( cls->attributes & PRISM ) { - set_prism(dmx, fix, fix->prism); + set_prism(dmx, fix, fix->v.prism); } } |