Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 1.0.0-beta.9 - [UNRELEASED]
## 1.0.0-beta.9
### Added
- Support for named urls when sharing links to workspaces
- Ability to convert items to other types by right-clicking
Expand Down
5 changes: 4 additions & 1 deletion docs/types.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ Items of this type cannot be played. They are simply dividers with a name, color
Variables set a value to the state when played. Their values can be used throughout the application.

### Reference
A reference is a pointer to another item. It's useful when an item needs to be present as more than one instance but without duplicating its data.
A reference is a pointer to another item. It's useful when an item needs to be present as more than one instance but without duplicating its data.

### Trigger
Inherits all functionality from references but are played by an outside event. Such as timecode or keyboard shortcuts.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bridge",
"version": "1.0.0-beta.8",
"version": "1.0.0-beta.9",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/caspar/lib/AMCP.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ exports.playLoaded = opts => `PLAY ${layerString(opts)}`
* @param { AMCPOptions } opts
* @returns { string }
*/
exports.playImageScroller = (file, opts) => `PLAY ${layerString(opts)}${file ? ` "${file}"` : ''} BLUR ${opts?.blur || 0} SPEED ${opts?.speed || 7}${opts?.progressive ? ' PROGRESSIVE' : ''}`
exports.playImageScroller = (file, opts) => `PLAY ${layerString(opts)}${file ? ` "${file}"` : ''} BLUR ${opts?.blur || 0} SPEED ${opts?.speed || 7}${opts?.premultiply ? ' PREMULTIPLY' : ''}${opts?.progressive ? ' PROGRESSIVE' : ''}`

/**
* Stop an item running in the foreground
Expand Down
9 changes: 9 additions & 0 deletions plugins/caspar/lib/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ function init (htmlPath) {
category: 'Caspar',
inherits: 'bridge.caspar.playable',
properties: {
name: {
default: 'Image scroller'
},
'caspar.target': {
name: 'Target',
type: 'string',
Expand All @@ -237,6 +240,12 @@ function init (htmlPath) {
allowsVariables: true,
'ui.group': 'Image scroller'
},
'caspar.premultiply': {
name: 'Premultiply',
type: 'boolean',
default: false,
'ui.group': 'Image scroller'
},
'caspar.progressive': {
name: 'Progressive',
type: 'boolean',
Expand Down