Skip to content

Get macro details #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timhodson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Get macro details #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d2f08
Add support for retrieving a list of macros
timhodson Jan 10, 2020
ad756ad
Adjust timeouts on tests
timhodson Jan 15, 2020
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
15 changes: 15 additions & 0 deletions src/atem.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ class ATEM
hasMonitor: null
numberOfChannels: null
channels: {}
macros: {}
macro_banks: null

connectionState: ATEM.ConnectionState.Closed
localPackedId: 1
Expand Down Expand Up @@ -240,6 +242,19 @@ class ATEM
me = buffer[0]
@state.video.ME[me].numberOfKeyers = buffer[1]

when '_MAC'
@state.macro_banks = buffer[1]

when 'MPrp'
isUsed = buffer[2]
if isUsed # Only keep info on macros that are present
nameLength = buffer[5]
descriptionLength = buffer[7]
@state.macros[buffer[1]] =
isUsed: buffer[2]
name: @_parseString(buffer[8...nameLength+8])
description: @_parseString(buffer[8+nameLength...8+nameLength+descriptionLength])

when 'InPr'
channel = @_parseNumber(buffer[0..1])
@state.channels[channel] =
Expand Down
13 changes: 8 additions & 5 deletions test/test-atem.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe 'Atem', ->
sw.changeAuxInput(0, 1)
sw.changeAuxInput(1, 1)
sw.changeAuxInput(2, 1)
setTimeout(done, 100)
setTimeout(done, 1000)

it 'expects change all camera input', (done) ->
auxs = Object.keys(sw.state.video.auxs)
Expand All @@ -88,7 +88,7 @@ describe 'Atem', ->
before (done) ->
for me in [0...sw.state.topology.numberOfMEs]
sw.fadeToBlack(me) if sw.state.video.ME[me].fadeToBlack
setTimeout(done, 1500)
setTimeout(done, 2000)

it 'expects fade to black', (done) ->
async.eachSeries([0...sw.state.topology.numberOfMEs], (me, nextME) ->
Expand Down Expand Up @@ -199,7 +199,7 @@ describe 'Atem', ->
before (done) ->
for me in [0...sw.state.topology.numberOfMEs]
sw.changeTransitionType(ATEM.TransitionStyle.DIP, me)
setTimeout(done, 100)
setTimeout(done, 1000)

it 'expects change all transition type', (done) ->
types = if sw.state.model == ATEM.Model.TVS || sw.state.model == ATEM.Model.PS4K
Expand Down Expand Up @@ -394,6 +394,7 @@ describe 'Atem', ->
sw.changeAudioChannelState(channel, false)
next null, null
, done)
# setTimeout(done, 100)

before initialize

Expand Down Expand Up @@ -438,12 +439,14 @@ describe 'Atem', ->
describe 'runMacro', ->
before (done) ->
sw.changeProgramInput(1)
setTimeout(done, 100)
setTimeout(done, 1000)

it 'expects run macro', (done) ->
sw.startRecordMacro(99, 'Test Macro', 'Hey! This is macro.')
sw.changeProgramInput(2)
sw.stopRecordMacro()
expect(sw.state.macro[99].name).be.eq('Test Macro')
expect(sw.state.macro[99].description).be.eq('Hey! This is macro.')
sw.changeProgramInput(1)
sw.runMacro(99)
setTimeout( ->
Expand All @@ -454,7 +457,7 @@ describe 'Atem', ->
after (done) ->
sw.deleteMacro(99)
sw.changeProgramInput(1)
setTimeout(done, 100)
setTimeout(done, 1000)

after ->
console.log """\n-------- ATEM Information --------
Expand Down