Merge branch 'mpv'

.git_archival.txt

@@ -0,0 +1,2 @@
+ref-names: $Format:%D$
+

.gitattributes

@@ -0,0 +1 @@
+.git_archival.txt  export-subst

.gitignore

@@ -1,24 +1,24 @@
-.idea
-__pycache__
-.directory
-.vscode
-build
-dist
-vidcutter.egg*
-_build/pyinstaller/build
-_build/pyinstaller/dist
-_build/pyinstaller/temp
-_build/InnoSetup/Output/
-vidcutter/vidcutter.*/
-*.log
-*.dll
-*.BAK
-vidcutter/vidcutter
-vidcutter/vidcutter.exe
-.openshift
-vidcutter/bin/
-bin/
-.DS_Store
-_packaging/appimage/out/*
-_packaging/appimage/VidCutter/*
-testing
+.idea
+__pycache__
+.directory
+.vscode
+build
+dist
+vidcutter.egg*
+_build/pyinstaller/build
+_build/pyinstaller/dist
+_build/pyinstaller/temp
+_build/InnoSetup/Output
+vidcutter/vidcutter.*/
+*.BAK
+vidcutter/vidcutter
+vidcutter/vidcutter.exe
+.openshift
+vidcutter/bin/
+bin/
+.DS_Store
+_packaging/appimage/*/
+testing
+_build/pyinstaller/libmpv
+mpv-1.dll
+D3DCompiler_43.dll

.travis.yml

@@ -1,3 +1,24 @@
+#######################################################################
+#
+# VidCutter - a simple yet fast & accurate video cutter & joiner
+#
+# copyright © 2017 Pete Alexandrou
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#######################################################################
+
 sudo: required
 os: linux
 language: python

LICENSE

@@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

_build/InnoSetup/installer_x64.iss

@@ -7,33 +7,37 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{CCDC440A-CC57-4BED-8CDE-1DA285976A64}
 AppName=VidCutter
-AppVersion=2.6.5
+AppVersion=3.0.0
 AppVerName=VidCutter
 AppPublisher=Pete Alexandrou
 AppPublisherURL=http://vidcutter.ozmartians.com
 DefaultDirName={pf}\VidCutter
 DefaultGroupName=VidCutter
-OutputBaseFilename=VidCutter-2.6.5-setup-x64
+OutputBaseFilename=VidCutter-3.0.0-setup-x64
 SetupIconFile=C:\DEV\vidcutter\data\icons\vidcutter.ico
 UninstallDisplayIcon={app}\vidcutter.exe
 Compression=lzma2
 SolidCompression=yes
 ShowLanguageDialog=no
-VersionInfoVersion=2.6.5
+VersionInfoVersion=3.0.0
 VersionInfoCompany=ozmartians.com
-VersionInfoCopyright=© 2017 Pete Alexandrou
+VersionInfoCopyright=© 2017 Pete Alexandrou
 VersionInfoProductName=VidCutter x64
-VersionInfoProductVersion=2.6.5
+VersionInfoProductVersion=3.0.0
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
+WizardImageFile=C:\DEV\vidcutter\_build\InnoSetup\assets\WizModernImage.bmp
+WizardSmallImageFile=C:\DEV\vidcutter\_build\InnoSetup\assets\SmallWizardImage.bmp
+WizardImageBackColor=clPurple
+WizardImageStretch=False
 
 [InstallDelete]
 Type: filesandordirs; Name: "{app}"
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
-[Tasks]
+[Tasks] 
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
 
 [Files]

_build/InnoSetup/installer_x86.iss

@@ -7,23 +7,27 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{76D4D864-E70F-4923-8289-C2504A2A9E67}
 AppName=VidCutter
-AppVersion=2.6.5
+AppVersion=3.0.0
 AppVerName=VidCutter
 AppPublisher=Pete Alexandrou
 AppPublisherURL=http://vidcutter.ozmartians.com
 DefaultDirName={pf}\VidCutter
 DefaultGroupName=VidCutter
-OutputBaseFilename=VidCutter-2.6.5-setup-x86
+OutputBaseFilename=VidCutter-3.0.0-setup-x86
 SetupIconFile=C:\DEV\vidcutter\data\icons\vidcutter.ico
 UninstallDisplayIcon={app}\vidcutter.exe
 Compression=lzma2
 SolidCompression=yes
 ShowLanguageDialog=no
-VersionInfoVersion=2.6.5
+VersionInfoVersion=3.0.0
 VersionInfoCompany=ozmartians.com
-VersionInfoCopyright=© 2017 Pete Alexandrou
+VersionInfoCopyright=© 2017 Pete Alexandrou
 VersionInfoProductName=VidCutter x86
-VersionInfoProductVersion=2.6.5
+VersionInfoProductVersion=3.0.0
+WizardImageFile=C:\DEV\vidcutter\_build\InnoSetup\assets\WizModernImage.bmp
+WizardSmallImageFile=C:\DEV\vidcutter\_build\InnoSetup\assets\SmallWizardImage.bmp
+WizardImageBackColor=clPurple
+WizardImageStretch=False
 
 [InstallDelete]
 Type: filesandordirs; Name: "{app}"

_build/pyinstaller/build.pyinstaller.linux

@@ -23,23 +23,23 @@ BUILD_VERSION=$(python3 version.py)
 # --------[ cleanup scraps from previous builds
 
 rm -rf build dist
-rm ../../bin/*
+# rm ../../bin/*
 
 
 # --------[ download latest FFmpeg static binary
 
-mkdir ./temp &> /dev/null
-aria2c -d ./temp -x 6 ${FFMPEG}
+# mkdir ./temp &> /dev/null
+# aria2c -d ./temp -x 6 ${FFMPEG}
 
 
 # --------[ extract FFmpeg to designated bin folder under app root
 
-cd temp
-tar -Jxf ffmpeg-git-${ARCH}bit-static.tar.xz --strip-components=1 --wildcards ffmpeg-git-*-64bit-static/ffmpeg
-mkdir ../../../bin &> /dev/null
-mv ./ffmpeg ../../../bin/
-chmod +x ../../../bin/ffmpeg
-cd ..
+# cd temp
+# tar -Jxf ffmpeg-git-${ARCH}bit-static.tar.xz --strip-components=1 --wildcards ffmpeg-git-*-64bit-static/ffmpeg
+# mkdir ../../../bin &> /dev/null
+# mv ./ffmpeg ../../../bin/
+# chmod +x ../../../bin/ffmpeg
+# cd ..
 
 
 # --------[ run PyInstaller

_build/pyinstaller/build.pyinstaller.win.bat

@@ -11,33 +11,40 @@ if [%1]==[] (
 if ["%ARCH%"]==["64"] (
     SET BINARCH=x64
     SET FFMPEG=https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-latest-win64-static.7z
+    SET MEDIAINFO_URL=https://mediaarea.net/download/binary/mediainfo/0.7.92.1/MediaInfo_CLI_0.7.92.1_Windows_x64.zip
+    SET MEDIAINFO=MediaInfo_CLI_0.7.92.1_Windows_x64.zip
 )
 if ["%ARCH%"]==["32"] (
     SET BINARCH=x86
     SET FFMPEG=https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-latest-win32-static.7z
+    SET MEDIAINFO_URL=https://mediaarea.net/download/binary/mediainfo/0.7.92.1/MediaInfo_CLI_0.7.92.1_Windows_i386.zip
+    SET MEDIAINFO=MediaInfo_CLI_0.7.92.1_Windows_i386.zip
 )
 
 REM ......................get latest version number......................
 
-for /f "delims=" %%a in ('python3 version.py') do @set VERSION=%%a
+for /f "delims=" %%a in ('python version.py') do @set VERSION=%%a
 
 REM ......................cleanup previous build scraps......................
 
 rd /s /q build
 rd /s /q dist
-del /q ..\..\bin\ffmpeg.exe
+del /q ..\..\bin\*.*
 
 REM ......................download latest FFmpeg static binary......................
 
 if not exist ".\temp\" mkdir temp
 aria2c -d temp -x 6 %FFMPEG%
+aria2c -d temp -x 6 %MEDIAINFO_URL%
 
 REM ......................extract ffmpeg.exe to its expected location......................
 
 cd temp
 7z e ffmpeg-latest-win%ARCH%-static.7z ffmpeg-latest-win%ARCH%-static/bin/ffmpeg.exe
+unzip %MEDIAINFO% MediaInfo.exe
 if not exist "..\..\..\bin\" mkdir "..\..\..\bin\"
 move ffmpeg.exe ..\..\..\bin\
+move MediaInfo.exe ..\..\..\bin\
 cd ..
 
 REM ......................run pyinstaller......................

_build/pyinstaller/vidcutter.linux64.spec

@@ -6,25 +6,26 @@ from PyQt5.QtCore import QLibraryInfo
 
 block_cipher = None
 
-a = Analysis(['../../vidcutter.py'],
+a = Analysis(['../../vidcutter/__main__.py'],
              pathex=[
                  QLibraryInfo.location(QLibraryInfo.LibrariesPath),
                  QLibraryInfo.location(QLibraryInfo.PluginsPath),
                  '../..'
              ],
-             binaries=[
-                ('/usr/lib/x86_64-linux-gnu/mesa/libGL.so.1', '.')
-             ],
+             # binaries=[
+             #    ('/usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2.0', '.')
+             # ],
+             binaries=[],
              datas=[
-               ('../../__init__.py', '.'),
+               ('../../vidcutter/__init__.py', '.'),
                ('../../bin/ffmpeg', './bin'),
                ('../../LICENSE', '.'),
                ('../../README.md', '.')
              ],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],
-             excludes=[],
+             excludes=['*.dll'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher)

_build/pyinstaller/vidcutter.win32.spec

@@ -16,7 +16,10 @@ a = Analysis(['..\\..\\vidcutter\\__main__.py'],
              binaries=[],
              datas=[
                  ('..\\..\\vidcutter\\__init__.py', '.'),
-                 ('..\\..\\bin\\ffmpeg.exe', '.\\bin')
+                 ('..\\..\\bin\\ffmpeg.exe', '.\\bin'),
+                 ('..\\..\\bin\\MediaInfo.exe', '.\\bin'),                 
+                 ('libmpv\\32\\mpv-1.dll', '.'),
+                 # ('libmpv\\32\\D3DCompiler_43.dll', '.')
              ],
              hiddenimports=[],
              hookspath=[],
@@ -34,6 +37,6 @@ exe = EXE(pyz,
           a.datas,
           name='vidcutter',
           debug=False,
-          strip=False,
+          strip=True,
           upx=False,
           console=False , icon='..\\..\\data\\icons\\vidcutter.ico')

_build/pyinstaller/vidcutter.win64.spec

@@ -16,7 +16,10 @@ a = Analysis(['..\\..\\vidcutter\\__main__.py'],
              binaries=[],
              datas=[
                  ('..\\..\\vidcutter\\__init__.py', '.'),
-                 ('..\\..\\bin\\ffmpeg.exe', '.\\bin')
+                 ('..\\..\\bin\\ffmpeg.exe', '.\\bin'),
+                 ('..\\..\\bin\\MediaInfo.exe', '.\\bin'),
+                 ('libmpv\\64\\mpv-1.dll', '.'),
+                 ('libmpv\\64\\D3DCompiler_43.dll', '.')
              ],
              hiddenimports=[],
              hookspath=[],
@@ -34,6 +37,6 @@ exe = EXE(pyz,
           a.datas,
           name='vidcutter',
           debug=False,
-          strip=False,
+          strip=True,
           upx=False,
           console=False , icon='..\\..\\data\\icons\\vidcutter.ico')