Skip to content

Commit c65f1ff

Browse files
committed
update nodeo to 2022 release, started fixing timecode display
1 parent 860df64 commit c65f1ff

18 files changed

+25
-24
lines changed

server/lib/components/Engineer/EngineerExt.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Engineer:
1212
def __init__(self, ownerComp):
1313
self.myOp = ownerComp
1414

15-
self.quadHeading = parent.Nodeo.op('engine_quad_heading')
15+
self.quadHeading = parent.nodeo.op('engine_quad_heading')
1616

1717
# pars
1818
self.switchType = self.myOp.fetch('segment_unit')
@@ -21,7 +21,7 @@ def __init__(self, ownerComp):
2121
self.duet = self.myOp.par.Duet
2222
self.pip = self.myOp.par.Pip
2323

24-
self.engine4 = parent.Nodeo.op('engine4')
24+
self.engine4 = parent.nodeo.op('engine4')
2525

2626
self.engineMov = self.myOp.op('engine_Mov')
2727

@@ -60,7 +60,7 @@ def __init__(self, ownerComp):
6060
self.trans = self.myOp.op('../comp/glsl_mattes_trans')
6161

6262
# GUI
63-
self.gui = parent.Nodeo.op('GUI')
63+
self.gui = parent.nodeo.op('GUI')
6464
self.deck = self.gui.op('PAR4/VIDEO_BAR/ABBA')
6565
self.duip = self.gui.op('PAR4/VIDEO_BAR/DUIP')
6666

@@ -94,7 +94,7 @@ def ResetPlayback(self):
9494
self.myOp.op('storage_init').run()
9595

9696
# blackout output
97-
parent.Nodeo.par.Output = False
97+
parent.nodeo.par.Output = False
9898

9999
# reset for init playback
100100
self.timer.par.initialize.pulse()
@@ -111,9 +111,9 @@ def FirstPlay(self):
111111
self.timer.par.start.pulse()
112112

113113
# enable output if disabled
114-
parent.Nodeo.par.Output = True
114+
parent.nodeo.par.Output = True
115115

116-
parent.Nodeo.store('armed_for_playback', False)
116+
parent.nodeo.store('armed_for_playback', False)
117117

118118
def matchFractionIndex(self, val):
119119
# this fixes the pairing so that the correct
@@ -342,7 +342,7 @@ def LoadEngine(self, engineNumber, index, timeslot):
342342
# TO-DO: add a tickline that slides left to right as duration progresses
343343
# self.playLister.par.Selectedrows = index
344344

345-
if engineNumber is not 3 and not self.myOp.fetch('manual_drop'):
345+
if engineNumber != 3 and not self.myOp.fetch('manual_drop'):
346346
#update current playing segment (row)
347347
self.playlists.par.Activesegmentrow = index
348348
self.myOp.store('current_index', index)
@@ -358,7 +358,7 @@ def LoadEngine(self, engineNumber, index, timeslot):
358358
# add names to pars for gui refs
359359
self.SetNames(timeslot, engineNumber, index)
360360

361-
if engineNumber is not 3:
361+
if engineNumber != 3:
362362
# update timer duration
363363
self.UpdateTimerLength('content')
364364

@@ -479,7 +479,7 @@ def CueNextTrans(self):
479479

480480

481481
def ClearTrans(self):
482-
self.quadHeading.par.Engine4tox = parent.Nodeo.par.Defaulttox
482+
self.quadHeading.par.Engine4tox = parent.nodeo.par.Defaulttox
483483
self.myOp.par.Engine4now = 'blank.tox'
484484
self.timer.par.start.pulse()
485485

@@ -563,8 +563,8 @@ def UpdateMovPars(self, parName, parVal):
563563
if parName != 'Mov':
564564
setattr(self.engineMov.par, '{}'.format(parName), str(parVal))
565565
else:
566-
val = project.folder + '/' + parent.Nodeo.par.Mov \
567-
if not ':' in str(parent.Nodeo.par.Mov) else parent.Nodeo.par.Mov
566+
val = project.folder + '/' + parent.nodeo.par.Mov \
567+
if not ':' in str(parent.nodeo.par.Mov) else parent.nodeo.par.Mov
568568
setattr(self.engineMov.par, '{}'.format(parName), val)
569569

570570
def Bug(self, par):
0 Bytes
Binary file not shown.
Binary file not shown.
-416 Bytes
Binary file not shown.

server/lib/components/GUI/SRC3/PLAYLISTS/PlaylisterExt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def SelectPlaylistTab(self, readDelay, writeDelay, event, lastTab):
214214
run("op('{}').lock = False".format(self.active), delayFrames=10)
215215

216216
# switch playlist input table
217-
self.playlist.par.file = parent.Nodeo.par.Settings + '/playlists/' + self.Playlists[self.myOp.par.Selectedplaylist + 1, 'label'] + '.py'
217+
self.playlist.par.file = parent.nodeo.par.Settings + '/playlists/' + self.Playlists[self.myOp.par.Selectedplaylist + 1, 'label'] + '.py'
218218
# check if playlist file doesn't exist
219219
if not self.CheckIfPlaylistFileExists(self.Playlists[self.myOp.par.Selectedplaylist + 1, 'label']) and event != 'rename':
220220
self.FinishResettingPlaylist()
64 Bytes
Binary file not shown.
8 Bytes
Binary file not shown.
128 Bytes
Binary file not shown.
Binary file not shown.
-64.4 KB
Binary file not shown.
-65.1 KB
Binary file not shown.

