balkian/rpi_video_looper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix spacing & close sound file.

Browse Source
This commit is contained in:
Tony DiCola 2015-05-04 04:54:40 +00:00
parent 6ddb802fc7
commit 6cd7a794a0
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Adafruit_Video_Looper/omxplayer.py
View File

@ -34,8 +34,8 @@ class OMXPlayer(object):
args = ['omxplayer'] args = ['omxplayer']
args.extend(['-o', self._sound]) # Add sound arguments. args.extend(['-o', self._sound]) # Add sound arguments.
args.extend(self._extra_args) # Add extra arguments from config. args.extend(self._extra_args) # Add extra arguments from config.
if vol is not 0: if vol is not 0:
args.extend(['--vol', str(vol)]) args.extend(['--vol', str(vol)])
if loop: if loop:
args.append('--loop') # Add loop parameter if necessary. args.append('--loop') # Add loop parameter if necessary.
args.append(movie) # Add movie file path. args.append(movie) # Add movie file path.

37
Adafruit_Video_Looper/video_looper.py
View File

@ -62,10 +62,10 @@ class VideoLooper(object):
.translate(None, ',') \ .translate(None, ',') \
.split()) .split())
# Load sound volume file name value # Load sound volume file name value
self._sound_vol_file = self._config.get('omxplayer', 'sound_vol_file'); self._sound_vol_file = self._config.get('omxplayer', 'sound_vol_file');
# default value to 0 millibels (omxplayer) # default value to 0 millibels (omxplayer)
self._sound_vol = 0 self._sound_vol = 0
# Initialize pygame and display a blank screen. # Initialize pygame and display a blank screen.
pygame.display.init() pygame.display.init()
pygame.font.init() pygame.font.init()
pygame.mouse.set_visible(False) pygame.mouse.set_visible(False)
@ -96,11 +96,11 @@ class VideoLooper(object):
.create_file_reader(self._config) .create_file_reader(self._config)
def _is_number(iself, s): def _is_number(iself, s):
try: try:
float(s) float(s)
return True return True
except ValueError: except ValueError:
return False return False
def _build_playlist(self): def _build_playlist(self):
"""Search all the file reader paths for movie files with the provided """Search all the file reader paths for movie files with the provided
@ -115,24 +115,23 @@ class VideoLooper(object):
# Skip paths that don't exist or are files. # Skip paths that don't exist or are files.
if not os.path.exists(path) or not os.path.isdir(path): if not os.path.exists(path) or not os.path.isdir(path):
continue continue
# Ignore hidden files (useful when file loaded on usb # Ignore hidden files (useful when file loaded on usb
# key from an OSX computer # key from an OSX computer
movies.extend(['{0}/{1}'.format(path.rstrip('/'), x) \ movies.extend(['{0}/{1}'.format(path.rstrip('/'), x) \
for x in os.listdir(path) \ for x in os.listdir(path) \
if re.search('\.{0}$'.format(ex), x, if re.search('\.{0}$'.format(ex), x,
flags=re.IGNORECASE) and \ flags=re.IGNORECASE) and \
x[0] is not '.']) x[0] is not '.'])
# Get the video volume from the file in the usb key # Get the video volume from the file in the usb key
sound_vol_file_path = '{0}/{1}'.format(path.rstrip('/'), self._sound_vol_file) sound_vol_file_path = '{0}/{1}'.format(path.rstrip('/'), self._sound_vol_file)
if os.path.exists(sound_vol_file_path): if os.path.exists(sound_vol_file_path):
sound_file = open(sound_vol_file_path, 'r') with open(sound_vol_file_path, 'r') as sound_file:
sound_vol_string = sound_file.readline() sound_vol_string = sound_file.readline()
if self._is_number(sound_vol_string): if self._is_number(sound_vol_string):
self._sound_vol = int(float(sound_vol_string)) self._sound_vol = int(float(sound_vol_string))
# Create a playlist with the sorted list of movies. # Create a playlist with the sorted list of movies.
return Playlist(sorted(movies)) return Playlist(sorted(movies))
def _blank_screen(self): def _blank_screen(self):
"""Render a blank screen filled with the background color.""" """Render a blank screen filled with the background color."""
self._screen.fill(self._bgcolor) self._screen.fill(self._bgcolor)