Firenet

Check-in [4c4d2dad94]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Getting ready for movie
Timelines: family | ancestors | descendants | both | NEWNET
Files: files | file ages | folders
SHA1:4c4d2dad94254dbd3b57ec557fecd52216ff5efa
User & Date: jim 2013-02-18 10:50:11
Context
2013-02-18
13:45
Add retry on inventory check-in: 0d49db5a1e user: jim tags: NEWNET
10:50
Getting ready for movie check-in: 4c4d2dad94 user: jim tags: NEWNET
2013-02-17
12:25
Update with DOC fixes check-in: 4a9ce4e2f6 user: jim tags: NEWNET
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Deleted Shows/mariseillaise.json.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
{
	"show"		:	"La Mariseillaise",
	"music" 	:	"marseillaise.mp3",
	"time"		:	"1:03",
	"nodes"		:	"8",
	"program" : [
			{ "node" : "1", "ch" : "1" , "delay" : "1631" },
			{ "node" : "2", "ch" : "1" , "delay" : "2149" },
			{ "node" : "3", "ch" : "1" , "delay" : "2718" },
			{ "node" : "4", "ch" : "1" , "delay" : "3685" },
			{ "node" : "5", "ch" : "1" , "delay" : "4159" },
			{ "node" : "6", "ch" : "1" , "delay" : "5220" },
			{ "node" : "7", "ch" : "1" , "delay" : "5853" },
			{ "node" : "8", "ch" : "1" , "delay" : "6637" },
			{ "node" : "1", "ch" : "2" , "delay" : "6835" },
			{ "node" : "2", "ch" : "2" , "delay" : "7052" },
			{ "node" : "3", "ch" : "2" , "delay" : "7875" },
			{ "node" : "4", "ch" : "2" , "delay" : "8131" },
			{ "node" : "5", "ch" : "2" , "delay" : "8922" },
			{ "node" : "6", "ch" : "2" , "delay" : "11301" },
			{ "node" : "7", "ch" : "2" , "delay" : "11685" },
			{ "node" : "8", "ch" : "2" , "delay" : "12218" },
			{ "node" : "1", "ch" : "3" , "delay" : "13253" },
			{ "node" : "2", "ch" : "3" , "delay" : "15458" },
			{ "node" : "3", "ch" : "3" , "delay" : "15825" },
			{ "node" : "4", "ch" : "3" , "delay" : "16337" },
			{ "node" : "5", "ch" : "3" , "delay" : "17243" },
			{ "node" : "6", "ch" : "3" , "delay" : "19848" },
			{ "node" : "7", "ch" : "3" , "delay" : "24543" },
			{ "node" : "8", "ch" : "3" , "delay" : "27134" },
			{ "node" : "1", "ch" : "4" , "delay" : "27928" },
			{ "node" : "2", "ch" : "4" , "delay" : "30049" },
			{ "node" : "3", "ch" : "4" , "delay" : "33568" },
			{ "node" : "4", "ch" : "4" , "delay" : "35894" },
			{ "node" : "5", "ch" : "4" , "delay" : "41001" },
			{ "node" : "6", "ch" : "4" , "delay" : "42049" },
			{ "node" : "7", "ch" : "4" , "delay" : "43071" },
			{ "node" : "8", "ch" : "4" , "delay" : "43921" },
			{ "node" : "1", "ch" : "5" , "delay" : "45614" },
			{ "node" : "2", "ch" : "5" , "delay" : "46101" },
			{ "node" : "3", "ch" : "5" , "delay" : "47088" },
			{ "node" : "4", "ch" : "5" , "delay" : "47796" },
			{ "node" : "5", "ch" : "5" , "delay" : "49622" },
			{ "node" : "6", "ch" : "5" , "delay" : "51017" },
			{ "node" : "7", "ch" : "5" , "delay" : "52756" },
			{ "node" : "8", "ch" : "5" , "delay" : "53613" },
			{ "node" : "2", "ch" : "6" , "delay" : "54267" },
			{ "node" : "4", "ch" : "6" , "delay" : "54989" },
			{ "node" : "6", "ch" : "6" , "delay" : "56118" },
			{ "node" : "8", "ch" : "6" , "delay" : "57603" },
			{ "node" : "3", "ch" : "6" , "delay" : "59056" },
			{ "node" : "5", "ch" : "6" , "delay" : "60643" },
			{ "node" : "7", "ch" : "6" , "delay" : "61562" }
				]
}
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<














































































































