Hello community, here is the log from the commit of package mediainfo for openSUSE:Factory checked in at 2017-09-12 19:55:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mediainfo (Old) and /work/SRC/openSUSE:Factory/.mediainfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mediainfo" Tue Sep 12 19:55:41 2017 rev:8 rq:523277 version:0.7.99 Changes: -------- --- /work/SRC/openSUSE:Factory/mediainfo/mediainfo.changes 2017-08-12 20:27:08.560531543 +0200 +++ /work/SRC/openSUSE:Factory/.mediainfo.new/mediainfo.changes 2017-09-12 19:56:02.437629566 +0200 @@ -1,0 +2,22 @@ +Mon Sep 11 15:07:47 UTC 2017 - aloi...@gmx.com + +- Update to version 0.7.99 + * EBUCore: JSON output + * EBUCore: add writingLibraryName and writingLibraryVersion + attributes + * Ad-ID identifier display on a single line ("Value + (Registry)" format) + * MPEG-4: Better display of format of VobSub tracks + * MPEG-4: CodecID is stsd name + ObjectTypeId for mp4a, mp4v, + mp4s + * AVC: preferred_transfer_characteristics support + * MPEG Video, MPEG-4 Visual, AVC, HEVC, MPEG-4, Matroska: + correct detection of RGB + * matrix_coefficients: detection of Y'D'zD'x and + Chromaticity-derived + * AAC: info about SBR/PS being implicit/explicit/NBC (Not + Backward Compatible) + * AAC: indicate audioObjectType in CodecID + * Fix a weird 1.334 DAR due to a rounding issue + +------------------------------------------------------------------- Old: ---- mediainfo_0.7.98.tar.xz New: ---- mediainfo_0.7.99.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mediainfo.spec ++++++ --- /var/tmp/diff_new_pack.Q4TJ3q/_old 2017-09-12 19:56:03.289509785 +0200 +++ /var/tmp/diff_new_pack.Q4TJ3q/_new 2017-09-12 19:56:03.293509223 +0200 @@ -18,7 +18,7 @@ Name: mediainfo -Version: 0.7.98 +Version: 0.7.99 Release: 0 Summary: Supplies technical and tag information about a video or audio file License: GPL-2.0+ ++++++ mediainfo_0.7.98.tar.xz -> mediainfo_0.7.99.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/History_CLI.txt new/MediaInfo/History_CLI.txt --- old/MediaInfo/History_CLI.txt 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/History_CLI.txt 2017-09-11 14:01:04.000000000 +0200 @@ -12,6 +12,20 @@ - Languages (other than english and French) : not all words are translated, I need translators! - Others? https://sourceforge.net/p/mediainfo/_list/tickets +Version 0.7.99, 2017-09-11 +-------------- ++ EBUCore: JSON output (--Output=EBUCore_1.8_JSON) ++ EBUCore: add writingLibraryName and writingLibraryVersion attributes ++ Ad-ID identifier display on a single line ("Value (Registry)" format) ++ MPEG-4: Better display of format of VobSub tracks ++ MPEG-4: CodecID is stsd name + ObjectTypeId for mp4a, mp4v, mp4s ++ AVC: preferred_transfer_characteristics support ++ MPEG Video, MPEG-4 Visual, AVC, HEVC, MPEG-4, Matroska: correct detection of RGB ++ matrix_coefficients: detection of Y'D'zD'x and Chromaticity-derived ++ AAC: info about SBR/PS being implicit/explicit/NBC (Not Backward Compatible) ++ AAC: indicate audioObjectType in CodecID +x Fix a weird 1.334 DAR due to a rounding issue + Version 0.7.98, 2017-08-08 -------------- + Matroska: handling of files with Tracks element after Cluster elements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/History_GUI.txt new/MediaInfo/History_GUI.txt --- old/MediaInfo/History_GUI.txt 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/History_GUI.txt 2017-09-11 14:01:04.000000000 +0200 @@ -12,6 +12,20 @@ - Languages (other than english and French) : not all words are translated, I need translators! - Others? https://sourceforge.net/p/mediainfo/_list/tickets +Version 0.7.99, 2017-09-11 +-------------- ++ EBUCore: JSON output ++ EBUCore: add writingLibraryName and writingLibraryVersion attributes ++ Ad-ID identifier display on a single line ("Value (Registry)" format) ++ MPEG-4: Better display of format of VobSub tracks ++ MPEG-4: CodecID is stsd name + ObjectTypeId for mp4a, mp4v, mp4s ++ AVC: preferred_transfer_characteristics support ++ MPEG Video, MPEG-4 Visual, AVC, HEVC, MPEG-4, Matroska: correct detection of RGB ++ matrix_coefficients: detection of Y'D'zD'x and Chromaticity-derived ++ AAC: info about SBR/PS being implicit/explicit/NBC (Not Backward Compatible) ++ AAC: indicate audioObjectType in CodecID +x Fix a weird 1.334 DAR due to a rounding issue + Version 0.7.98, 2017-08-08 -------------- + Matroska: handling of files with Tracks element after Cluster elements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/AppImage/Recipe.sh new/MediaInfo/Project/AppImage/Recipe.sh --- old/MediaInfo/Project/AppImage/Recipe.sh 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/AppImage/Recipe.sh 2017-09-11 14:01:07.000000000 +0200 @@ -47,7 +47,7 @@ fi # Setup evironment -VERSION=0.7.98 +VERSION=0.7.99 if [ "$(arch)" == "i386" ] ; then ARCH="i686" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/BCB/GUI/MediaInfo_GUI.cbproj new/MediaInfo/Project/BCB/GUI/MediaInfo_GUI.cbproj --- old/MediaInfo/Project/BCB/GUI/MediaInfo_GUI.cbproj 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/BCB/GUI/MediaInfo_GUI.cbproj 2017-09-11 14:01:07.000000000 +0200 @@ -42,11 +42,11 @@ </PropertyGroup> <PropertyGroup Condition="'$(Base)'!=''"> <Defines>MEDIAINFO_DLL_STATIC;$(Defines)</Defines> - <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=0.7.98.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=;Comments=</VerInfo_Keys> + <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=0.7.99.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=;Comments=</VerInfo_Keys> <Manifest_File>None</Manifest_File> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_MinorVer>7</VerInfo_MinorVer> - <VerInfo_Release>98</VerInfo_Release> + <VerInfo_Release>99</VerInfo_Release> <VerInfo_MajorVer>0</VerInfo_MajorVer> <VerInfo_Locale>1033</VerInfo_Locale> <PackageImports>IPIndyImpl;bindcompfmx;fmx;rtl;dbrtl;IndySystem;DbxClientDriver;bindcomp;inetdb;DBXInterBaseDriver;DataSnapCommon;DataSnapClient;DataSnapServer;DataSnapProviderClient;xmlrtl;DbxCommonDriver;IndyProtocols;DBXMySQLDriver;dbxcds;bindengine;soaprtl;DBXOracleDriver;dsnap;DBXInformixDriver;IndyCore;fmxase;DBXFirebirdDriver;inet;fmxobj;inetdbxpress;DBXSybaseASADriver;fmxdae;dbexpress;DataSnapIndy10ServerTransport;$(PackageImports)</PackageImports> @@ -102,9 +102,9 @@ <TASM_Debugging>None</TASM_Debugging> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> - <VerInfo_Release>98</VerInfo_Release> + <VerInfo_Release>99</VerInfo_Release> <LinkPackageStatics>rtl.lib;vcl.lib;bcbie.lib</LinkPackageStatics> - <VerInfo_Keys>CompanyName=MediaArea.net;FileDescription=MediaInfo;FileVersion=0.7.98.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=MediaInfo;ProductVersion=0.7.98.0;Comments=</VerInfo_Keys> + <VerInfo_Keys>CompanyName=MediaArea.net;FileDescription=MediaInfo;FileVersion=0.7.99.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=MediaInfo;ProductVersion=0.7.99.0;Comments=</VerInfo_Keys> <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> </PropertyGroup> <ItemGroup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/GNU/CLI/configure.ac new/MediaInfo/Project/GNU/CLI/configure.ac --- old/MediaInfo/Project/GNU/CLI/configure.ac 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/GNU/CLI/configure.ac 2017-09-11 14:01:07.000000000 +0200 @@ -5,7 +5,7 @@ dnl ------------------------------------------------------------------------- dnl Name and version dnl -AC_INIT([mediainfo], [0.7.98]) +AC_INIT([mediainfo], [0.7.99]) dnl ------------------------------------------------------------------------- dnl Test if we are at the good place diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/GNU/GUI/configure.ac new/MediaInfo/Project/GNU/GUI/configure.ac --- old/MediaInfo/Project/GNU/GUI/configure.ac 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/GNU/GUI/configure.ac 2017-09-11 14:01:07.000000000 +0200 @@ -5,7 +5,7 @@ dnl ------------------------------------------------------------------------- dnl Name and version dnl -AC_INIT([mediainfo-gui], [0.7.98]) +AC_INIT([mediainfo-gui], [0.7.99]) dnl ------------------------------------------------------------------------- dnl Test if we are at the good place diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/GNU/PKGBUILD new/MediaInfo/Project/GNU/PKGBUILD --- old/MediaInfo/Project/GNU/PKGBUILD 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/GNU/PKGBUILD 2017-09-11 14:01:07.000000000 +0200 @@ -3,7 +3,7 @@ # Contributor: hydro <hy...@freenet.de> pkgname=('mediainfo' 'mediainfo-gui') -pkgver=0.7.98 +pkgver=0.7.99 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" url="http://mediaarea.net" @@ -12,7 +12,7 @@ md5sums=('00000000000000000000000000000000') arch=('i686' 'x86_64') -depends=('libzen>=0.4.36' 'libmediainfo>=0.7.98' 'wxgtk' 'libsm' 'desktop-file-utils') +depends=('libzen>=0.4.37' 'libmediainfo>=0.7.99' 'wxgtk' 'libsm' 'desktop-file-utils') prepare() { cd "${srcdir}"/MediaInfo/Project/GNU/CLI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/GNU/mediainfo.dsc new/MediaInfo/Project/GNU/mediainfo.dsc --- old/MediaInfo/Project/GNU/mediainfo.dsc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/GNU/mediainfo.dsc 2017-09-11 14:01:07.000000000 +0200 @@ -2,22 +2,22 @@ Source: mediainfo Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg Architecture: any -Version: 0.7.98-1 +Version: 0.7.99-1 Maintainer: MediaArea.net SARL <i...@mediaarea.net> Homepage: http://MediaArea.net/MediaInfo Standards-Version: 3.9.6 Vcs-Browser: https://github.com/MediaArea/MediaInfo Vcs-Git: https://github.com/MediaArea/MediaInfo.git -Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 0.7.98), libzen-dev (>= 0.4.36), libwxgtk3.0-dev, zlib1g-dev, pkg-config +Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 0.7.99), libzen-dev (>= 0.4.37), libwxgtk3.0-dev, zlib1g-dev, pkg-config Package-List: mediainfo deb utils optional arch=any mediainfo-gui deb utils optional arch=any Checksums-Sha1: - 0000000000000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 0000000000000000000000000000000000000000 000000 mediainfo_0.7.98-1.debian.tar.xz + 0000000000000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 0000000000000000000000000000000000000000 000000 mediainfo_0.7.99-1.debian.tar.xz Checksums-Sha256: - 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.98-1.debian.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.99-1.debian.tar.xz Files: - 00000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 00000000000000000000000000000000 000000 mediainfo_0.7.98-1.debian.tar.xz + 00000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 00000000000000000000000000000000 000000 mediainfo_0.7.99-1.debian.tar.xz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/GNU/mediainfo.spec new/MediaInfo/Project/GNU/mediainfo.spec --- old/MediaInfo/Project/GNU/mediainfo.spec 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/GNU/mediainfo.spec 2017-09-11 14:01:07.000000000 +0200 @@ -1,6 +1,6 @@ -%define mediainfo_version 0.7.98 -%define libmediainfo_version 0.7.98 -%define libzen_version 0.4.36 +%define mediainfo_version 0.7.99 +%define libmediainfo_version 0.7.99 +%define libzen_version 0.4.37 %if 0%{?fedora_version} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600 %define libmediainfo_name libmediainfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/MSVC2013/CLI/MediaInfo_CLI.rc new/MediaInfo/Project/MSVC2013/CLI/MediaInfo_CLI.rc --- old/MediaInfo/Project/MSVC2013/CLI/MediaInfo_CLI.rc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/MSVC2013/CLI/MediaInfo_CLI.rc 2017-09-11 14:01:07.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,98,0 - PRODUCTVERSION 0,7,98,0 + FILEVERSION 0,7,99,0 + PRODUCTVERSION 0,7,99,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "MediaInfo" - VALUE "FileVersion", "0.7.98.0" + VALUE "FileVersion", "0.7.99.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "0.7.98.0" + VALUE "ProductVersion", "0.7.99.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/MSVC2013/GUI/MediaInfo_GUI.rc new/MediaInfo/Project/MSVC2013/GUI/MediaInfo_GUI.rc --- old/MediaInfo/Project/MSVC2013/GUI/MediaInfo_GUI.rc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/MSVC2013/GUI/MediaInfo_GUI.rc 2017-09-11 14:01:07.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,98,0 - PRODUCTVERSION 0,7,98,0 + FILEVERSION 0,7,99,0 + PRODUCTVERSION 0,7,99,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "MediaInfo" - VALUE "FileVersion", "0.7.98.0" + VALUE "FileVersion", "0.7.99.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "0.7.98.0" + VALUE "ProductVersion", "0.7.99.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/MSVC2015/CLI/MediaInfo_CLI.rc new/MediaInfo/Project/MSVC2015/CLI/MediaInfo_CLI.rc --- old/MediaInfo/Project/MSVC2015/CLI/MediaInfo_CLI.rc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/MSVC2015/CLI/MediaInfo_CLI.rc 2017-09-11 14:01:07.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,98,0 - PRODUCTVERSION 0,7,98,0 + FILEVERSION 0,7,99,0 + PRODUCTVERSION 0,7,99,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "MediaInfo" - VALUE "FileVersion", "0.7.98.0" + VALUE "FileVersion", "0.7.99.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "0.7.98.0" + VALUE "ProductVersion", "0.7.99.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/MSVC2015/GUI/MediaInfo_GUI.rc new/MediaInfo/Project/MSVC2015/GUI/MediaInfo_GUI.rc --- old/MediaInfo/Project/MSVC2015/GUI/MediaInfo_GUI.rc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/MSVC2015/GUI/MediaInfo_GUI.rc 2017-09-11 14:01:07.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,98,0 - PRODUCTVERSION 0,7,98,0 + FILEVERSION 0,7,99,0 + PRODUCTVERSION 0,7,99,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "MediaInfo" - VALUE "FileVersion", "0.7.98.0" + VALUE "FileVersion", "0.7.99.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "0.7.98.0" + VALUE "ProductVersion", "0.7.99.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/MSVC2017/CLI/MediaInfo_CLI.rc new/MediaInfo/Project/MSVC2017/CLI/MediaInfo_CLI.rc --- old/MediaInfo/Project/MSVC2017/CLI/MediaInfo_CLI.rc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/MSVC2017/CLI/MediaInfo_CLI.rc 2017-09-11 14:01:07.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,98,0 - PRODUCTVERSION 0,7,98,0 + FILEVERSION 0,7,99,0 + PRODUCTVERSION 0,7,99,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "MediaInfo" - VALUE "FileVersion", "0.7.98.0" + VALUE "FileVersion", "0.7.99.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "0.7.98.0" + VALUE "ProductVersion", "0.7.99.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/MSVC2017/GUI/MediaInfo_GUI.rc new/MediaInfo/Project/MSVC2017/GUI/MediaInfo_GUI.rc --- old/MediaInfo/Project/MSVC2017/GUI/MediaInfo_GUI.rc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/MSVC2017/GUI/MediaInfo_GUI.rc 2017-09-11 14:01:07.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,98,0 - PRODUCTVERSION 0,7,98,0 + FILEVERSION 0,7,99,0 + PRODUCTVERSION 0,7,99,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "MediaInfo" - VALUE "FileVersion", "0.7.98.0" + VALUE "FileVersion", "0.7.99.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "0.7.98.0" + VALUE "ProductVersion", "0.7.99.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb6.debian/changelog new/MediaInfo/Project/OBS/deb6.debian/changelog --- old/MediaInfo/Project/OBS/deb6.debian/changelog 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb6.debian/changelog 2017-09-11 14:01:07.000000000 +0200 @@ -1,4 +1,4 @@ -mediainfo (0.7.98) unstable; urgency=low +mediainfo (0.7.99) unstable; urgency=low * See History.txt for more info and real dates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb6.debian/control new/MediaInfo/Project/OBS/deb6.debian/control --- old/MediaInfo/Project/OBS/deb6.debian/control 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb6.debian/control 2017-09-11 14:01:04.000000000 +0200 @@ -1,7 +1,7 @@ Source: mediainfo Priority: optional Maintainer: MediaArea.net SARL <i...@mediaarea.net> -Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 0.7.98), libzen-dev (>= 0.4.36), libwxgtk2.8-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool +Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 0.7.99), libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool Standards-Version: 3.7.3 Section: libs Homepage: http://MediaArea.net/MediaInfo @@ -11,7 +11,7 @@ Package: mediainfo Section: utils Architecture: any -Depends: libmediainfo0 (>= 0.7.98), libzen0 (>= 0.4.36), zlib1g +Depends: libmediainfo0 (>= 0.7.99), libzen0 (>= 0.4.37), zlib1g Description: MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. . @@ -41,7 +41,7 @@ Package: mediainfo-gui Section: utils Architecture: any -Depends: libmediainfo0 (>= 0.7.98), libzen0 (>= 0.4.36), libwxgtk2.8-0, zlib1g +Depends: libmediainfo0 (>= 0.7.99), libzen0 (>= 0.4.37), libwxgtk2.8-0, zlib1g Description: MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb6.dsc new/MediaInfo/Project/OBS/deb6.dsc --- old/MediaInfo/Project/OBS/deb6.dsc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb6.dsc 2017-09-11 14:01:07.000000000 +0200 @@ -2,10 +2,10 @@ Source: mediainfo Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg Architecture: any -Version: 0.7.98-1deb6 +Version: 0.7.99-1deb6 Maintainer: MediaArea.net SARL <i...@mediaarea.net> Homepage: http://MediaArea.net/MediaInfo Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 0.7.98), libzen-dev (>= 0.4.36), libwxgtk2.8-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool +Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 0.7.99), libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool Files: - 00000000000000000000000000000000 000000 mediainfo_0.7.98-1deb6.tar.gz + 00000000000000000000000000000000 000000 mediainfo_0.7.99-1deb6.tar.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb7.debian/changelog new/MediaInfo/Project/OBS/deb7.debian/changelog --- old/MediaInfo/Project/OBS/deb7.debian/changelog 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb7.debian/changelog 2017-09-11 14:01:07.000000000 +0200 @@ -1,6 +1,6 @@ -mediainfo (0.7.98-1) experimental; urgency=medium +mediainfo (0.7.99-1) experimental; urgency=medium - * Upstream version 0.7.98 + * Upstream version 0.7.99 For details, see https://github.com/MediaArea/MediaInfo/blob/master/History_GUI.txt -- MediaArea <i...@mediaarea.net> Mon, 02 Nov 2015 10:30:00 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb7.debian/control new/MediaInfo/Project/OBS/deb7.debian/control --- old/MediaInfo/Project/OBS/deb7.debian/control 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb7.debian/control 2017-09-11 14:01:04.000000000 +0200 @@ -4,8 +4,8 @@ Maintainer: MediaArea.net SARL <i...@mediaarea.net> Build-Depends: debhelper (>= 9), dh-autoreconf, - libmediainfo-dev (>= 0.7.98), - libzen-dev (>= 0.4.36), + libmediainfo-dev (>= 0.7.99), + libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config, @@ -16,7 +16,7 @@ Package: mediainfo Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.98), libzen0 (>= 0.4.36) +Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.99), libzen0 (>= 0.4.37) Description: command-line utility for reading information from audio/video files MediaInfo is a utility used for retrieving technical information and other metadata about audio or video files. @@ -41,7 +41,7 @@ Package: mediainfo-gui Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.98), libzen0 (>= 0.4.36) +Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.99), libzen0 (>= 0.4.37) Description: graphical utility for reading information from audio/video files MediaInfo is a utility used for retrieving technical information and other metadata about audio or video files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb7.dsc new/MediaInfo/Project/OBS/deb7.dsc --- old/MediaInfo/Project/OBS/deb7.dsc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb7.dsc 2017-09-11 14:01:07.000000000 +0200 @@ -2,22 +2,22 @@ Source: mediainfo Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg Architecture: any -Version: 0.7.98-1deb7 +Version: 0.7.99-1deb7 Maintainer: MediaArea.net SARL <i...@mediaarea.net> Homepage: http://MediaArea.net/MediaInfo Standards-Version: 3.9.6 Vcs-Browser: https://github.com/MediaArea/MediaInfo Vcs-Git: https://github.com/MediaArea/MediaInfo.git -Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 0.7.98), libzen-dev (>= 0.4.36), libwxgtk2.8-dev, zlib1g-dev, pkg-config +Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 0.7.99), libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config Package-List: mediainfo deb utils optional arch=any mediainfo-gui deb utils optional arch=any Checksums-Sha1: - 0000000000000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 0000000000000000000000000000000000000000 000000 mediainfo_0.7.98-1deb7.debian.tar.xz + 0000000000000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 0000000000000000000000000000000000000000 000000 mediainfo_0.7.99-1deb7.debian.tar.xz Checksums-Sha256: - 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.98-1deb7.debian.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.99-1deb7.debian.tar.xz Files: - 00000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 00000000000000000000000000000000 000000 mediainfo_0.7.98-1deb7.debian.tar.xz + 00000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 00000000000000000000000000000000 000000 mediainfo_0.7.99-1deb7.debian.tar.xz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb9.debian/changelog new/MediaInfo/Project/OBS/deb9.debian/changelog --- old/MediaInfo/Project/OBS/deb9.debian/changelog 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb9.debian/changelog 2017-09-11 14:01:07.000000000 +0200 @@ -1,6 +1,6 @@ -mediainfo (0.7.98-1) experimental; urgency=medium +mediainfo (0.7.99-1) experimental; urgency=medium - * Upstream version 0.7.98 + * Upstream version 0.7.99 For details, see https://github.com/MediaArea/MediaInfo/blob/master/History_GUI.txt -- MediaArea <i...@mediaarea.net> Mon, 02 Nov 2015 10:30:00 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb9.debian/control new/MediaInfo/Project/OBS/deb9.debian/control --- old/MediaInfo/Project/OBS/deb9.debian/control 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb9.debian/control 2017-09-11 14:01:04.000000000 +0200 @@ -4,8 +4,8 @@ Maintainer: MediaArea.net SARL <i...@mediaarea.net> Build-Depends: debhelper (>= 9), dh-autoreconf, - libmediainfo-dev (>= 0.7.98), - libzen-dev (>= 0.4.36), + libmediainfo-dev (>= 0.7.99), + libzen-dev (>= 0.4.37), libwxgtk3.0-dev, adwaita-icon-theme, zlib1g-dev, @@ -17,7 +17,7 @@ Package: mediainfo Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 0.7.98), libzen0v5 (>= 0.4.36) +Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 0.7.99), libzen0v5 (>= 0.4.37) Description: command-line utility for reading information from audio/video files MediaInfo is a utility used for retrieving technical information and other metadata about audio or video files. @@ -42,7 +42,7 @@ Package: mediainfo-gui Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 0.7.98), libzen0v5 (>= 0.4.36) +Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 0.7.99), libzen0v5 (>= 0.4.37) Description: graphical utility for reading information from audio/video files MediaInfo is a utility used for retrieving technical information and other metadata about audio or video files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/deb9.dsc new/MediaInfo/Project/OBS/deb9.dsc --- old/MediaInfo/Project/OBS/deb9.dsc 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/OBS/deb9.dsc 2017-09-11 14:01:07.000000000 +0200 @@ -2,22 +2,22 @@ Source: mediainfo Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg Architecture: any -Version: 0.7.98-1deb9 +Version: 0.7.99-1deb9 Maintainer: MediaArea.net SARL <i...@mediaarea.net> Homepage: http://MediaArea.net/MediaInfo Standards-Version: 3.9.6 Vcs-Browser: https://github.com/MediaArea/MediaInfoLib Vcs-Git: https://github.com/MediaArea/MediaInfoLib.git -Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 0.7.98), libzen-dev (>= 0.4.36), libwxgtk3.0-dev, adwaita-icon-theme, zlib1g-dev, pkg-config +Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 0.7.99), libzen-dev (>= 0.4.37), libwxgtk3.0-dev, adwaita-icon-theme, zlib1g-dev, pkg-config Package-List: mediainfo deb utils optional arch=any mediainfo-gui deb utils optional arch=any Checksums-Sha1: - 0000000000000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 0000000000000000000000000000000000000000 000000 mediainfo_0.7.98-1deb9.debian.tar.xz + 0000000000000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 0000000000000000000000000000000000000000 000000 mediainfo_0.7.99-1deb9.debian.tar.xz Checksums-Sha256: - 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.98-1deb9.debian.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_0.7.99-1deb9.debian.tar.xz Files: - 00000000000000000000000000000000 000000 mediainfo_0.7.98.orig.tar.xz - 00000000000000000000000000000000 000000 mediainfo_0.7.98-1deb9.debian.tar.xz + 00000000000000000000000000000000 000000 mediainfo_0.7.99.orig.tar.xz + 00000000000000000000000000000000 000000 mediainfo_0.7.99-1deb9.debian.tar.xz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/OBS/obs_mediainfo new/MediaInfo/Project/OBS/obs_mediainfo --- old/MediaInfo/Project/OBS/obs_mediainfo 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/OBS/obs_mediainfo 2017-09-11 14:01:07.000000000 +0200 @@ -180,8 +180,8 @@ } -mediainfov="0.7.98" -libmediainfov="0.7.98" +mediainfov="0.7.99" +libmediainfov="0.7.99" libzenv="0.4.32" destversion="1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/Snap/mediainfo/snapcraft.yaml new/MediaInfo/Project/Snap/mediainfo/snapcraft.yaml --- old/MediaInfo/Project/Snap/mediainfo/snapcraft.yaml 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/Snap/mediainfo/snapcraft.yaml 2017-09-11 14:01:07.000000000 +0200 @@ -1,5 +1,5 @@ name: mediainfo -version: 0.7.98 +version: 0.7.99 summary: Command-line utility for reading information from audio/video files description: | MediaInfo is a utility used for retrieving technical information and other diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/Snap/mediainfo-gui/snapcraft.yaml new/MediaInfo/Project/Snap/mediainfo-gui/snapcraft.yaml --- old/MediaInfo/Project/Snap/mediainfo-gui/snapcraft.yaml 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/Snap/mediainfo-gui/snapcraft.yaml 2017-09-11 14:01:07.000000000 +0200 @@ -1,5 +1,5 @@ name: mediainfo-gui -version: 0.7.98 +version: 0.7.99 summary: Graphical utility for reading information from audio/video files description: | MediaInfo is a utility used for retrieving technical information and other diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/Solaris/mkpkg new/MediaInfo/Project/Solaris/mkpkg --- old/MediaInfo/Project/Solaris/mkpkg 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/Solaris/mkpkg 2017-09-11 14:01:07.000000000 +0200 @@ -9,7 +9,7 @@ #Creation of known directories and filenames name="mediainfo" -version="0.7.98" +version="0.7.99" Home=`pwd` install_prefix=${Home}/mk_package packagecreation_prefix=${Home}/create_package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Project/version.txt new/MediaInfo/Project/version.txt --- old/MediaInfo/Project/version.txt 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Project/version.txt 2017-09-11 14:01:07.000000000 +0200 @@ -1 +1 @@ -0.7.98 +0.7.99 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/Common/Core.cpp new/MediaInfo/Source/Common/Core.cpp --- old/MediaInfo/Source/Common/Core.cpp 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/Common/Core.cpp 2017-09-11 14:01:05.000000000 +0200 @@ -275,6 +275,20 @@ } //--------------------------------------------------------------------------- +void Core::Menu_View_EBUCore_1_8_ps_json() +{ + MI->Option(__T("Inform"), __T("EBUCore_1.8_parameterSegment_JSON")); + Kind=Kind_EBUCore_1_8_ps_json; +} + +//--------------------------------------------------------------------------- +void Core::Menu_View_EBUCore_1_8_sp_json() +{ + MI->Option(__T("Inform"), __T("EBUCore_1.8_segmentParameter_JSON")); + Kind=Kind_EBUCore_1_8_sp_json; +} + +//--------------------------------------------------------------------------- void Core::Menu_View_FIMS_1_1 () { MI->Option(__T("Inform"), __T("FIMS_1.1")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/Common/Core.h new/MediaInfo/Source/Common/Core.h --- old/MediaInfo/Source/Common/Core.h 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/Common/Core.h 2017-09-11 14:01:05.000000000 +0200 @@ -58,6 +58,8 @@ void Menu_View_EBUCore_1_6 (); void Menu_View_EBUCore_1_8_ps (); void Menu_View_EBUCore_1_8_sp (); + void Menu_View_EBUCore_1_8_ps_json (); + void Menu_View_EBUCore_1_8_sp_json (); void Menu_View_FIMS_1_1 (); void Menu_View_FIMS_1_2 (); void Menu_View_FIMS_1_3 (); @@ -76,7 +78,7 @@ //Datas MediaInfoNameSpace::String &Inform_Get(); - enum kind {Kind_Easy, Kind_Sheet, Kind_Tree, Kind_HTML, Kind_Text, Kind_XML, Kind_PBCore, Kind_PBCore2, Kind_reVTMD, Kind_MPEG7, Kind_EBUCore_1_5, Kind_EBUCore_1_6, Kind_EBUCore_1_8_ps, Kind_EBUCore_1_8_sp, Kind_FIMS_1_1, Kind_FIMS_1_2, Kind_FIMS_1_3}; + enum kind {Kind_Easy, Kind_Sheet, Kind_Tree, Kind_HTML, Kind_Text, Kind_XML, Kind_PBCore, Kind_PBCore2, Kind_reVTMD, Kind_MPEG7, Kind_EBUCore_1_5, Kind_EBUCore_1_6, Kind_EBUCore_1_8_ps, Kind_EBUCore_1_8_sp, Kind_EBUCore_1_8_ps_json, Kind_EBUCore_1_8_sp_json, Kind_FIMS_1_1, Kind_FIMS_1_2, Kind_FIMS_1_3}; kind Kind_Get(); MediaInfoNameSpace::String Inform_Get (size_t Pos, stream_t StreamKind, size_t StreamPos); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/Common/Preferences.h new/MediaInfo/Source/Common/Preferences.h --- old/MediaInfo/Source/Common/Preferences.h 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Source/Common/Preferences.h 2017-09-11 14:01:07.000000000 +0200 @@ -32,7 +32,7 @@ //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -#define MediaInfo_Version_GUI __T("0.7.98") +#define MediaInfo_Version_GUI __T("0.7.99") //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/Cocoa/English.lproj/MainMenu.xib new/MediaInfo/Source/GUI/Cocoa/English.lproj/MainMenu.xib --- old/MediaInfo/Source/GUI/Cocoa/English.lproj/MainMenu.xib 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/Cocoa/English.lproj/MainMenu.xib 2017-09-11 14:01:05.000000000 +0200 @@ -665,6 +665,18 @@ <action selector="selectViewEBUCore18_sp:" target="-1" id="amA-yM-coB"/> </connections> </menuItem> + <menuItem title="EBUCore 1.8 (acq. metadata: parameter then segment, json output)" id="8kx-Pp-fre"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="selectViewEBUCore18_ps_json:" target="-1" id="b8y-0p-bUh"/> + </connections> + </menuItem> + <menuItem title="EBUCore 1.8 (acq. metadata: segment then parameter, json output)" id="bcv-hr-Gra"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="selectViewEBUCore18_sp_json:" target="-1" id="ObA-WH-zoo"/> + </connections> + </menuItem> <menuItem title="FIMS 1.1" id="Spf-9d-cwU"> <modifierMask key="keyEquivalentModifierMask"/> <connections> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/Cocoa/English.lproj/MyWindow.xib new/MediaInfo/Source/GUI/Cocoa/English.lproj/MyWindow.xib --- old/MediaInfo/Source/GUI/Cocoa/English.lproj/MyWindow.xib 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/Cocoa/English.lproj/MyWindow.xib 2017-09-11 14:01:05.000000000 +0200 @@ -435,6 +435,18 @@ <action selector="selectViewEBUCore18_sp:" target="-1" id="mdj-k9-lHC"/> </connections> </menuItem> + <menuItem title="EBUCore 1.8 (acq. metadata: parameter then segment, json output)" id="Hh4-Yy-Jh"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="selectViewEBUCore18_ps_json:" target="-1" id="SMd-l2-Go0"/> + </connections> + </menuItem> + <menuItem title="EBUCore 1.8 (acq. metadata: segment then parameter, json output)" id="vXW-mS-lp0"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="selectViewEBUCore18_sp_json:" target="-1" id="g0n-xH-l8c"/> + </connections> + </menuItem> <menuItem title="FIMS 1.1" id="Wwc-YI-tNy"> <modifierMask key="keyEquivalentModifierMask"/> <connections> @@ -491,10 +503,12 @@ <menuItem title="EBUCore 1.6" tag="5" id="TZc-xn-Gdh"/> <menuItem title="EBUCore 1.8 (acq. metadata: parameter then segment)" tag="6" id="FYI-Th-BU1"/> <menuItem title="EBUCore 1.8 (acq. metadata: segment then parameter)" tag="7" id="fNe-yJ-2vy"/> - <menuItem title="FIMS 1.1" tag="8" id="nMZ-Jy-aQJ"/> - <menuItem title="FIMS 1.2" tag="9" id="Dun-Cc-kMM"/> - <menuItem title="FIMS 1.3" tag="10" id="XHo-fC-op4"/> - <menuItem title="reVTMD" tag="11" id="O4d-KN-zYb"/> + <menuItem title="EBUCore 1.8 (acq. metadata: parameter then segment, json output)" tag="8" id="lLP-Iz-Bst"/> + <menuItem title="EBUCore 1.8 (acq. metadata: segment then parameter, json output)" tag="9" id="Y2Z-ry-I2z"/> + <menuItem title="FIMS 1.1" tag="10" id="nMZ-Jy-aQJ"/> + <menuItem title="FIMS 1.2" tag="11" id="Dun-Cc-kMM"/> + <menuItem title="FIMS 1.3" tag="12" id="XHo-fC-op4"/> + <menuItem title="reVTMD" tag="13" id="O4d-KN-zYb"/> </items> </menu> </popUpButtonCell> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/Cocoa/MediaInfo-Info.plist new/MediaInfo/Source/GUI/Cocoa/MediaInfo-Info.plist --- old/MediaInfo/Source/GUI/Cocoa/MediaInfo-Info.plist 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Source/GUI/Cocoa/MediaInfo-Info.plist 2017-09-11 14:01:07.000000000 +0200 @@ -203,7 +203,7 @@ <key>CFBundleShortVersionString</key> <string>${APP_VERSION}</string> <key>CFBundleVersion</key> - <string>1.0.15</string> + <string>1.0.19</string> <key>DTCompiler</key> <string></string> <key>DTPlatformBuild</key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/Cocoa/MediaInfo.xcodeproj/project.pbxproj new/MediaInfo/Source/GUI/Cocoa/MediaInfo.xcodeproj/project.pbxproj --- old/MediaInfo/Source/GUI/Cocoa/MediaInfo.xcodeproj/project.pbxproj 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Source/GUI/Cocoa/MediaInfo.xcodeproj/project.pbxproj 2017-09-11 14:01:07.000000000 +0200 @@ -708,7 +708,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - APP_VERSION = 0.7.98; + APP_VERSION = 0.7.990; CODE_SIGN_ENTITLEMENTS = MediaInfo.entitlements; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; @@ -734,7 +734,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - APP_VERSION = 0.7.98; + APP_VERSION = 0.7.990; CODE_SIGN_ENTITLEMENTS = MediaInfo.entitlements; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/Cocoa/MyWindowController.h new/MediaInfo/Source/GUI/Cocoa/MyWindowController.h --- old/MediaInfo/Source/GUI/Cocoa/MyWindowController.h 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/Cocoa/MyWindowController.h 2017-09-11 14:01:05.000000000 +0200 @@ -10,7 +10,7 @@ #import "oMediaInfoList.h" #import "HyperlinkButton.h" -typedef enum { Kind_Text, Kind_XML, Kind_PBCore, Kind_PBCore2, Kind_reVTMD, Kind_MPEG7, Kind_EBUCore_1_5, Kind_EBUCore_1_6, Kind_EBUCore_1_8_ps, Kind_EBUCore_1_8_sp, Kind_FIMS_1_1, Kind_FIMS_1_2, Kind_FIMS_1_3} ViewMenu_Kind; +typedef enum { Kind_Text, Kind_XML, Kind_PBCore, Kind_PBCore2, Kind_reVTMD, Kind_MPEG7, Kind_EBUCore_1_5, Kind_EBUCore_1_6, Kind_EBUCore_1_8_ps, Kind_EBUCore_1_8_sp, Kind_EBUCore_1_8_ps_json, Kind_EBUCore_1_8_sp_json, Kind_FIMS_1_1, Kind_FIMS_1_2, Kind_FIMS_1_3} ViewMenu_Kind; @interface MyWindowController : NSWindowController { @@ -53,6 +53,8 @@ -(IBAction)selectViewEBUCore16:(id)sender; -(IBAction)selectViewEBUCore18_ps:(id)sender; -(IBAction)selectViewEBUCore18_sp:(id)sender; +-(IBAction)selectViewEBUCore18_ps_json:(id)sender; +-(IBAction)selectViewEBUCore18_sp_json:(id)sender; -(IBAction)selectViewFIMS11:(id)sender; -(IBAction)selectViewFIMS12:(id)sender; -(IBAction)selectViewFIMS13:(id)sender; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/Cocoa/MyWindowController.m new/MediaInfo/Source/GUI/Cocoa/MyWindowController.m --- old/MediaInfo/Source/GUI/Cocoa/MyWindowController.m 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/Cocoa/MyWindowController.m 2017-09-11 14:01:05.000000000 +0200 @@ -27,6 +27,8 @@ case Kind_EBUCore_1_6: _ret = @"EBUCore_1.6"; break; case Kind_EBUCore_1_8_ps: _ret = @"EBUCore_1.8_ps"; break; case Kind_EBUCore_1_8_sp: _ret = @"EBUCore_1.8_sp"; break; + case Kind_EBUCore_1_8_ps_json: _ret = @"EBUCore_1.8_ps_JSON"; break; + case Kind_EBUCore_1_8_sp_json: _ret = @"EBUCore_1.8_sp_JSON"; break; case Kind_FIMS_1_1: _ret = @"FIMS_1.1"; break; case Kind_FIMS_1_2: _ret = @"FIMS_1.2"; break; case Kind_FIMS_1_3: _ret = @"FIMS_1.3"; break; @@ -152,6 +154,16 @@ [self _selectViewOFKind:Kind_EBUCore_1_8_sp]; } +-(IBAction)selectViewEBUCore18_ps_json:(id)sender +{ + [self _selectViewOFKind:Kind_EBUCore_1_8_ps_json]; +} + +-(IBAction)selectViewEBUCore18_sp_json:(id)sender +{ + [self _selectViewOFKind:Kind_EBUCore_1_8_sp_json]; +} + -(IBAction)selectViewFIMS11:(id)sender { [self _selectViewOFKind:Kind_FIMS_1_1]; @@ -209,10 +221,12 @@ { if (!_exportSavePanel) return; - + NSInteger tag = exportFormatButton.selectedTag; - - if (tag > 0) + + if (tag == 8 || tag == 9) + [_exportSavePanel setAllowedFileTypes:@[@"json"]]; + else if (tag > 0) [_exportSavePanel setAllowedFileTypes:@[@"xml"]]; else [_exportSavePanel setAllowedFileTypes:@[@"txt"]]; @@ -265,15 +279,21 @@ format = TextKindToNSString(Kind_EBUCore_1_8_sp); break; case 8: - format = TextKindToNSString(Kind_FIMS_1_1); + format = TextKindToNSString(Kind_EBUCore_1_8_ps_json); break; case 9: - format = TextKindToNSString(Kind_FIMS_1_2); + format = TextKindToNSString(Kind_EBUCore_1_8_sp_json); break; case 10: - format = TextKindToNSString(Kind_FIMS_1_3); + format = TextKindToNSString(Kind_FIMS_1_1); break; case 11: + format = TextKindToNSString(Kind_FIMS_1_2); + break; + case 12: + format = TextKindToNSString(Kind_FIMS_1_3); + break; + case 13: format = TextKindToNSString(Kind_reVTMD); break; @@ -712,6 +732,14 @@ BOOL state = [tabs indexOfTabViewItem:tabs.selectedTabViewItem] == kTextTabIndex && _lastTextKind == Kind_EBUCore_1_8_sp ? YES : NO; [menuItem setState: (state ? NSOnState : NSOffState)]; } + else if(action == @selector(selectViewEBUCore18_ps_json:)) { + BOOL state = [tabs indexOfTabViewItem:tabs.selectedTabViewItem] == kTextTabIndex && _lastTextKind == Kind_EBUCore_1_8_ps_json ? YES : NO; + [menuItem setState: (state ? NSOnState : NSOffState)]; + } + else if(action == @selector(selectViewEBUCore18_sp_json:)) { + BOOL state = [tabs indexOfTabViewItem:tabs.selectedTabViewItem] == kTextTabIndex && _lastTextKind == Kind_EBUCore_1_8_sp_json ? YES : NO; + [menuItem setState: (state ? NSOnState : NSOffState)]; + } else if(action == @selector(selectViewFIMS11:)) { BOOL state = [tabs indexOfTabViewItem:tabs.selectedTabViewItem] == kTextTabIndex && _lastTextKind == Kind_FIMS_1_1 ? YES : NO; [menuItem setState: (state ? NSOnState : NSOffState)]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/VCL/GUI_Export.cpp new/MediaInfo/Source/GUI/VCL/GUI_Export.cpp --- old/MediaInfo/Source/GUI/VCL/GUI_Export.cpp 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/VCL/GUI_Export.cpp 2017-09-11 14:01:06.000000000 +0200 @@ -125,6 +125,18 @@ SaveDialog1->DefaultExt=__T("xml"); SaveDialog1->Filter=__T("XML File|*.xml"); } + else if (Export->ActivePage==Export_EBUCore_1_8_ps_json) + { + FN.Extension_Set(__T("json")); + SaveDialog1->DefaultExt=__T("json"); + SaveDialog1->Filter=__T("JSON File|*.json"); + } + else if (Export->ActivePage==Export_EBUCore_1_8_sp_json) + { + FN.Extension_Set(__T("json")); + SaveDialog1->DefaultExt=__T("json"); + SaveDialog1->Filter=__T("JSON File|*.json"); + } else if (Export->ActivePage==Export_FIMS_1_1) { FN.Extension_Set(__T("xml")); @@ -197,6 +209,10 @@ Export->ActivePage=Export_EBUCore_1_8_ps; else if (Info==__T("EBUCore_1.8_sp")) Export->ActivePage=Export_EBUCore_1_8_sp; + else if (Info==__T("EBUCore_1.8_ps_json")) + Export->ActivePage=Export_EBUCore_1_8_ps_json; + else if (Info==__T("EBUCore_1.8_sp_json")) + Export->ActivePage=Export_EBUCore_1_8_sp_json; else if (Info==__T("FIMS_1.1")) Export->ActivePage=Export_FIMS_1_1; else if (Info==__T("FIMS_1.2")) @@ -556,6 +572,38 @@ } Text=ToExport->Inform().c_str(); } + else if (Export->ActivePage==Export_EBUCore_1_8_ps_json) + { + ToExport->Option_Static(__T("Inform"), __T("EBUCore_1.8_parameterSegment_JSON")); + if (Export_EBUCore_1_8_ps_json_SideCar->Checked) + { + for (size_t Pos=0; Pos<ToExport->Count_Get(); Pos++) + { + Text=ToExport->Inform(Pos).c_str(); + File F; + F.Create(Ztring(ToExport->Get(Pos, Stream_General, 0, __T("CompleteName")).c_str())+__T(".EBUCore.json")); + F.Write(Text); + } + return; + } + Text=ToExport->Inform().c_str(); + } + else if (Export->ActivePage==Export_EBUCore_1_8_sp_json) + { + ToExport->Option_Static(__T("Inform"), __T("EBUCore_1.8_segmentParameter_JSON")); + if (Export_EBUCore_1_8_sp_json_SideCar->Checked) + { + for (size_t Pos=0; Pos<ToExport->Count_Get(); Pos++) + { + Text=ToExport->Inform(Pos).c_str(); + File F; + F.Create(Ztring(ToExport->Get(Pos, Stream_General, 0, __T("CompleteName")).c_str())+__T(".EBUCore.json")); + F.Write(Text); + } + return; + } + Text=ToExport->Inform().c_str(); + } else if (Export->ActivePage==Export_FIMS_1_1) { ToExport->Option_Static(__T("Inform"), __T("FIMS_1.1")); @@ -716,6 +764,20 @@ File_Append->Visible=false; Name_Choose->Visible=Export_EBUCore_1_8_sp_SideCar->Checked?false:true;; } + else if (Export->ActivePage==Export_EBUCore_1_8_ps_json) + { + Export_EBUCore_1_8_ps_json_SideCarClick(Sender); + File_Append->Checked=false; + File_Append->Visible=false; + Name_Choose->Visible=Export_EBUCore_1_8_ps_json_SideCar->Checked?false:true;; + } + else if (Export->ActivePage==Export_EBUCore_1_8_sp_json) + { + Export_EBUCore_1_8_sp_json_SideCarClick(Sender); + File_Append->Checked=false; + File_Append->Visible=false; + Name_Choose->Visible=Export_EBUCore_1_8_sp_json_SideCar->Checked?false:true;; + } else if (Export->ActivePage==Export_FIMS_1_1) { Export_FIMS_1_1_SideCarClick(Sender); @@ -844,6 +906,18 @@ } //--------------------------------------------------------------------------- +void __fastcall TExportF::Export_EBUCore_1_8_ps_json_SideCarClick(TObject *Sender) +{ + Name_Choose->Visible=Export_EBUCore_1_8_ps_json_SideCar->Checked?false:true; +} +//--------------------------------------------------------------------------- + +void __fastcall TExportF::Export_EBUCore_1_8_sp_json_SideCarClick(TObject *Sender) +{ + Name_Choose->Visible=Export_EBUCore_1_8_sp_json_SideCar->Checked?false:true; +} +//--------------------------------------------------------------------------- + void __fastcall TExportF::Export_FIMS_1_1_SideCarClick(TObject *Sender) { Name_Choose->Visible=Export_FIMS_1_1_SideCar->Checked?false:true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/VCL/GUI_Export.dfm new/MediaInfo/Source/GUI/VCL/GUI_Export.dfm --- old/MediaInfo/Source/GUI/VCL/GUI_Export.dfm 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/VCL/GUI_Export.dfm 2017-09-11 14:01:06.000000000 +0200 @@ -499,6 +499,40 @@ OnClick = Export_EBUCore_1_8_sp_SideCarClick end end + object Export_EBUCore_1_8_ps_json: TTabSheet + Caption = 'EBUCore 1.8 (ps, json)' + ImageIndex = 9 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 + object Export_EBUCore_1_8_ps_json_SideCar: TCheckBox + Left = 0 + Top = 9 + Width = 597 + Height = 18 + Caption = 'Sidecar file (filename.EBUCore.json)' + TabOrder = 0 + OnClick = Export_EBUCore_1_8_ps_json_SideCarClick + end + end + object Export_EBUCore_1_8_sp_json: TTabSheet + Caption = 'EBUCore 1.8 (sp, json)' + ImageIndex = 9 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 + object Export_EBUCore_1_8_sp_json_SideCar: TCheckBox + Left = 0 + Top = 9 + Width = 597 + Height = 18 + Caption = 'Sidecar file (filename.EBUCore.json)' + TabOrder = 0 + OnClick = Export_EBUCore_1_8_sp_json_SideCarClick + end + end object Export_FIMS_1_1: TTabSheet Caption = 'FIMS 1.1' ImageIndex = 9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/VCL/GUI_Export.h new/MediaInfo/Source/GUI/VCL/GUI_Export.h --- old/MediaInfo/Source/GUI/VCL/GUI_Export.h 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/VCL/GUI_Export.h 2017-09-11 14:01:06.000000000 +0200 @@ -47,6 +47,8 @@ TTabSheet *Export_EBUCore_1_6; TTabSheet *Export_EBUCore_1_8_sp; TTabSheet *Export_EBUCore_1_8_ps; + TTabSheet *Export_EBUCore_1_8_sp_json; + TTabSheet *Export_EBUCore_1_8_ps_json; TTabSheet *Export_FIMS_1_1; TTabSheet *Export_FIMS_1_2; TTabSheet *Export_FIMS_1_3; @@ -96,6 +98,8 @@ TCheckBox *Export_EBUCore_1_6_SideCar; TCheckBox *Export_EBUCore_1_8_ps_SideCar; TCheckBox *Export_EBUCore_1_8_sp_SideCar; + TCheckBox *Export_EBUCore_1_8_ps_json_SideCar; + TCheckBox *Export_EBUCore_1_8_sp_json_SideCar; TCheckBox *Export_FIMS_1_1_SideCar; TCheckBox *Export_FIMS_1_2_SideCar; TCheckBox *Export_FIMS_1_3_SideCar; @@ -116,6 +120,8 @@ void __fastcall Export_EBUCore_1_6_SideCarClick(TObject *Sender); void __fastcall Export_EBUCore_1_8_ps_SideCarClick(TObject *Sender); void __fastcall Export_EBUCore_1_8_sp_SideCarClick(TObject *Sender); + void __fastcall Export_EBUCore_1_8_ps_json_SideCarClick(TObject *Sender); + void __fastcall Export_EBUCore_1_8_sp_json_SideCarClick(TObject *Sender); void __fastcall Export_FIMS_1_1_SideCarClick(TObject *Sender); void __fastcall Export_FIMS_1_2_SideCarClick(TObject *Sender); void __fastcall Export_FIMS_1_3_SideCarClick(TObject *Sender); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/VCL/GUI_Main.cpp new/MediaInfo/Source/GUI/VCL/GUI_Main.cpp --- old/MediaInfo/Source/GUI/VCL/GUI_Main.cpp 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/VCL/GUI_Main.cpp 2017-09-11 14:01:06.000000000 +0200 @@ -220,6 +220,8 @@ else if (Prefs->Config(__T("Output"))==__T("EBUCore_1.6")) {M_View_EBUCore_1_6Click(NULL); M_View_EBUCore_1_6->Checked=true;} else if (Prefs->Config(__T("Output"))==__T("EBUCore_1.8_ps")) {M_View_EBUCore_1_8_psClick(NULL); M_View_EBUCore_1_8_ps->Checked=true;} else if (Prefs->Config(__T("Output"))==__T("EBUCore_1.8_sp")) {M_View_EBUCore_1_8_spClick(NULL); M_View_EBUCore_1_8_sp->Checked=true;} + else if (Prefs->Config(__T("Output"))==__T("EBUCore_1.8_ps_json")) {M_View_EBUCore_1_8_ps_jsonClick(NULL); M_View_EBUCore_1_8_ps_json->Checked=true;} + else if (Prefs->Config(__T("Output"))==__T("EBUCore_1.8_sp_json")) {M_View_EBUCore_1_8_sp_jsonClick(NULL); M_View_EBUCore_1_8_sp_json->Checked=true;} else if (Prefs->Config(__T("Output"))==__T("FIMS_1.1")) {M_View_FIMS_1_1Click(NULL); M_View_FIMS_1_1->Checked=true;} else if (Prefs->Config(__T("Output"))==__T("FIMS_1.2")) {M_View_FIMS_1_2Click(NULL); M_View_FIMS_1_2->Checked=true;} else if (Prefs->Config(__T("Output"))==__T("FIMS_1.3")) {M_View_FIMS_1_3Click(NULL); M_View_FIMS_1_3->Checked=true;} @@ -814,6 +816,10 @@ I->Option_Static(__T("Inform"), __T("EBUCore_1.8_ps")); else if (M_View_EBUCore_1_8_sp->Checked) I->Option_Static(__T("Inform"), __T("EBUCore_1.8_sp")); + else if (M_View_EBUCore_1_8_ps_json->Checked) + I->Option_Static(__T("Inform"), __T("EBUCore_1.8_ps_JSON")); + else if (M_View_EBUCore_1_8_sp_json->Checked) + I->Option_Static(__T("Inform"), __T("EBUCore_1.8_sp_JSON")); else if (M_View_FIMS_1_1->Checked) I->Option_Static(__T("Inform"), __T("FIMS_1.1")); else if (M_View_FIMS_1_2->Checked) @@ -1168,6 +1174,22 @@ ChangePage(Page_Custom); } +//--------------------------------------------------------------------------- +void __fastcall TMainF::M_View_EBUCore_1_8_ps_jsonClick(TObject *Sender) +{ + Prefs->Details[Prefs_Custom].Write(__T("EBUCore_1.8_ps_json")); + ToolBar_View_EBUCore_1_8_ps_json->Checked=true; + ChangePage(Page_Custom); +} + +//--------------------------------------------------------------------------- +void __fastcall TMainF::M_View_EBUCore_1_8_sp_jsonClick(TObject *Sender) +{ + Prefs->Details[Prefs_Custom].Write(__T("EBUCore_1.8_sp_json")); + ToolBar_View_EBUCore_1_8_sp_json->Checked=true; + ChangePage(Page_Custom); +} + //--------------------------------------------------------------------------- void __fastcall TMainF::M_View_FIMS_1_1Click(TObject *Sender) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/VCL/GUI_Main.dfm new/MediaInfo/Source/GUI/VCL/GUI_Main.dfm --- old/MediaInfo/Source/GUI/VCL/GUI_Main.dfm 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/VCL/GUI_Main.dfm 2017-09-11 14:01:06.000000000 +0200 @@ -2185,6 +2185,18 @@ RadioItem = True OnClick = M_View_EBUCore_1_8_spClick end + object M_View_EBUCore_1_8_ps_json: TMenuItem + AutoCheck = True + Caption = 'EBUCore 1.8 (acq. metadata: parameter then segment, json)' + RadioItem = True + OnClick = M_View_EBUCore_1_8_ps_jsonClick + end + object M_View_EBUCore_1_8_sp_json: TMenuItem + AutoCheck = True + Caption = 'EBUCore 1.8 (acq. metadata: segment then parameter, json)' + RadioItem = True + OnClick = M_View_EBUCore_1_8_sp_jsonClick + end object M_View_FIMS_1_1: TMenuItem AutoCheck = True Caption = 'FIMS 1.1 (beta)' @@ -3909,6 +3921,12 @@ object ToolBar_View_EBUCore_1_8_sp: TMenuItem Caption = 'EBUCore 1.8 (acq. metadata: segment then parameter)' end + object ToolBar_View_EBUCore_1_8_ps_json: TMenuItem + Caption = 'EBUCore 1.8 (acq. metadata: parameter then segment, json)' + end + object ToolBar_View_EBUCore_1_8_sp_json: TMenuItem + Caption = 'EBUCore 1.8 (acq. metadata: segment then parameter, json)' + end object ToolBar_View_FIMS_1_1: TMenuItem Caption = 'FIMS 1.1 (beta)' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/VCL/GUI_Main.h new/MediaInfo/Source/GUI/VCL/GUI_Main.h --- old/MediaInfo/Source/GUI/VCL/GUI_Main.h 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/VCL/GUI_Main.h 2017-09-11 14:01:06.000000000 +0200 @@ -187,6 +187,8 @@ TMenuItem *M_View_EBUCore_1_6; TMenuItem *M_View_EBUCore_1_8_ps; TMenuItem *M_View_EBUCore_1_8_sp; + TMenuItem *M_View_EBUCore_1_8_ps_json; + TMenuItem *M_View_EBUCore_1_8_sp_json; TMenuItem *M_View_FIMS_1_1; TMenuItem *M_View_FIMS_1_2; TMenuItem *M_View_FIMS_1_3; @@ -201,6 +203,8 @@ TMenuItem *ToolBar_View_EBUCore_1_6; TMenuItem *ToolBar_View_EBUCore_1_8_ps; TMenuItem *ToolBar_View_EBUCore_1_8_sp; + TMenuItem *ToolBar_View_EBUCore_1_8_ps_json; + TMenuItem *ToolBar_View_EBUCore_1_8_sp_json; TMenuItem *ToolBar_View_FIMS_1_1; TMenuItem *ToolBar_View_FIMS_1_2; TMenuItem *ToolBar_View_FIMS_1_3; @@ -266,6 +270,8 @@ void __fastcall M_View_EBUCore_1_6Click(TObject *Sender); void __fastcall M_View_EBUCore_1_8_psClick(TObject *Sender); void __fastcall M_View_EBUCore_1_8_spClick(TObject *Sender); + void __fastcall M_View_EBUCore_1_8_ps_jsonClick(TObject *Sender); + void __fastcall M_View_EBUCore_1_8_sp_jsonClick(TObject *Sender); void __fastcall M_View_FIMS_1_1Click(TObject *Sender); void __fastcall M_View_FIMS_1_2Click(TObject *Sender); void __fastcall M_View_FIMS_1_3Click(TObject *Sender); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/WxWidgets/GUI_Main.h new/MediaInfo/Source/GUI/WxWidgets/GUI_Main.h --- old/MediaInfo/Source/GUI/WxWidgets/GUI_Main.h 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/WxWidgets/GUI_Main.h 2017-09-11 14:01:06.000000000 +0200 @@ -77,6 +77,8 @@ wxMenuItem* Menu_View_EBUCore_1_6; wxMenuItem* Menu_View_EBUCore_1_8_ps; wxMenuItem* Menu_View_EBUCore_1_8_sp; + wxMenuItem* Menu_View_EBUCore_1_8_ps_json; + wxMenuItem* Menu_View_EBUCore_1_8_sp_json; wxMenuItem* Menu_View_FIMS_1_1; wxMenuItem* Menu_View_FIMS_1_2; wxMenuItem* Menu_View_reVTMD; @@ -111,6 +113,8 @@ void OnMenu_View_EBUCore_1_6 (wxCommandEvent &event); void OnMenu_View_EBUCore_1_8_ps (wxCommandEvent &event); void OnMenu_View_EBUCore_1_8_sp (wxCommandEvent &event); + void OnMenu_View_EBUCore_1_8_ps_json (wxCommandEvent &event); + void OnMenu_View_EBUCore_1_8_sp_json (wxCommandEvent &event); void OnMenu_View_FIMS_1_1 (wxCommandEvent &event); void OnMenu_View_FIMS_1_2 (wxCommandEvent &event); void OnMenu_View_reVTMD (wxCommandEvent &event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/WxWidgets/GUI_Main_Menu.cpp new/MediaInfo/Source/GUI/WxWidgets/GUI_Main_Menu.cpp --- old/MediaInfo/Source/GUI/WxWidgets/GUI_Main_Menu.cpp 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/Source/GUI/WxWidgets/GUI_Main_Menu.cpp 2017-09-11 14:01:06.000000000 +0200 @@ -47,6 +47,8 @@ ID_Menu_View_EBUCore_1_6, ID_Menu_View_EBUCore_1_8_ps, ID_Menu_View_EBUCore_1_8_sp, + ID_Menu_View_EBUCore_1_8_ps_json, + ID_Menu_View_EBUCore_1_8_sp_json, ID_Menu_View_FIMS_1_1, ID_Menu_View_FIMS_1_2, ID_Menu_View_reVTMD, @@ -80,6 +82,8 @@ EVT_MENU(ID_Menu_View_EBUCore_1_6, GUI_Main::OnMenu_View_EBUCore_1_6) EVT_MENU(ID_Menu_View_EBUCore_1_8_ps, GUI_Main::OnMenu_View_EBUCore_1_8_ps) EVT_MENU(ID_Menu_View_EBUCore_1_8_sp, GUI_Main::OnMenu_View_EBUCore_1_8_sp) + EVT_MENU(ID_Menu_View_EBUCore_1_8_ps_json, GUI_Main::OnMenu_View_EBUCore_1_8_ps_json) + EVT_MENU(ID_Menu_View_EBUCore_1_8_sp_json, GUI_Main::OnMenu_View_EBUCore_1_8_sp_json) EVT_MENU(ID_Menu_View_FIMS_1_1, GUI_Main::OnMenu_View_FIMS_1_1) EVT_MENU(ID_Menu_View_FIMS_1_2, GUI_Main::OnMenu_View_FIMS_1_2) EVT_MENU(ID_Menu_View_reVTMD, GUI_Main::OnMenu_View_reVTMD) @@ -137,6 +141,8 @@ Menu_View_EBUCore_1_6 =Menu_View->AppendRadioItem(ID_Menu_View_EBUCore_1_6, __T("EBUCore 1.6")); Menu_View_EBUCore_1_8_ps =Menu_View->AppendRadioItem(ID_Menu_View_EBUCore_1_8_ps, __T("EBUCore 1.8 (acq. metadata: parameter then segment)")); Menu_View_EBUCore_1_8_sp =Menu_View->AppendRadioItem(ID_Menu_View_EBUCore_1_8_sp, __T("EBUCore 1.8 (acq. metadata: segment then parameter)")); + Menu_View_EBUCore_1_8_ps_json =Menu_View->AppendRadioItem(ID_Menu_View_EBUCore_1_8_ps_json, __T("EBUCore 1.8 (acq. metadata: parameter then segment, json output)")); + Menu_View_EBUCore_1_8_sp_json =Menu_View->AppendRadioItem(ID_Menu_View_EBUCore_1_8_sp_json, __T("EBUCore 1.8 (acq. metadata: segment then parameter, json output)")); Menu_View_FIMS_1_1 =Menu_View->AppendRadioItem(ID_Menu_View_FIMS_1_1, __T("FIMS 1.1 (beta)")); Menu_View_FIMS_1_2 =Menu_View->AppendRadioItem(ID_Menu_View_FIMS_1_2, __T("FIMS 1.2 (beta)")); Menu_View_reVTMD =Menu_View->AppendRadioItem(ID_Menu_View_reVTMD, __T("reVTMD")); @@ -362,6 +368,28 @@ //Showing GUI_Main_Common_Core* View_New = new GUI_Main_Text(C, this); + delete View; View = View_New; +} + +//--------------------------------------------------------------------------- +void GUI_Main::OnMenu_View_EBUCore_1_8_ps_json(wxCommandEvent& WXUNUSED(event)) +{ + //Configuring + C->Menu_View_EBUCore_1_8_ps_json(); + + //Showing + GUI_Main_Common_Core* View_New = new GUI_Main_Text(C, this); + delete View; View = View_New; +} + +//--------------------------------------------------------------------------- +void GUI_Main::OnMenu_View_EBUCore_1_8_sp_json(wxCommandEvent& WXUNUSED(event)) +{ + //Configuring + C->Menu_View_EBUCore_1_8_sp_json(); + + //Showing + GUI_Main_Common_Core* View_New = new GUI_Main_Text(C, this); delete View; View = View_New; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/Install/MediaInfo_GUI_Windows.nsi new/MediaInfo/Source/Install/MediaInfo_GUI_Windows.nsi --- old/MediaInfo/Source/Install/MediaInfo_GUI_Windows.nsi 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/Source/Install/MediaInfo_GUI_Windows.nsi 2017-09-11 14:01:07.000000000 +0200 @@ -5,7 +5,7 @@ ; Some defines !define PRODUCT_NAME "MediaInfo" !define PRODUCT_PUBLISHER "MediaArea.net" -!define PRODUCT_VERSION "0.7.98" +!define PRODUCT_VERSION "0.7.99" !define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0" !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo" !define COMPANY_REGISTRY_OLD "Software\MediaArea.net" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/debian/changelog new/MediaInfo/debian/changelog --- old/MediaInfo/debian/changelog 2017-08-08 18:03:16.000000000 +0200 +++ new/MediaInfo/debian/changelog 2017-09-11 14:01:07.000000000 +0200 @@ -1,6 +1,6 @@ -mediainfo (0.7.98-1) experimental; urgency=medium +mediainfo (0.7.99-1) experimental; urgency=medium - * Upstream version 0.7.98 + * Upstream version 0.7.99 For details, see https://github.com/MediaArea/MediaInfo/blob/master/History_GUI.txt -- MediaArea <i...@mediaarea.net> Mon, 02 Nov 2015 10:30:00 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/debian/control new/MediaInfo/debian/control --- old/MediaInfo/debian/control 2017-08-08 18:03:15.000000000 +0200 +++ new/MediaInfo/debian/control 2017-09-11 14:01:06.000000000 +0200 @@ -4,8 +4,8 @@ Maintainer: MediaArea.net SARL <i...@mediaarea.net> Build-Depends: debhelper (>= 9), dh-autoreconf, - libmediainfo-dev (>= 0.7.98), - libzen-dev (>= 0.4.36), + libmediainfo-dev (>= 0.7.99), + libzen-dev (>= 0.4.37), libwxgtk3.0-dev, zlib1g-dev, pkg-config, @@ -16,7 +16,7 @@ Package: mediainfo Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.98), libzen0 (>= 0.4.36) +Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.99), libzen0 (>= 0.4.37) Description: command-line utility for reading information from audio/video files MediaInfo is a utility used for retrieving technical information and other metadata about audio or video files. @@ -41,7 +41,7 @@ Package: mediainfo-gui Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.98), libzen0 (>= 0.4.36) +Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 0.7.99), libzen0 (>= 0.4.37) Description: graphical utility for reading information from audio/video files MediaInfo is a utility used for retrieving technical information and other metadata about audio or video files.