diff --git a/display_data.json b/display_data.json index a6ca037..d10996c 100644 --- a/display_data.json +++ b/display_data.json @@ -1 +1 @@ -[{"start": -1, "length": 49, "end": -1, "location": "/media/pi/TIM1/videos_to_play/colour_pixel_01.mp4", "name": "colour_pixel_01.mp4"}, {"start": -1, "length": 87, "end": -1, "location": "/media/pi/TIM1/videos_to_play/colour_pixel_02.mp4", "name": "colour_pixel_02.mp4"}, {"start": -1, "length": 53, "end": -1, "location": "/media/pi/TIM1/videos_to_play/colour_pixel_03.mp4", "name": "colour_pixel_03.mp4"}, {"start": -1, "length": 804, "end": -1, "location": "/media/pi/TIM1/videos_to_play/long_spinning.mp4", "name": "long_spinning.mp4"}, {"start": -1, "length": 1132, "end": -1, "location": "/media/pi/TIM1/videos_to_play/mushroom-dreams.mp4", "name": "mushroom-dreams.mp4"}, {"start": -1, "length": 804, "end": -1, "location": "/media/pi/TIM1/videos_to_play/long_spinning.mp4", "name": "long_spinning.mp4"}, {"start": -1, "length": 4, "end": -1, "location": "/media/pi/TIM1/samplerloop3s.mp4", "name": "samplerloop3s.mp4"}, {"start": -1, "length": 5, "end": -1, "location": "/media/pi/TIM1/samplerloop3s2.mp4", "name": "samplerloop3s2.mp4"}, {"start": -1, "length": 3, "end": -1, "location": "/media/pi/TIM1/samplerloop3s3.mp4", "name": "samplerloop3s3.mp4"}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}] \ No newline at end of file +[{"start": -1, "length": 4, "end": -1, "location": "/media/pi/TIM1/samplerloop3s.mp4", "name": "samplerloop3s.mp4"}, {"start": -1, "length": 3, "end": -1, "location": "/media/pi/TIM1/teaser1.mp4", "name": "teaser1.mp4"}, {"start": -1, "length": 3, "end": -1, "location": "/media/pi/TIM1/teaser2.mp4", "name": "teaser2.mp4"}, {"start": -1, "length": 3, "end": -1, "location": "/media/pi/TIM1/teaser3.mp4", "name": "teaser3.mp4"}, {"start": -1, "length": 2, "end": -1, "location": "/media/pi/TIM1/teaser4.mp4", "name": "teaser4.mp4"}, {"start": -1, "length": 600, "end": -1, "location": "/media/pi/TIM1/Test.mp4", "name": "Test.mp4"}, {"start": -1, "length": 26, "end": -1, "location": "/media/pi/TIM1/TRASHPALACEVIDEOS/01_trashpalaceintro.mp4", "name": "01_trashpalaceintro.mp4"}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}, {"start": -1, "length": -1, "end": -1, "location": "", "name": ""}] \ No newline at end of file diff --git a/settings.json b/settings.json index e62ea0c..0aff3b2 100644 --- a/settings.json +++ b/settings.json @@ -1 +1 @@ -[{"name": "PLAYBACK_MODE", "value": "LOOPER"}, {"name": "PLAYLIST", "value": "[1,1,1,4,1,2,1,4]"}, {"name": "SYNC_LENGTHS", "value": "OFF"}, {"name": "SYNC_LENGTHS_TO", "value": "00:08"}, {"name": "RAND_START", "value": "OFF"}, {"name": "VIDEO_OUTPUT", "value": "HDMI"}, {"name": "DEV_MODE", "value": "ON"}] \ No newline at end of file +[{"name": "PLAYBACK_MODE", "value": "LOOPER"}, {"name": "PLAYLIST", "value": "[1,1,1,4,1,2,1,4]"}, {"name": "SYNC_LENGTHS", "value": "OFF"}, {"name": "SYNC_LENGTHS_TO", "value": "00:08"}, {"name": "RAND_START", "value": "OFF"}, {"name": "VIDEO_OUTPUT", "value": "COMPOSITE"}, {"name": "DEV_MODE", "value": "ON"}] diff --git a/video_centre.py b/video_centre.py index 34c89c8..9f51d39 100644 --- a/video_centre.py +++ b/video_centre.py @@ -9,10 +9,9 @@ from Tkinter import Tk, Canvas import data_centre logger = data_centre.setup_logging() if data_centre.DEV_MODE == "ON": - print 'we in' screen_size = "--win 250,350,800,800" else: - screen_size = '--win 0,0,1279,959' #'--blank' + screen_size = '--win 45,15,970,760' #'--blank' # layer = 0