Hello community,
here is the log from the commit of package mediainfo for openSUSE:Factory checked in at 2018-03-24 16:14:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mediainfo (Old)
and /work/SRC/openSUSE:Factory/.mediainfo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mediainfo"
Sat Mar 24 16:14:09 2018 rev:11 rq:589141 version:18.03
Changes:
--------
--- /work/SRC/openSUSE:Factory/mediainfo/mediainfo.changes 2018-01-13 21:45:14.276814299 +0100
+++ /work/SRC/openSUSE:Factory/.mediainfo.new/mediainfo.changes 2018-03-24 16:14:10.774094156 +0100
@@ -1,0 +2,33 @@
+Tue Mar 20 11:24:08 UTC 2018 - aloisio@gmx.com
+
+- Update to version 18.03
+ added:
+ * AV1: support of AOmedia AV1 based on latest specifications
+ draft, raw (OBU) and in MKV
+ * MXF: HDR metadata support
+ * MXF: detection and parsing of ProRes (SMPTE RDD 44)
+ * MXF: framerate container/stream incoherence detection
+ * DPX: endianess, packing mode, compression mode
+ * AVC: add consumer camera recording date/time
+ * AVC: add consumer camera model name and iris F number
+ * JPEG: ICC parsing, display of ICC color space
+ * EBUCore: possibility to inject external metadata in the output
+ from MediaInfo
+ * JSON output
+ * Attachments: do not provide anymore attachments content in XML
+ by default, reducing XML output size
+ fixed:
+ * colour description: trying (again!) to have more coherent
+ labeling
+ * DCP/IMF: fix crash with some CPL files
+ * I782, FFV1: Golomb Rice parsing was wrong
+ * I210, FFV1: remove sar_den test must be 0 if sar_num is 0
+ * AAC: SBR parsing issue with 3+ channel streams, with sometimes
+ false-positive PS detection
+ * BMP: was wrongly considering 4-bit without palette as with
+ palette so wrong bit depth
+ * DPX: some elements in trace were wrongly displayed (wrong
+ endianess)
+ * B1082, Ancillary data: fix infinite loop
+
+-------------------------------------------------------------------
Old:
----
mediainfo_17.12.tar.xz
New:
----
mediainfo_18.03.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mediainfo.spec ++++++
--- /var/tmp/diff_new_pack.rnJsUb/_old 2018-03-24 16:14:12.146044700 +0100
+++ /var/tmp/diff_new_pack.rnJsUb/_new 2018-03-24 16:14:12.150044556 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mediainfo
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2007-2011 The Packman Team
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: mediainfo
-Version: 17.12
+Version: 18.03
Release: 0
Summary: Supplies technical and tag information about a video or audio file
License: GPL-2.0+
++++++ mediainfo_17.12.tar.xz -> mediainfo_18.03.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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/History_CLI.txt 2018-03-20 00:40:56.000000000 +0100
@@ -12,6 +12,28 @@
- Languages (other than english and French) : not all words are translated, I need translators!
- Others? https://sourceforge.net/p/mediainfo/_list/tickets
+Version 18.03, 2018-03-19
+--------------
++ AV1: support of AOmedia AV1 based on latest specifications draft, raw (OBU) and in MKV
++ MXF: HDR metadata support
++ MXF: detection and parsing of ProRes (SMPTE RDD 44)
++ MXF: framerate container/stream incoherence detection
++ DPX: endianess, packing mode, compression mode
++ AVC: add consumer camera recording date/time
++ AVC: add consumer camera model name and iris F number
++ JPEG: ICC parsing, display of ICC color space
++ EBUCore: possibility to inject external metadata in the output from MediaInfo
++ JSON output
++ Attachments: do not provide anymore attachments content in XML by default, reducing XML output size
+x colour description: trying (again!) to have more coherent labeling
+x DCP/IMF: fix crash with some CPL files
+x I782, FFV1: Golomb Rice parsing was wrong
+x I210, FFV1: remove sar_den test must be 0 if sar_num is 0
+x AAC: SBR parsing issue with 3+ channel streams, with sometimes false-positive PS detection
+x BMP: was wrongly considering 4-bit without palette as with palette so wrong bit depth
+x DPX: some elements in trace were wrongly displayed (wrong endianess)
+x B1082, Ancillary data: fix infinite loop
+
Version 17.12, 2017-12-21
--------------
+ MediaInfoOnline: https://mediaarea.net/MediaInfoOnline
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-12-21 09:50:39.000000000 +0100
+++ new/MediaInfo/History_GUI.txt 2018-03-20 00:40:56.000000000 +0100
@@ -12,6 +12,28 @@
- Languages (other than english and French) : not all words are translated, I need translators!
- Others? https://sourceforge.net/p/mediainfo/_list/tickets
+Version 18.03, 2018-03-19
+--------------
++ AV1: support of AOmedia AV1 based on latest specifications draft, raw (OBU) and in MKV
++ MXF: HDR metadata support
++ MXF: detection and parsing of ProRes (SMPTE RDD 44)
++ MXF: framerate container/stream incoherence detection
++ DPX: endianess, packing mode, compression mode
++ AVC: add consumer camera recording date/time
++ AVC: add consumer camera model name and iris F number
++ JPEG: ICC parsing, display of ICC color space
++ EBUCore: possibility to inject external metadata in the output from MediaInfo
++ JSON output
++ Attachments: do not provide anymore attachments content in XML by default, reducing XML output size
+x colour description: trying (again!) to have more coherent labeling
+x DCP/IMF: fix crash with some CPL files
+x I782, FFV1: Golomb Rice parsing was wrong
+x I210, FFV1: remove sar_den test must be 0 if sar_num is 0
+x AAC: SBR parsing issue with 3+ channel streams, with sometimes false-positive PS detection
+x BMP: was wrongly considering 4-bit without palette as with palette so wrong bit depth
+x DPX: some elements in trace were wrongly displayed (wrong endianess)
+x B1082, Ancillary data: fix infinite loop
+
Version 17.12, 2017-12-21
--------------
+ MediaInfoOnline: https://mediaarea.net/MediaInfoOnline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/LICENSE new/MediaInfo/LICENSE
--- old/MediaInfo/LICENSE 2017-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/LICENSE 2018-03-20 00:40:56.000000000 +0100
@@ -1,6 +1,6 @@
BSD 2-Clause License
-Copyright (c) 2002-2016, MediaArea.net SARL
+Copyright (c) 2002-2018, MediaArea.net SARL
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/License.html new/MediaInfo/License.html
--- old/MediaInfo/License.html 2017-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/License.html 2018-03-20 00:40:56.000000000 +0100
@@ -17,10 +17,21 @@
</div>
<hr/>
<div>
+<p>Alternate open source licenses:<br/>
+You can relicense (including source headers change) MediaInfo
+under Apache License 2.0 or later,
+and/or GNU Lesser General Public License 2.1 or later,
+and/or GNU General Public License 2.0 or later,
+and/or Mozilla Public License 2.0 or later.</p>
+</div>
+
+<hr/>
+<div>
<p>Alternate license for redistributions of the library in binary form:<br/>
Redistributions in binary form must reproduce the following sentence (including the link to the website) in the documentation and/or other materials provided with the distribution.<br/>
-This product uses <a href="http://mediaarea.net/MediaInfo">MediaInfo</a> library, Copyright (c) 2002-2014 <a href="mailto:Info@MediaArea.net">MediaArea.net SARL</a>.</p>
+This product uses <a href="http://mediaarea.net/MediaInfo">MediaInfo</a> library, Copyright (c) 2002-2018 <a href="mailto:Info@MediaArea.net">MediaArea.net SARL</a>.</p>
</div>
+
<hr/>
<div>
<h3 style="text-align: center">Third party libraries</h3>
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/AppImage/Recipe.sh 2018-03-20 00:40:58.000000000 +0100
@@ -47,7 +47,7 @@
fi
# Setup evironment
-VERSION=17.12
+VERSION=18.03
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/BCB/GUI/MediaInfo_GUI.cbproj 2018-03-20 00:40:58.000000000 +0100
@@ -42,12 +42,12 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<Defines>MEDIAINFO_DLL_STATIC;$(Defines)</Defines>
- CompanyName=;FileDescription=;FileVersion=17.12.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=;Comments=
+ CompanyName=;FileDescription=;FileVersion=18.03.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=;Comments=
None
true
- 12
+ 03
0
- 17
+ 18
1033
<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>
<Multithreaded>true</Multithreaded>
@@ -105,7 +105,7 @@
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
0
<LinkPackageStatics>rtl.lib;vcl.lib;bcbie.lib</LinkPackageStatics>
- CompanyName=MediaArea.net;FileDescription=MediaInfo;FileVersion=17.12.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=MediaInfo;ProductVersion=17.12.0.0;Comments=
+ CompanyName=MediaArea.net;FileDescription=MediaInfo;FileVersion=18.03.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=MediaInfo;ProductVersion=18.03.0.0;Comments=
$(BDS)\bin\default_app.manifest
</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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/GNU/CLI/configure.ac 2018-03-20 00:40:58.000000000 +0100
@@ -5,7 +5,7 @@
dnl -------------------------------------------------------------------------
dnl Name and version
dnl
-AC_INIT([mediainfo], [17.12])
+AC_INIT([mediainfo], [18.03])
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/GNU/GUI/configure.ac 2018-03-20 00:40:58.000000000 +0100
@@ -5,7 +5,7 @@
dnl -------------------------------------------------------------------------
dnl Name and version
dnl
-AC_INIT([mediainfo-gui], [17.12])
+AC_INIT([mediainfo-gui], [18.03])
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/GNU/PKGBUILD 2018-03-20 00:40:58.000000000 +0100
@@ -3,7 +3,7 @@
# Contributor: hydro
pkgname=('mediainfo' 'mediainfo-gui')
-pkgver=17.12
+pkgver=18.03
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.37' 'libmediainfo>=17.10' 'wxgtk' 'libsm' 'desktop-file-utils')
+depends=('libzen>=0.4.37' 'libmediainfo>=18.03' '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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/GNU/mediainfo.dsc 2018-03-20 00:40:58.000000000 +0100
@@ -2,22 +2,22 @@
Source: mediainfo
Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg
Architecture: any
-Version: 17.12-1
+Version: 18.03-1
Maintainer: MediaArea.net SARL
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 (>= 17.10), libzen-dev (>= 0.4.37), libwxgtk3.0-dev, zlib1g-dev, pkg-config
+Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 18.03), 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_17.12.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 mediainfo_17.12-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediainfo_18.03-1.debian.tar.xz
Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_17.12.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_17.12-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_18.03-1.debian.tar.xz
Files:
- 00000000000000000000000000000000 000000 mediainfo_17.12.orig.tar.xz
- 00000000000000000000000000000000 000000 mediainfo_17.12-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 00000000000000000000000000000000 000000 mediainfo_18.03-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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/GNU/mediainfo.spec 2018-03-20 00:40:58.000000000 +0100
@@ -1,5 +1,5 @@
-%define mediainfo_version 17.12
-%define libmediainfo_version 17.10
+%define mediainfo_version 18.03
+%define libmediainfo_version 18.03
%define libzen_version 0.4.37
%if 0%{?fedora_version} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/MSVC2013/CLI/MediaInfo_CLI.rc 2018-03-20 00:40:58.000000000 +0100
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 17,12,0,0
- PRODUCTVERSION 17,12,0,0
+ FILEVERSION 18,03,0,0
+ PRODUCTVERSION 18,03,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "MediaInfo"
- VALUE "FileVersion", "17.12.0.0"
+ VALUE "FileVersion", "18.03.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaInfo"
- VALUE "ProductVersion", "17.12.0.0"
+ VALUE "ProductVersion", "18.03.0.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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/MSVC2013/GUI/MediaInfo_GUI.rc 2018-03-20 00:40:58.000000000 +0100
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 17,12,0,0
- PRODUCTVERSION 17,12,0,0
+ FILEVERSION 18,03,0,0
+ PRODUCTVERSION 18,03,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "MediaInfo"
- VALUE "FileVersion", "17.12.0.0"
+ VALUE "FileVersion", "18.03.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaInfo"
- VALUE "ProductVersion", "17.12.0.0"
+ VALUE "ProductVersion", "18.03.0.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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/MSVC2015/CLI/MediaInfo_CLI.rc 2018-03-20 00:40:58.000000000 +0100
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 17,12,0,0
- PRODUCTVERSION 17,12,0,0
+ FILEVERSION 18,03,0,0
+ PRODUCTVERSION 18,03,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "MediaInfo"
- VALUE "FileVersion", "17.12.0.0"
+ VALUE "FileVersion", "18.03.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaInfo"
- VALUE "ProductVersion", "17.12.0.0"
+ VALUE "ProductVersion", "18.03.0.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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/MSVC2015/GUI/MediaInfo_GUI.rc 2018-03-20 00:40:58.000000000 +0100
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 17,12,0,0
- PRODUCTVERSION 17,12,0,0
+ FILEVERSION 18,03,0,0
+ PRODUCTVERSION 18,03,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "MediaInfo"
- VALUE "FileVersion", "17.12.0.0"
+ VALUE "FileVersion", "18.03.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaInfo"
- VALUE "ProductVersion", "17.12.0.0"
+ VALUE "ProductVersion", "18.03.0.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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/MSVC2017/CLI/MediaInfo_CLI.rc 2018-03-20 00:40:58.000000000 +0100
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 17,12,0,0
- PRODUCTVERSION 17,12,0,0
+ FILEVERSION 18,03,0,0
+ PRODUCTVERSION 18,03,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "MediaInfo"
- VALUE "FileVersion", "17.12.0.0"
+ VALUE "FileVersion", "18.03.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaInfo"
- VALUE "ProductVersion", "17.12.0.0"
+ VALUE "ProductVersion", "18.03.0.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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/MSVC2017/GUI/MediaInfo_GUI.rc 2018-03-20 00:40:58.000000000 +0100
@@ -1,8 +1,8 @@
#include
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 17,12,0,0
- PRODUCTVERSION 17,12,0,0
+ FILEVERSION 18,03,0,0
+ PRODUCTVERSION 18,03,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "MediaInfo"
- VALUE "FileVersion", "17.12.0.0"
+ VALUE "FileVersion", "18.03.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaInfo"
- VALUE "ProductVersion", "17.12.0.0"
+ VALUE "ProductVersion", "18.03.0.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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb6.debian/changelog 2018-03-20 00:40:58.000000000 +0100
@@ -1,4 +1,4 @@
-mediainfo (17.12) unstable; urgency=low
+mediainfo (18.03) 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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb6.debian/control 2018-03-20 00:40:58.000000000 +0100
@@ -1,7 +1,7 @@
Source: mediainfo
Priority: optional
Maintainer: MediaArea.net SARL
-Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 17.10), libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool
+Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 18.03), 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 (>= 17.10), libzen0 (>= 0.4.37), zlib1g
+Depends: libmediainfo0 (>= 18.03), 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 (>= 17.10), libzen0 (>= 0.4.37), libwxgtk2.8-0, zlib1g
+Depends: libmediainfo0 (>= 18.03), 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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb6.dsc 2018-03-20 00:40:58.000000000 +0100
@@ -2,10 +2,10 @@
Source: mediainfo
Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg
Architecture: any
-Version: 17.12-1deb6
+Version: 18.03-1deb6
Maintainer: MediaArea.net SARL
Homepage: http://MediaArea.net/MediaInfo
Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 17.10), libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool
+Build-Depends: debhelper (>= 5), tofrodos, libmediainfo-dev (>= 18.03), libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool
Files:
- 00000000000000000000000000000000 000000 mediainfo_17.12-1deb6.tar.gz
+ 00000000000000000000000000000000 000000 mediainfo_18.03-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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb7.debian/changelog 2018-03-20 00:40:58.000000000 +0100
@@ -1,6 +1,6 @@
-mediainfo (17.12-1) experimental; urgency=medium
+mediainfo (18.03-1) experimental; urgency=medium
- * Upstream version 17.12
+ * Upstream version 18.03
For details, see https://github.com/MediaArea/MediaInfo/blob/master/History_GUI.txt
-- MediaArea 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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb7.debian/control 2018-03-20 00:40:58.000000000 +0100
@@ -4,7 +4,7 @@
Maintainer: MediaArea.net SARL
Build-Depends: debhelper (>= 9),
dh-autoreconf,
- libmediainfo-dev (>= 17.10),
+ libmediainfo-dev (>= 18.03),
libzen-dev (>= 0.4.37),
libwxgtk2.8-dev,
zlib1g-dev,
@@ -16,7 +16,7 @@
Package: mediainfo
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 17.10), libzen0 (>= 0.4.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 18.03), 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 (>= 17.10), libzen0 (>= 0.4.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 18.03), 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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb7.dsc 2018-03-20 00:40:58.000000000 +0100
@@ -2,22 +2,22 @@
Source: mediainfo
Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg
Architecture: any
-Version: 17.12-1deb7
+Version: 18.03-1deb7
Maintainer: MediaArea.net SARL
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 (>= 17.10), libzen-dev (>= 0.4.37), libwxgtk2.8-dev, zlib1g-dev, pkg-config
+Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 18.03), 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_17.12.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 mediainfo_17.12-1deb7.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediainfo_18.03-1deb7.debian.tar.xz
Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_17.12.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_17.12-1deb7.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_18.03-1deb7.debian.tar.xz
Files:
- 00000000000000000000000000000000 000000 mediainfo_17.12.orig.tar.xz
- 00000000000000000000000000000000 000000 mediainfo_17.12-1deb7.debian.tar.xz
+ 00000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 00000000000000000000000000000000 000000 mediainfo_18.03-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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb9.debian/changelog 2018-03-20 00:40:58.000000000 +0100
@@ -1,6 +1,6 @@
-mediainfo (17.12-1) experimental; urgency=medium
+mediainfo (18.03-1) experimental; urgency=medium
- * Upstream version 17.12
+ * Upstream version 18.03
For details, see https://github.com/MediaArea/MediaInfo/blob/master/History_GUI.txt
-- MediaArea 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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb9.debian/control 2018-03-20 00:40:58.000000000 +0100
@@ -4,7 +4,7 @@
Maintainer: MediaArea.net SARL
Build-Depends: debhelper (>= 9),
dh-autoreconf,
- libmediainfo-dev (>= 17.10),
+ libmediainfo-dev (>= 18.03),
libzen-dev (>= 0.4.37),
libwxgtk3.0-dev,
adwaita-icon-theme,
@@ -18,7 +18,7 @@
Package: mediainfo
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 17.10), libzen0v5 (>= 0.4.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 18.03), 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.
@@ -43,7 +43,7 @@
Package: mediainfo-gui
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 17.10), libzen0v5 (>= 0.4.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0v5 (>= 18.03), 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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/OBS/deb9.dsc 2018-03-20 00:40:58.000000000 +0100
@@ -2,22 +2,22 @@
Source: mediainfo
Binary: mediainfo, mediainfo-dbg, mediainfo-gui, mediainfo-gui-dbg
Architecture: any
-Version: 17.12-1deb9
+Version: 18.03-1deb9
Maintainer: MediaArea.net SARL
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 (>= 17.10), libzen-dev (>= 0.4.37), libwxgtk3.0-dev, adwaita-icon-theme, zlib1g-dev, pkg-config, rename
+Build-Depends: debhelper (>= 9), dh-autoreconf, libmediainfo-dev (>= 18.03), libzen-dev (>= 0.4.37), libwxgtk3.0-dev, adwaita-icon-theme, zlib1g-dev, pkg-config, rename
Package-List:
mediainfo deb utils optional arch=any
mediainfo-gui deb utils optional arch=any
Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 mediainfo_17.12.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 mediainfo_17.12-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediainfo_18.03-1deb9.debian.tar.xz
Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_17.12.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_17.12-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediainfo_18.03-1deb9.debian.tar.xz
Files:
- 00000000000000000000000000000000 000000 mediainfo_17.12.orig.tar.xz
- 00000000000000000000000000000000 000000 mediainfo_17.12-1deb9.debian.tar.xz
+ 00000000000000000000000000000000 000000 mediainfo_18.03.orig.tar.xz
+ 00000000000000000000000000000000 000000 mediainfo_18.03-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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/OBS/obs_mediainfo 2018-03-20 00:40:58.000000000 +0100
@@ -180,8 +180,8 @@
}
-mediainfov="17.12"
-libmediainfov="17.12"
+mediainfov="18.03"
+libmediainfov="18.03"
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/Snap/mediainfo/snapcraft.yaml 2018-03-20 00:40:58.000000000 +0100
@@ -1,5 +1,5 @@
name: mediainfo
-version: 17.12
+version: 18.03
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/Snap/mediainfo-gui/snapcraft.yaml 2018-03-20 00:40:58.000000000 +0100
@@ -1,5 +1,5 @@
name: mediainfo-gui
-version: 17.12
+version: 18.03
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/Solaris/mkpkg 2018-03-20 00:40:58.000000000 +0100
@@ -9,7 +9,7 @@
#Creation of known directories and filenames
name="mediainfo"
-version="17.12"
+version="18.03"
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Project/version.txt 2018-03-20 00:40:58.000000000 +0100
@@ -1 +1 @@
-17.12
+18.03
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/CLI/Help.cpp new/MediaInfo/Source/CLI/Help.cpp
--- old/MediaInfo/Source/CLI/Help.cpp 2017-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/CLI/Help.cpp 2018-03-20 00:40:56.000000000 +0100
@@ -54,6 +54,8 @@
TEXTOUT(" Full information Display with HTML tags");
TEXTOUT("--Output=XML");
TEXTOUT(" Full information Display with XML tags");
+ TEXTOUT("--Output=OLDXML");
+ TEXTOUT(" Full information Display with XML tags using the older MediaInfo schema");
TEXTOUT("--Output=EBUCore");
TEXTOUT(" Full information Display with EBUCore compliant XML tags");
TEXTOUT("--Output=PBCore");
@@ -64,6 +66,10 @@
TEXTOUT(" Display Acquisition Data by segment then parameter (EBUCore output)");
TEXTOUT("--AcquisitionDataOutputMode=parameterSegment");
TEXTOUT(" Display Acquisition Data by parameter then segment (EBUCore output)");
+ TEXTOUT("--ExternalMetadata=...");
+ TEXTOUT(" Add external metadata to the output (EBUCore output)");
+ TEXTOUT("--ExternalMetadataConfig=...");
+ TEXTOUT(" Output template for external metadata (EBUCore output)");
TEXTOUT("--Info-Parameters");
TEXTOUT(" Display list of Inform= parameters");
TEXTOUT("");
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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/Common/Core.cpp 2018-03-20 00:40:56.000000000 +0100
@@ -226,6 +226,13 @@
}
//---------------------------------------------------------------------------
+void Core::Menu_View_JSON ()
+{
+ MI->Option(__T("Inform"), __T("JSON"));
+ Kind=Kind_JSON;
+}
+
+//---------------------------------------------------------------------------
void Core::Menu_View_PBCore ()
{
MI->Option(__T("Inform"), __T("PBCore"));
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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/Common/Core.h 2018-03-20 00:40:56.000000000 +0100
@@ -51,6 +51,7 @@
void Menu_View_Text ();
void Menu_View_HTML ();
void Menu_View_XML ();
+ void Menu_View_JSON ();
void Menu_View_MPEG7 ();
void Menu_View_PBCore ();
void Menu_View_PBCore2 ();
@@ -78,7 +79,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_EBUCore_1_8_ps_json, Kind_EBUCore_1_8_sp_json, 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_JSON, 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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Source/Common/Preferences.h 2018-03-20 00:40:58.000000000 +0100
@@ -32,7 +32,7 @@
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
-#define MediaInfo_Version_GUI __T("17.12")
+#define MediaInfo_Version_GUI __T("18.03")
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/Cocoa/English.lproj/MainMenu.xib 2018-03-20 00:40:56.000000000 +0100
@@ -623,6 +623,12 @@
<action selector="selectTextTab:" target="-1" id="601"/>
</connections>
</menuItem>
+ <menuItem title="JSON" id="p8X-bL-6KX">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="selectViewJSON:" target="-1" id="Bll-l2-klY"/>
+ </connections>
+ </menuItem>
<menuItem title="MPEG-7" id="o7W-nM-5JW">
<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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/Cocoa/English.lproj/MyWindow.xib 2018-03-20 00:40:56.000000000 +0100
@@ -393,6 +393,12 @@
</customObject>
<menu id="4PR-wq-KNx">
<items>
+ <menuItem title="JSON" id="ro6-xM-h9O">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="selectViewJSON:" target="-1" id="TE0-Mc-LZm"/>
+ </connections>
+ </menuItem>
<menuItem title="MPEG-7" id="ei5-wL-g0P">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Source/GUI/Cocoa/MediaInfo.xcodeproj/project.pbxproj 2018-03-20 00:40:58.000000000 +0100
@@ -708,7 +708,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- APP_VERSION = 17.12;
+ APP_VERSION = 18.03;
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 = 17.12;
+ APP_VERSION = 18.03;
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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/Cocoa/MyWindowController.h 2018-03-20 00:40:56.000000000 +0100
@@ -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_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;
+typedef enum { Kind_Text, Kind_XML, Kind_JSON, 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 {
@@ -46,6 +46,7 @@
-(IBAction)selectTextTab:(id)sender;
-(void)_selectViewOFKind:(ViewMenu_Kind)_kind;
+-(IBAction)selectViewJSON:(id)sender;
-(IBAction)selectViewMPEG7:(id)sender;
-(IBAction)selectViewPBCore:(id)sender;
-(IBAction)selectViewPBCore2:(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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/Cocoa/MyWindowController.m 2018-03-20 00:40:56.000000000 +0100
@@ -20,8 +20,9 @@
NSString *_ret = nil;
switch (kind)
{
+ case Kind_JSON: _ret = @"JSON"; break;
case Kind_MPEG7: _ret = @"MPEG-7"; break;
- case Kind_PBCore: _ret = @"PBCore"; break;
+ case Kind_PBCore: _ret = @"PBCore"; break;
case Kind_PBCore2: _ret = @"PBCore2"; break;
case Kind_EBUCore_1_5: _ret = @"EBUCore_1.5"; break;
case Kind_EBUCore_1_6: _ret = @"EBUCore_1.6"; break;
@@ -119,6 +120,11 @@
[tabs selectTabViewItemAtIndex:kTextTabIndex];
}
+-(IBAction)selectViewJSON:(id)sender
+{
+ [self _selectViewOFKind:Kind_JSON];
+}
+
-(IBAction)selectViewMPEG7:(id)sender
{
[self _selectViewOFKind:Kind_MPEG7];
@@ -258,42 +264,45 @@
switch (exportFormatButton.selectedTag)
{
case 1:
- format = TextKindToNSString(Kind_MPEG7);
+ format = TextKindToNSString(Kind_JSON);
break;
case 2:
- format = TextKindToNSString(Kind_PBCore);
+ format = TextKindToNSString(Kind_MPEG7);
break;
case 3:
- format = TextKindToNSString(Kind_PBCore2);
+ format = TextKindToNSString(Kind_PBCore);
break;
case 4:
- format = TextKindToNSString(Kind_EBUCore_1_5);
+ format = TextKindToNSString(Kind_PBCore2);
break;
case 5:
- format = TextKindToNSString(Kind_EBUCore_1_6);
+ format = TextKindToNSString(Kind_EBUCore_1_5);
break;
case 6:
- format = TextKindToNSString(Kind_EBUCore_1_8_ps);
+ format = TextKindToNSString(Kind_EBUCore_1_6);
break;
case 7:
- format = TextKindToNSString(Kind_EBUCore_1_8_sp);
+ format = TextKindToNSString(Kind_EBUCore_1_8_ps);
break;
case 8:
- format = TextKindToNSString(Kind_EBUCore_1_8_ps_json);
+ format = TextKindToNSString(Kind_EBUCore_1_8_sp);
break;
case 9:
- format = TextKindToNSString(Kind_EBUCore_1_8_sp_json);
+ format = TextKindToNSString(Kind_EBUCore_1_8_ps_json);
break;
case 10:
- format = TextKindToNSString(Kind_FIMS_1_1);
+ format = TextKindToNSString(Kind_EBUCore_1_8_sp_json);
break;
case 11:
- format = TextKindToNSString(Kind_FIMS_1_2);
+ format = TextKindToNSString(Kind_FIMS_1_1);
break;
case 12:
- format = TextKindToNSString(Kind_FIMS_1_3);
+ format = TextKindToNSString(Kind_FIMS_1_2);
break;
case 13:
+ format = TextKindToNSString(Kind_FIMS_1_3);
+ break;
+ case 14:
format = TextKindToNSString(Kind_reVTMD);
break;
@@ -704,6 +713,10 @@
BOOL state = [tabs indexOfTabViewItem:tabs.selectedTabViewItem] == kTextTabIndex && _lastTextKind == Kind_Text ? YES : NO;
[menuItem setState: (state ? NSOnState : NSOffState)];
}
+ else if(action == @selector(selectViewJSON:)) {
+ BOOL state = [tabs indexOfTabViewItem:tabs.selectedTabViewItem] == kTextTabIndex && _lastTextKind == Kind_JSON ? YES : NO;
+ [menuItem setState: (state ? NSOnState : NSOffState)];
+ }
else if(action == @selector(selectViewMPEG7:)) {
BOOL state = [tabs indexOfTabViewItem:tabs.selectedTabViewItem] == kTextTabIndex && _lastTextKind == Kind_MPEG7 ? 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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/VCL/GUI_Export.cpp 2018-03-20 00:40:56.000000000 +0100
@@ -83,6 +83,12 @@
SaveDialog1->DefaultExt=__T("xml");
SaveDialog1->Filter=__T("XML File|*.xml");
}
+ else if (Export->ActivePage==Export_JSON)
+ {
+ FN.Extension_Set(__T("json"));
+ SaveDialog1->DefaultExt=__T("json");
+ SaveDialog1->Filter=__T("JSON File|*.json");
+ }
else if (Export->ActivePage==Export_MPEG7)
{
FN.Extension_Set(__T("xml"));
@@ -197,6 +203,8 @@
Export->ActivePage=Export_XML;
else if (Info==__T("MIXML"))
Export->ActivePage=Export_XML;
+ else if (Info==__T("JSON"))
+ Export->ActivePage=Export_JSON;
else if (Info==__T("MPEG-7"))
Export->ActivePage=Export_MPEG7;
else if (Info==__T("PBCore_1.2"))
@@ -462,6 +470,22 @@
}
Text=ToExport->Inform().c_str();
}
+ else if (Export->ActivePage==Export_JSON)
+ {
+ ToExport->Option_Static(__T("Inform"), __T("JSON"));
+ if (Export_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(".mediainfo.json"));
+ F.Write(Text);
+ }
+ return;
+ }
+ Text=ToExport->Inform().c_str();
+ }
else if (Export->ActivePage==Export_MPEG7)
{
ToExport->Option_Static(__T("Inform"), __T("MPEG-7"));
@@ -717,6 +741,13 @@
File_Append->Visible=false;
Name_Choose->Visible=Export_XML_SideCar->Checked?false:true;;
}
+ else if (Export->ActivePage==Export_JSON)
+ {
+ Export_JSON_SideCarClick(Sender);
+ File_Append->Checked=false;
+ File_Append->Visible=false;
+ Name_Choose->Visible=Export_JSON_SideCar->Checked?false:true;;
+ }
else if (Export->ActivePage==Export_MPEG7)
{
Export_MPEG7_SideCarClick(Sender);
@@ -866,6 +897,12 @@
}
//---------------------------------------------------------------------------
+void __fastcall TExportF::Export_JSON_SideCarClick(TObject *Sender)
+{
+ Name_Choose->Visible=Export_JSON_SideCar->Checked?false:true;
+}
+//---------------------------------------------------------------------------
+
void __fastcall TExportF::Export_MPEG7_SideCarClick(TObject *Sender)
{
Name_Choose->Visible=Export_MPEG7_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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/VCL/GUI_Export.dfm 2018-03-20 00:40:56.000000000 +0100
@@ -403,6 +403,18 @@
OnClick = Export_XML_SideCarClick
end
end
+ object Export_JSON: TTabSheet
+ Caption = 'JSON'
+ object Export_JSON_SideCar: TCheckBox
+ Left = 0
+ Top = 9
+ Width = 597
+ Height = 18
+ Caption = 'Sidecar file (filename.mediainfo.json)'
+ TabOrder = 0
+ OnClick = Export_JSON_SideCarClick
+ end
+ end
object Export_MPEG7: TTabSheet
Caption = 'MPEG-7'
object Export_MPEG7_SideCar: TCheckBox
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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/VCL/GUI_Export.h 2018-03-20 00:40:56.000000000 +0100
@@ -40,6 +40,7 @@
TTabSheet *Export_Text;
TTabSheet *Export_HTML;
TTabSheet *Export_XML;
+ TTabSheet *Export_JSON;
TTabSheet *Export_MPEG7;
TTabSheet *Export_PBCore;
TTabSheet *Export_PBCore2;
@@ -91,6 +92,7 @@
TComboBox *CSV_Decimal;
TSaveDialog *SaveDialog1;
TCheckBox *Export_XML_SideCar;
+ TCheckBox *Export_JSON_SideCar;
TCheckBox *Export_MPEG7_SideCar;
TCheckBox *Export_PBCore_SideCar;
TCheckBox *Export_PBCore2_SideCar;
@@ -113,6 +115,7 @@
void __fastcall CSV_Stream_OtherChange(TObject *Sender);
void __fastcall Export_reVTMD_SideCarClick(TObject *Sender);
void __fastcall Export_XML_SideCarClick(TObject *Sender);
+ void __fastcall Export_JSON_SideCarClick(TObject *Sender);
void __fastcall Export_MPEG7_SideCarClick(TObject *Sender);
void __fastcall Export_PBCore_SideCarClick(TObject *Sender);
void __fastcall Export_PBCore2_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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/VCL/GUI_Main.cpp 2018-03-20 00:40:56.000000000 +0100
@@ -214,6 +214,7 @@
else if (Prefs->Config(__T("Output"))==__T("HTML")) {M_View_HTMLClick(NULL); M_View_HTML->Checked=true;}
else if (Prefs->Config(__T("Output"))==__T("XML")) {M_View_XMLClick(NULL); M_View_XML->Checked=true;}
else if (Prefs->Config(__T("Output"))==__T("MIXML")) {M_View_XMLClick(NULL); M_View_XML->Checked=true;}
+ else if (Prefs->Config(__T("Output"))==__T("JSON")) {M_View_JSONClick(NULL); M_View_JSON->Checked=true;}
else if (Prefs->Config(__T("Output"))==__T("MPEG-7")) {M_View_MPEG7Click(NULL); M_View_MPEG7->Checked=true;}
else if (Prefs->Config(__T("Output"))==__T("PBCore_1.2")) {M_View_PBCoreClick(NULL); M_View_PBCore->Checked=true;}
else if (Prefs->Config(__T("Output"))==__T("PBCore_2.0")) {M_View_PBCore2Click(NULL); M_View_PBCore2->Checked=true;}
@@ -803,6 +804,8 @@
{
if (M_View_XML->Checked)
I->Option_Static(__T("Inform"), __T("MIXML"));
+ else if (M_View_XML->Checked)
+ I->Option_Static(__T("Inform"), __T("JSON"));
else if (M_View_MPEG7->Checked)
I->Option_Static(__T("Inform"), __T("MPEG-7"));
else if (M_View_PBCore->Checked)
@@ -1111,6 +1114,18 @@
ToolBar_View_XML->Checked=true;
ChangePage(Page_Custom);
}
+
+//---------------------------------------------------------------------------
+void __fastcall TMainF::M_View_JSONClick(TObject *Sender)
+{
+ //Language
+ I->Option_Static(__T("Language"), __T("raw"));
+
+ Prefs->Details[Prefs_Custom].Write(__T("JSON"));
+ ToolBar_View_JSON->Checked=true;
+ ChangePage(Page_Custom);
+}
+
//---------------------------------------------------------------------------
void __fastcall TMainF::M_View_MPEG7Click(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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/VCL/GUI_Main.dfm 2018-03-20 00:40:56.000000000 +0100
@@ -2143,6 +2143,12 @@
RadioItem = True
OnClick = M_View_XMLClick
end
+ object M_View_JSON: TMenuItem
+ AutoCheck = True
+ Caption = 'JSON'
+ RadioItem = True
+ OnClick = M_View_JSONClick
+ end
object M_View_MPEG7: TMenuItem
AutoCheck = True
Caption = 'MPEG-7'
@@ -3897,6 +3903,10 @@
Caption = 'XML'
RadioItem = True
end
+ object ToolBar_View_JSON: TMenuItem
+ Caption = 'JSON'
+ RadioItem = True
+ end
object ToolBar_View_MPEG7: TMenuItem
Caption = 'MPEG-7'
RadioItem = True
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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/VCL/GUI_Main.h 2018-03-20 00:40:56.000000000 +0100
@@ -180,6 +180,7 @@
TBitBtn *Donate_zh_TW;
TMenuItem *M_NewVersion;
TMenuItem *M_View_XML;
+ TMenuItem *M_View_JSON;
TMenuItem *M_View_MPEG7;
TMenuItem *M_View_PBCore;
TMenuItem *M_View_PBCore2;
@@ -196,6 +197,7 @@
TToolButton *Tool_Tektronix;
TMenuItem *M_View_reVTMD;
TMenuItem *ToolBar_View_XML;
+ TMenuItem *ToolBar_View_JSON;
TMenuItem *ToolBar_View_MPEG7;
TMenuItem *ToolBar_View_PBCore;
TMenuItem *ToolBar_View_PBCore2;
@@ -276,6 +278,7 @@
void __fastcall M_View_FIMS_1_2Click(TObject *Sender);
void __fastcall M_View_FIMS_1_3Click(TObject *Sender);
void __fastcall M_View_XMLClick(TObject *Sender);
+ void __fastcall M_View_JSONClick(TObject *Sender);
void __fastcall M_TektronixClick(TObject *Sender);
void __fastcall M_View_reVTMDClick(TObject *Sender);
void __fastcall M_Debug_FullParsingClick(TObject *Sender);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfo/Source/GUI/VCL/GUI_Preferences.cpp new/MediaInfo/Source/GUI/VCL/GUI_Preferences.cpp
--- old/MediaInfo/Source/GUI/VCL/GUI_Preferences.cpp 2017-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/VCL/GUI_Preferences.cpp 2018-03-20 00:40:56.000000000 +0100
@@ -132,30 +132,37 @@
}
if (General_Output_Sel->ItemIndex==6)
{
- Prefs->Config(__T("Output"))=__T("MPEG-7");
+ Prefs->Config(__T("Output"))=__T("JSON");
MainF->Page->ActivePage=MainF->Page_Custom;
General_Output_More->Visible=false;
}
+
if (General_Output_Sel->ItemIndex==7)
{
- Prefs->Config(__T("Output"))=__T("PBCore_1.2");
+ Prefs->Config(__T("Output"))=__T("MPEG-7");
MainF->Page->ActivePage=MainF->Page_Custom;
General_Output_More->Visible=false;
}
if (General_Output_Sel->ItemIndex==8)
{
- Prefs->Config(__T("Output"))=__T("PBCore_2.0");
+ Prefs->Config(__T("Output"))=__T("PBCore_1.2");
MainF->Page->ActivePage=MainF->Page_Custom;
General_Output_More->Visible=false;
}
if (General_Output_Sel->ItemIndex==9)
{
- Prefs->Config(__T("Output"))=__T("reVTMD");
+ Prefs->Config(__T("Output"))=__T("PBCore_2.0");
MainF->Page->ActivePage=MainF->Page_Custom;
General_Output_More->Visible=false;
}
if (General_Output_Sel->ItemIndex==10)
{
+ Prefs->Config(__T("Output"))=__T("reVTMD");
+ MainF->Page->ActivePage=MainF->Page_Custom;
+ General_Output_More->Visible=false;
+ }
+ if (General_Output_Sel->ItemIndex==11)
+ {
Prefs->Config(__T("Output"))=__T("Custom");
MainF->Page->ActivePage=MainF->Page_Custom;
General_Output_More->Visible=true;
@@ -508,6 +515,7 @@
General_Output_Sel->Items->Add(Prefs->Translate(__T("Text")).c_str());
General_Output_Sel->Items->Add(Prefs->Translate(__T("HTML")).c_str());
General_Output_Sel->Items->Add("XML");
+ General_Output_Sel->Items->Add("JSON");
General_Output_Sel->Items->Add("MPEG-7");
General_Output_Sel->Items->Add("PBCore_1.2");
General_Output_Sel->Items->Add("PBCore_2.0");
@@ -519,11 +527,12 @@
else if (Prefs->Config(__T("Output"))==__T("Text")) General_Output_Sel->ItemIndex=3;
else if (Prefs->Config(__T("Output"))==__T("HTML")) General_Output_Sel->ItemIndex=4;
else if (Prefs->Config(__T("Output"))==__T("XML")) General_Output_Sel->ItemIndex=5;
- else if (Prefs->Config(__T("Output"))==__T("MPEG-7")) General_Output_Sel->ItemIndex=6;
- else if (Prefs->Config(__T("Output"))==__T("PBCore_1.2")) General_Output_Sel->ItemIndex=7;
- else if (Prefs->Config(__T("Output"))==__T("PBCore_2.0")) General_Output_Sel->ItemIndex=8;
- else if (Prefs->Config(__T("Output"))==__T("reVTMD")) General_Output_Sel->ItemIndex=9;
- else if (Prefs->Config(__T("Output"))==__T("Custom")) General_Output_Sel->ItemIndex=10;
+ else if (Prefs->Config(__T("Output"))==__T("XML")) General_Output_Sel->ItemIndex=6;
+ else if (Prefs->Config(__T("Output"))==__T("MPEG-7")) General_Output_Sel->ItemIndex=7;
+ else if (Prefs->Config(__T("Output"))==__T("PBCore_1.2")) General_Output_Sel->ItemIndex=8;
+ else if (Prefs->Config(__T("Output"))==__T("PBCore_2.0")) General_Output_Sel->ItemIndex=9;
+ else if (Prefs->Config(__T("Output"))==__T("reVTMD")) General_Output_Sel->ItemIndex=10;
+ else if (Prefs->Config(__T("Output"))==__T("Custom")) General_Output_Sel->ItemIndex=11;
//-Advanced
Setup_Advanced->Caption=Prefs->Translate(__T("Advanced")).c_str();
CB_InscrireShell->Caption=Prefs->Translate(__T("Shell extension")).c_str();
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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/WxWidgets/GUI_Main.h 2018-03-20 00:40:56.000000000 +0100
@@ -70,6 +70,7 @@
wxMenuItem* Menu_View_Text;
wxMenuItem* Menu_View_HTML;
wxMenuItem* Menu_View_XML;
+ wxMenuItem* Menu_View_JSON;
wxMenuItem* Menu_View_MPEG7;
wxMenuItem* Menu_View_PBCore_1_2;
wxMenuItem* Menu_View_PBCore_2_0;
@@ -106,6 +107,7 @@
void OnMenu_View_Text (wxCommandEvent &event);
void OnMenu_View_HTML (wxCommandEvent &event);
void OnMenu_View_XML (wxCommandEvent &event);
+ void OnMenu_View_JSON (wxCommandEvent &event);
void OnMenu_View_MPEG7 (wxCommandEvent &event);
void OnMenu_View_PBCore_1_2 (wxCommandEvent &event);
void OnMenu_View_PBCore_2_0 (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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/Source/GUI/WxWidgets/GUI_Main_Menu.cpp 2018-03-20 00:40:56.000000000 +0100
@@ -40,6 +40,7 @@
ID_Menu_View_Text,
ID_Menu_View_HTML,
ID_Menu_View_XML,
+ ID_Menu_View_JSON,
ID_Menu_View_MPEG7,
ID_Menu_View_PBCore_1_2,
ID_Menu_View_PBCore_2_0,
@@ -75,6 +76,7 @@
EVT_MENU(ID_Menu_View_Text, GUI_Main::OnMenu_View_Text)
EVT_MENU(ID_Menu_View_HTML, GUI_Main::OnMenu_View_HTML)
EVT_MENU(ID_Menu_View_XML, GUI_Main::OnMenu_View_XML)
+ EVT_MENU(ID_Menu_View_JSON, GUI_Main::OnMenu_View_JSON)
EVT_MENU(ID_Menu_View_MPEG7, GUI_Main::OnMenu_View_MPEG7)
EVT_MENU(ID_Menu_View_PBCore_1_2, GUI_Main::OnMenu_View_PBCore_1_2)
EVT_MENU(ID_Menu_View_PBCore_2_0, GUI_Main::OnMenu_View_PBCore_2_0)
@@ -134,6 +136,7 @@
Menu_View_Text =Menu_View->AppendRadioItem(ID_Menu_View_Text, __T("Text"));
Menu_View_HTML =Menu_View->AppendRadioItem(ID_Menu_View_HTML, __T("HTML"));
Menu_View_XML =Menu_View->AppendRadioItem(ID_Menu_View_XML, __T("XML"));
+ Menu_View_JSON =Menu_View->AppendRadioItem(ID_Menu_View_JSON, __T("JSON"));
Menu_View_MPEG7 =Menu_View->AppendRadioItem(ID_Menu_View_MPEG7, __T("MPEG-7"));
Menu_View_PBCore_1_2 =Menu_View->AppendRadioItem(ID_Menu_View_PBCore_1_2, __T("PBCore 1.2"));
Menu_View_PBCore_2_0 =Menu_View->AppendRadioItem(ID_Menu_View_PBCore_2_0, __T("PBCore 2.0"));
@@ -291,6 +294,17 @@
//Showing
GUI_Main_Common_Core* View_New = new GUI_Main_Text(C, this);
+ delete View; View = View_New;
+}
+
+//---------------------------------------------------------------------------
+void GUI_Main::OnMenu_View_JSON(wxCommandEvent& WXUNUSED(event))
+{
+ //Configuring
+ C->Menu_View_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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/Source/Install/MediaInfo_GUI_Windows.nsi 2018-03-20 00:40:58.000000000 +0100
@@ -5,7 +5,7 @@
; Some defines
!define PRODUCT_NAME "MediaInfo"
!define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "17.12"
+!define PRODUCT_VERSION "18.03"
!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.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-12-21 09:50:40.000000000 +0100
+++ new/MediaInfo/debian/changelog 2018-03-20 00:40:58.000000000 +0100
@@ -1,6 +1,6 @@
-mediainfo (17.12-1) experimental; urgency=medium
+mediainfo (18.03-1) experimental; urgency=medium
- * Upstream version 17.12
+ * Upstream version 18.03
For details, see https://github.com/MediaArea/MediaInfo/blob/master/History_GUI.txt
-- MediaArea 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-12-21 09:50:38.000000000 +0100
+++ new/MediaInfo/debian/control 2018-03-20 00:40:58.000000000 +0100
@@ -4,7 +4,7 @@
Maintainer: MediaArea.net SARL
Build-Depends: debhelper (>= 9),
dh-autoreconf,
- libmediainfo-dev (>= 17.10),
+ libmediainfo-dev (>= 18.03),
libzen-dev (>= 0.4.37),
libwxgtk3.0-dev,
zlib1g-dev,
@@ -16,7 +16,7 @@
Package: mediainfo
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 17.10), libzen0 (>= 0.4.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 18.03), 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 (>= 17.10), libzen0 (>= 0.4.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmediainfo0 (>= 18.03), 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.