Added Shows/mariseillaise6.json.















































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
{
	"show"		:	"La Mariseillaise",
	"music" 	:	"marseillaise.mp3",
	"time"		:	"1:03",
	"nodes"		:	"6",
	"program" : [
			{ "node" : "1", "ch" : "1" , "delay" : "2480" },
			{ "node" : "2", "ch" : "1" , "delay" : "3563" },
			{ "node" : "3", "ch" : "1" , "delay" : "6242" },
			{ "node" : "4", "ch" : "1" , "delay" : "13315" },
			{ "node" : "5", "ch" : "1" , "delay" : "16053" },
			{ "node" : "6", "ch" : "1" , "delay" : "16578" },
			{ "node" : "1", "ch" : "2" , "delay" : "17122" },
			{ "node" : "2", "ch" : "2" , "delay" : "33305" },
			{ "node" : "3", "ch" : "2" , "delay" : "33391" },
			{ "node" : "4", "ch" : "2" , "delay" : "35509" },
			{ "node" : "5", "ch" : "2" , "delay" : "37697" },
			{ "node" : "6", "ch" : "2" , "delay" : "42094" },
			{ "node" : "1", "ch" : "3" , "delay" : "42111" },
			{ "node" : "2", "ch" : "3" , "delay" : "42660" },
			{ "node" : "3", "ch" : "3" , "delay" : "43116" },
			{ "node" : "4", "ch" : "3" , "delay" : "45770" },
			{ "node" : "5", "ch" : "3" , "delay" : "46843" },
			{ "node" : "6", "ch" : "3" , "delay" : "47335" },
			{ "node" : "1", "ch" : "4" , "delay" : "47410" },
			{ "node" : "2", "ch" : "4" , "delay" : "51580" },
			{ "node" : "3", "ch" : "4" , "delay" : "53654" },
			{ "node" : "4", "ch" : "4" , "delay" : "53758" },
			{ "node" : "5", "ch" : "4" , "delay" : "54743" },
			{ "node" : "6", "ch" : "4" , "delay" : "55267" },
			{ "node" : "1", "ch" : "5" , "delay" : "57373" },
			{ "node" : "2", "ch" : "5" , "delay" : "57889" },
			{ "node" : "3", "ch" : "5" , "delay" : "57936" },
			{ "node" : "4", "ch" : "5" , "delay" : "57955" },
			{ "node" : "5", "ch" : "5" , "delay" : "60148" },
			{ "node" : "6", "ch" : "5" , "delay" : "60703" },
			{ "node" : "2", "ch" : "6" , "delay" : "61247" }
		]
}

Added Shows/mariseillaise8.json.















































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
{
	"show"		:	"La Mariseillaise",
	"music" 	:	"marseillaise.mp3",
	"time"		:	"1:03",
	"nodes"		:	"8",
	"program" : [
			{ "node" : "1", "ch" : "1" , "delay" : "1631" },
			{ "node" : "2", "ch" : "1" , "delay" : "2149" },
			{ "node" : "3", "ch" : "1" , "delay" : "2718" },
			{ "node" : "4", "ch" : "1" , "delay" : "3685" },
			{ "node" : "5", "ch" : "1" , "delay" : "4159" },
			{ "node" : "6", "ch" : "1" , "delay" : "5220" },
			{ "node" : "7", "ch" : "1" , "delay" : "5853" },
			{ "node" : "8", "ch" : "1" , "delay" : "6637" },
			{ "node" : "1", "ch" : "2" , "delay" : "6835" },
			{ "node" : "2", "ch" : "2" , "delay" : "7052" },
			{ "node" : "3", "ch" : "2" , "delay" : "7875" },
			{ "node" : "4", "ch" : "2" , "delay" : "8131" },
			{ "node" : "5", "ch" : "2" , "delay" : "8922" },
			{ "node" : "6", "ch" : "2" , "delay" : "11301" },
			{ "node" : "7", "ch" : "2" , "delay" : "11685" },
			{ "node" : "8", "ch" : "2" , "delay" : "12218" },
			{ "node" : "1", "ch" : "3" , "delay" : "13253" },
			{ "node" : "2", "ch" : "3" , "delay" : "15458" },
			{ "node" : "3", "ch" : "3" , "delay" : "15825" },
			{ "node" : "4", "ch" : "3" , "delay" : "16337" },
			{ "node" : "5", "ch" : "3" , "delay" : "17243" },
			{ "node" : "6", "ch" : "3" , "delay" : "19848" },
			{ "node" : "7", "ch" : "3" , "delay" : "24543" },
			{ "node" : "8", "ch" : "3" , "delay" : "27134" },
			{ "node" : "1", "ch" : "4" , "delay" : "27928" },
			{ "node" : "2", "ch" : "4" , "delay" : "30049" },
			{ "node" : "3", "ch" : "4" , "delay" : "33568" },
			{ "node" : "4", "ch" : "4" , "delay" : "35894" },
			{ "node" : "5", "ch" : "4" , "delay" : "41001" },
			{ "node" : "6", "ch" : "4" , "delay" : "42049" },
			{ "node" : "7", "ch" : "4" , "delay" : "43071" },
			{ "node" : "8", "ch" : "4" , "delay" : "43921" },
			{ "node" : "1", "ch" : "5" , "delay" : "45614" },
			{ "node" : "2", "ch" : "5" , "delay" : "46101" },
			{ "node" : "3", "ch" : "5" , "delay" : "47088" },
			{ "node" : "4", "ch" : "5" , "delay" : "47796" },
			{ "node" : "5", "ch" : "5" , "delay" : "49622" },
			{ "node" : "6", "ch" : "5" , "delay" : "51017" },
			{ "node" : "7", "ch" : "5" , "delay" : "52756" },
			{ "node" : "8", "ch" : "5" , "delay" : "53613" },
			{ "node" : "2", "ch" : "6" , "delay" : "54267" },
			{ "node" : "4", "ch" : "6" , "delay" : "54989" },
			{ "node" : "6", "ch" : "6" , "delay" : "56118" },
			{ "node" : "8", "ch" : "6" , "delay" : "57603" },
			{ "node" : "3", "ch" : "6" , "delay" : "59056" },
			{ "node" : "5", "ch" : "6" , "delay" : "60643" },
			{ "node" : "7", "ch" : "6" , "delay" : "61562" }
				]
}