server/lib/components/local/cron/chopexec_daily_reload.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def onValueChange(channel, sampleIndex, val, prev):
2323
# midnight refresh for engine that's not playing
2424
if channel.name == 'hour' and val == 0:
2525
engineToReload = (1 - op.Engineer.par.Abba) + 1
26-
parent.Nodeo.ReloadEngine(engineToReload)
26+
parent.nodeo.ReloadEngine(engineToReload)
2727

2828
print('Reloaded Engine ', engineToReload)
2929

@@ -32,7 +32,7 @@ def onValueChange(channel, sampleIndex, val, prev):
3232
secondsRemaining = (1.0 - progress) * segmentInterval
3333
reloadOtherIn = secondsRemaining + op.Engineer.fetch('trans_interval') + 3 # add 3 to be safe
3434

35-
reloadOtherEngine = 'parent.Nodeo.ReloadEngine({} + 1)'.format(op.Engineer.par.Abba)
35+
reloadOtherEngine = 'parent.nodeo.ReloadEngine({} + 1)'.format(op.Engineer.par.Abba)
3636
run(reloadOtherEngine, delayFrames = reloadOtherIn * me.time.rate)
3737

3838
printSecond = "print('Reloaded Engine ', {}".format(op.Engineer.par.Abba + 1)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VidName VidDur TransName TransDur SndName SndDur Delete VidPath TransPath SndPath
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
VidName VidDur TransName TransDur SndName SndDur Delete VidPath TransPath SndPath
2-
abstractThing 28.0 interstitial1 sndName 100.0 Media/Gen/abstractThing.tox Media/Trans/interstitial1.tox sndPath
3-
arrakisStudy 28.0 interstitial2 sndName 100.0 Media/Gen/arrakisStudy.tox Media/Trans/interstitial2.tox sndPath
4-
bladerunner 28.0 interstitial3 sndName 100.0 Media/Gen/bladerunner.tox Media/Trans/interstitial3.tox sndPath
5-
cognitionCubes 28.0 interstitial4 sndName 100.0 Media/Gen/cognitionCubes.tox Media/Trans/interstitial4.tox sndPath
6-
okyotStudy 28.0 interstitial6 sndName 100.0 Media/Gen/okyotStudy.tox Media/Trans/interstitial6.tox sndPath
7-
moire 28.0 interstitial5 sndName 100.0 Media/Gen/moire.tox Media/Trans/interstitial5.tox sndPath
8-
reordreed 28.0 interstitial7 sndName 100.0 Media/Gen/reordreed.tox Media/Trans/interstitial7.tox sndPath
9-
silenceStudy 28.0 interstitial8 sndName 100.0 Media/Gen/silenceStudy.tox Media/Trans/interstitial8.tox sndPath
10-
flowerGems 28.0 interstitial9 sndName 100.0 Media/Gen/flowerGems.tox Media/Trans/interstitial9.tox sndPath
11-
colourStudy 28.0 nBumpr5 sndName 100.0 Media/Gen/colourStudy.tox Media/Trans/nBumpr5.tox sndPath
2+
abstractThing 28.0 interstitial1 sndName 100.0 abstractThing Media/Gen/abstractThing.tox Media/Trans/interstitial1.tox sndPath
3+
arrakisStudy 28.0 interstitial2 sndName 100.0 arrakisStudy Media/Gen/arrakisStudy.tox Media/Trans/interstitial2.tox sndPath
4+
bladerunner 28.0 interstitial3 sndName 100.0 bladerunner Media/Gen/bladerunner.tox Media/Trans/interstitial3.tox sndPath
5+
cognitionCubes 28.0 interstitial4 sndName 100.0 cognitionCubes Media/Gen/cognitionCubes.tox Media/Trans/interstitial4.tox sndPath
6+
colourStudy 28.0 interstitial6 sndName 100.0 colourStudy Media/Gen/colourStudy.tox Media/Trans/interstitial6.tox sndPath
7+
flowerGems 30.0 interstitial5 sndName 100.0 flowerGems Media/Gen/flowerGems.tox Media/Trans/interstitial5.tox sndPath
8+
moire 28.0 interstitial7 sndName 100.0 moire Media/Gen/moire.tox Media/Trans/interstitial7.tox sndPath
9+
okyotStudy 28.0 interstitial8 sndName 100.0 okyotStudy Media/Gen/okyotStudy.tox Media/Trans/interstitial8.tox sndPath
10+
reordreed 28.0 interstitial9 sndName 100.0 reordreed Media/Gen/reordreed.tox Media/Trans/interstitial9.tox sndPath
11+
silenceStudy 28.0 nBumpr5 sndName 100.0 silenceStudy Media/Gen/silenceStudy.tox Media/Trans/nBumpr5.tox sndPath

server/nodeo.2021.0.8.toe

-1.43 MB
Binary file not shown.

server/nodeo.2021.0.toe

-1.43 MB
Binary file not shown.

server/nodeo.2022.0.3.toe

1.37 MB
Binary file not shown.

server/nodeo.2022.0.toe

1.37 MB
Binary file not shown.

0 commit comments

Comments
 (0)