|
|
@@ -43,6 +43,7 @@ parser.add_option("", "--gobo-ch2", dest="gobo_ch2",default=0,
|
|
|
parser.add_option("", "--win-pos", dest="win_pos",default="200,164",
|
|
|
help="SDL_VIDEO_WINDOW_POS --win-pos=200,164") #, metavar="FILE")
|
|
|
|
|
|
+# PIXEL_MAPPING ... for gobo
|
|
|
parser.add_option("", "--pixel-mapping", dest="pixel_mapping",default=0,
|
|
|
help="pixel_mapping file/on --pixel-mapping=_x") #, metavar="FILE")
|
|
|
|
|
|
@@ -929,12 +930,16 @@ CFG_IN = {"name":"CFG_IN","x1":40,"y1":60,"x2":0,"y2":0 ,"w":0,"h":300}
|
|
|
|
|
|
# OUTPUT CFG INIT
|
|
|
CFG_OUT = []
|
|
|
-out_idim = options.out_idim.split(",")
|
|
|
-x1 = 40
|
|
|
-for i,v in enumerate(out_idim):
|
|
|
- _t = {"name":"CFG_OUT{}".format(i+1),"x1":x1,"y1":60,"x2":0,"y2":0 ,"w":30,"h":30,"on":1,"DMX-CH":v}
|
|
|
- CFG_OUT.append(_t)
|
|
|
- x1 += p*8
|
|
|
+out_idim = options.out_idim
|
|
|
+if out_idim:
|
|
|
+ out_idim = options.out_idim.split(",")
|
|
|
+ x1 = 40
|
|
|
+ for i,v in enumerate(out_idim):
|
|
|
+ if type(v) is str:
|
|
|
+ v=0
|
|
|
+ _t = {"name":"CFG_OUT{}".format(i+1),"x1":x1,"y1":60,"x2":0,"y2":0 ,"w":30,"h":30,"on":1,"DMX-CH":v}
|
|
|
+ CFG_OUT.append(_t)
|
|
|
+ x1 += p*8
|
|
|
|
|
|
CFG_BLOCK = {"name":"CFG_BLOCK","size":16,"h-split":2,"v-split":2,"h-count":8,"v-count":8}
|
|
|
|
|
|
@@ -1042,6 +1047,8 @@ if options.pixel_mapping:
|
|
|
text_file = HOME+"/LibreLight/vpu_text_hd{}.csv".format(path)
|
|
|
media_list = HOME+"/LibreLight/video/" #.format(path)
|
|
|
|
|
|
+if not options.out_idim:
|
|
|
+ PIXEL_MAPPING = 0
|
|
|
|
|
|
print(" ",[options.pixel_mapping],"grid_file",grid_file)
|
|
|
#grid_file = HOME+"/LibreLight/vpu_grid_hd.csv"
|
|
|
@@ -2672,16 +2679,19 @@ def main():
|
|
|
reshape2(GRID,GRID_A,CFG_OUT[0]["x1"],CFG_OUT[0]["y1"],name="GRID_A1") #start pos
|
|
|
|
|
|
|
|
|
- out_frame()
|
|
|
+ if options.out_idim:
|
|
|
+ out_frame()
|
|
|
|
|
|
# OUTPUT -> MAPING
|
|
|
- draw_kachel_nr()
|
|
|
+ if options.out_idim:
|
|
|
+ draw_kachel_nr()
|
|
|
|
|
|
+ if options.out_idim:
|
|
|
+ input_mask() # mask background
|
|
|
|
|
|
- input_mask() # mask background
|
|
|
- output_mask() # mask background
|
|
|
-
|
|
|
- GRID_DIM() # overlay
|
|
|
+ if options.out_idim:
|
|
|
+ output_mask() # mask background
|
|
|
+ GRID_DIM() # overlay
|
|
|
|
|
|
if VIDEO:
|
|
|
draw_all_video_overlay(VIDEO)
|