Changes to Shows/shows.json.

1
2
3
4






5
6
7
8
9
10
11
12
13
14
15
16
{
	"shows" : [
		{ "show"		:	"La Mariseillaise",
		  "file"		:	"mariseillaise.json",






		  "nodes"		:	"8",
		  "time"		:	"1:02"
		  },
		  
		  {
		  	"show"		:	"Stars & Stripes Forever",
		  	"file"		:	"ss_forever.json",
		  	"nodes"		:	"10",
		  	"time"		:	"3:38"
		  }
		]
}  


|
|
>
>
>
>
>
>












1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
{
	"shows" : [
		{ "show"		:	"La Mariseillaise 6",
		  "file"		:	"mariseillaise6.json",
		  "nodes"		:	"6",
		  "time"		:	"1:02"
		  },

		{ "show"		:	"La Mariseillaise 8",
		  "file"		:	"mariseillaise8.json",
		  "nodes"		:	"8",
		  "time"		:	"1:02"
		  },
		  
		  {
		  	"show"		:	"Stars & Stripes Forever",
		  	"file"		:	"ss_forever.json",
		  	"nodes"		:	"10",
		  	"time"		:	"3:38"
		  }
		]
}  

Changes to Tools/ShowGen/ShowGen.lua.

136
137
138
139
140
141
142

143
144
145
146
147
148
149

150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
then
	out = string.format("File [%s] has no data - quitting",INPUT_FILE)
	show_help(out)
	os.exit()
else
	-- Compute how many to fire per queue
	SKIP_FIRE = FLINES/(NODES * MAX_CHANNEL)

	if( SKIP_FIRE < 1 )
	then
		-- Going here means we have more pieces than queues
		-- So compute the number of pieces to fire/queue
		SKIP_FIRE = 1.0 / SKIP_FIRE
		SKIP_FIRE = math.floor( SKIP_FIRE )
		SKIP_FIRE = -1 * SKIP_FIRE

	else
		SKIP_FIRE = math.floor( SKIP_FIRE )
	end

end

-- Now Re-open the file

infl:close()
infl = io.open(INPUT_FILE,"r")

out = string.format("File Lines = [%d]",FLINES)
print(out)
if( SKIP_FIRE > 0 )
then
	out = string.format("Queues skipped between fires [%d]",SKIP_FIRE)
else
	print("-- Too many pieces for # queues decrease nodes")
	out = string.format("Pieces fired/queue = [%d]",-1*SKIP_FIRE)
	print(out)
	os.exit() 







>





|

>













|







136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
then
	out = string.format("File [%s] has no data - quitting",INPUT_FILE)
	show_help(out)
	os.exit()
else
	-- Compute how many to fire per queue
	SKIP_FIRE = FLINES/(NODES * MAX_CHANNEL)
	print ("SKIP FIRE ",SKIP_FIRE,FLINES,NODES)
	if( SKIP_FIRE < 1 )
	then
		-- Going here means we have more pieces than queues
		-- So compute the number of pieces to fire/queue
		SKIP_FIRE = 1.0 / SKIP_FIRE
		SKIP_FIRE = math.floor( SKIP_FIRE ) - 1
		SKIP_FIRE = -1 * SKIP_FIRE
			print ("SKIP FIRE ",SKIP_FIRE)
	else
		SKIP_FIRE = math.floor( SKIP_FIRE )
	end

end

-- Now Re-open the file

infl:close()
infl = io.open(INPUT_FILE,"r")

out = string.format("File Lines = [%d]",FLINES)
print(out)
if( SKIP_FIRE >= 0 )
then
	out = string.format("Queues skipped between fires [%d]",SKIP_FIRE)
else
	print("-- Too many pieces for # queues decrease nodes")
	out = string.format("Pieces fired/queue = [%d]",-1*SKIP_FIRE)
	print(out)
	os.exit()