Merge pull request #78 from VMannello/master

Added aspect-mode as a native omxplayer-sync option

Author: turingmachine

README.md

@@ -20,19 +20,21 @@ Options:
   -l, --slave           
   -x DESTINATION, --destination=DESTINATION
   -u, --loop            
-  -v, --verbose
+  -v, --verbose         
+  -o ADEV, --adev=ADEV  
+  -a ASPECT, --aspect=ASPECT  Aspect Mode - fill, letterbox, stretch
 ```
 
-**master**
+**Master**
 
 ```
-omxplayer-sync -muv movie1.mp4 movie2.mp4 /movies/*
+omxplayer-sync -m movie1.mp4
 ```
 
-**slave**
+**Slave**
 
 ```
-omxplayer-sync -luv movie1.mp4 movie2.mp4 /movies/*
+omxplayer-sync -l movie1.mp4
 ```
 
 
@@ -45,21 +47,25 @@ A recent build of omxplayer from [Sergio Conde](http://omxplayer.sconde.net).
 
 Installation on Raspbian
 ------------------------
+Perform on both master and slave.
 ```
-su -
+sudo su
 apt-get remove omxplayer
 rm -rf /usr/bin/omxplayer /usr/bin/omxplayer.bin /usr/lib/omxplayer
 apt-get install libpcre3 fonts-freefont-ttf fbset libssh-4 python3-dbus
-wget http://omxplayer.sconde.net/builds/omxplayer_0.3.7~git20160713~66f9076_armhf.deb
-dpkg -i omxplayer_0.3.7~git20160713~66f9076_armhf.deb
+wget http://omxplayer.sconde.net/builds/omxplayer_0.3.7~git20170130~62fb580_armhf.deb
+dpkg -i omxplayer_0.3.7~git20170130~62fb580_armhf.deb
 wget -O /usr/bin/omxplayer-sync https://github.com/turingmachine/omxplayer-sync/raw/master/omxplayer-sync
 chmod 0755 /usr/bin/omxplayer-sync
 wget https://github.com/turingmachine/omxplayer-sync/raw/master/synctest.mp4
+```
 
-# start on master
+Start on Master (-u loop, -v verbose)
+```
 omxplayer-sync -muv synctest.mp4
-
-# start on slave
+```
+Start on Slave (-u loop, -v verbose)
+```
 omxplayer-sync -luv synctest.mp4
 ```
 

omxplayer-sync

@@ -33,6 +33,7 @@ except ImportError:
 SYNC_TOLERANCE = .05
 SYNC_GRACE_TIME = 5
 SYNC_JUMP_AHEAD = 3
+ASPECT_OPTIONS = ('fill', 'stretch', 'letterbox')
 
 OMXPLAYER = 'omxplayer'
 OMXPLAYER_DBUS_ADDR='/tmp/omxplayerdbus.%s' % getpass.getuser()
@@ -142,6 +143,7 @@ class OMXPlayerSync():
         p.add_option('--loop', '-u', action='store_true')
         p.add_option('--verbose', '-v', action='store_true')
         p.add_option('--adev', '-o', default='both')
+        p.add_option('--aspect', '-a', default=None, help="Aspect Mode - fill, letterbox, stretch")
         self.options, arguments = p.parse_args()
 
         for argument in arguments:
@@ -155,6 +157,10 @@ class OMXPlayerSync():
 
         if self.options.loop and len(self.playlist) == 1:
             self.omxplayer_options.append("--loop")
+            
+        if self.options.aspect is not None:
+            if self.options.aspect in ASPECT_OPTIONS:
+                self.omxplayer_options.append("--aspect-mode %s" % self.options.aspect)
 
         if not filter(lambda x: os.path.isfile(x), self.playlist):
             print("ERROR: none of the supplied filenames are found")