Merge lp:~devvmh/mnemosyne-proj/mnemosyne-proj into lp:~peter-bienstman/mnemosyne-proj/trunk

[Devin Howard]

fix mplayer error in 2.4.1 on MacOS

=== modified file 'mnemosyne/README'
--- mnemosyne/README	2017-01-30 15:24:43 +0000
+++ mnemosyne/README	2017-04-25 03:48:43 +0000
@@ -37,10 +37,18 @@
  - Make sure you are using the latest version of Homebrew:
 
      brew update
+
+ - Patch the python3 formula so you'll get python 3.5 and not a later version (pyinstaller still requires python 3.5):
+
+     brew uninstall python3
+     brew edit python3
+     # replace the file with the contents of https://raw.githubusercontent.com/Homebrew/homebrew-core/1e62c645b2fc2d82042d9f7c364c6a246f2e11ed/Formula/python3.rb and save it
+     brew install python3
+     brew pin python3
     
  - Install the dependencies for Mnemosyne. You may need to install qt5 or python3 manually to get the correct version.
  
-     brew install python3 qt5 mplayer
+     brew install qt@5.7 mplayer
      pip3 install virtualenv
      virtualenv --python=python3 venv
      source venv/bin/activate
@@ -49,7 +57,7 @@
  - Build it:
  
      export PYTHON=python3
-     export QT5DIR=/usr/local/opt/qt5 # help pyinstaller find the qt5 path
+     export QT5DIR=/usr/local/opt/qt@5.7 # help pyinstaller find the qt5 path
      make clean
      make osx
 
 
=== modified file 'mnemosyne/mnemosyne/pyqt_ui/review_wdgt.py'
--- mnemosyne/mnemosyne/pyqt_ui/review_wdgt.py	2017-03-23 18:40:10 +0000
+++ mnemosyne/mnemosyne/pyqt_ui/review_wdgt.py	2017-04-25 03:48:43 +0000
@@ -506,8 +506,16 @@
             command = "mplayer.exe -slave -ao win32 -quiet \"" + filename + \
                 "\" -ss " + str(start) + " -endpos " + str(duration) 
         elif sys.platform == "darwin":
-            command = "mplayer -slave -ao coreaudio -quiet \"" + filename + \
-                "\" -ss " + str(start) + " -endpos " + str(duration)
+            # e.g. /path/to/Mnemosyne.app/Contents/MacOS/mnemosyne/pyqt_ui/review_wdgt.py
+            SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))
+            # e.g. /path/to/Mnemosyne.app/Contents
+            CONTENTS_FOLDER = SCRIPT_PATH[:SCRIPT_PATH.index("/MacOS")]
+            # e.g. /path/to/Mnemosyne.app/Contents/MacOS/mplayer
+            MPLAYER_PATH = CONTENTS_FOLDER + "/MacOS/mplayer"
+
+            command = "{} -slave -ao coreaudio -quiet \"{}\" -ss {} -endpos {}".format(
+                MPLAYER_PATH, filename, str(start), str(duration)
+            )
         else:
             command = "mplayer -slave -quiet \"" + filename + \
                 "\" -ss " + str(start) + " -endpos " + str(duration)