Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:nrkno/tv-automation-server-core …
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
jstarpl committed May 16, 2018
2 parents c52500b + 498ef47 commit 2d73397
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions meteor/server/api/peripheralDevice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,9 @@ methods[PeripheralDeviceAPI.methods.mosRoReadyToAir] = (deviceId, deviceToken, A
methods[PeripheralDeviceAPI.methods.mosRoFullStory] = (deviceId, deviceToken, story: IMOSROFullStory) => {
return ServerPeripheralDeviceAPI.mosRoFullStory(deviceId, deviceToken, story)
}
methods[PeripheralDeviceAPI.methods.timelineTriggerTime] = (deviceId, deviceToken, r: PeripheralDeviceAPI.TimelineTriggerTimeResult) => {
return ServerPeripheralDeviceAPI.timelineTriggerTime(deviceId, deviceToken, r)
}

// --------------------
methods[PeripheralDeviceAPI.methods.functionReply] = (deviceId, deviceToken, commandId, err: any, result: any) => {
Expand Down

0 comments on commit 2d73397

Please sign in to comment.