Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.12.3.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.14.0.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.12.3.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.14.0.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.12.3.tar.xz/src/share/appdata.tar -> makemkv-bin-1.14.0.tar.xz/src/share/appdata.tar Changed

makemkv-bin-1.12.3.tar.xz/src/share/blues.jar -> makemkv-bin-1.14.0.tar.xz/src/share/blues.jar Changed

makemkv-oss-1.12.3.tar.xz/Makefile.in -> makemkv-oss-1.14.0.tar.xz/Makefile.in Changed

makemkv-oss-1.12.3.tar.xz/libabi/inc/lgpl/osslabi.h -> makemkv-oss-1.14.0.tar.xz/libabi/inc/lgpl/osslabi.h Changed

makemkv-oss-1.12.3.tar.xz/libabi/inc/lgpl/sysabi.h -> makemkv-oss-1.14.0.tar.xz/libabi/inc/lgpl/sysabi.h Changed

makemkv-oss-1.12.3.tar.xz/libabi/pssl/ec_lcl.h -> makemkv-oss-1.14.0.tar.xz/libabi/pssl/ec_lcl.h Changed

makemkv-oss-1.12.3.tar.xz/libabi/pssl/ecp_smpl.c -> makemkv-oss-1.14.0.tar.xz/libabi/pssl/ecp_smpl.c Changed

@@ -660,6 +660,93 @@
 	}
 
 
+static int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)
+	{
+	const BIGNUM *p;
+	BN_CTX *new_ctx = NULL;
+	BIGNUM *rh, *tmp, *Z4, *Z6;
+	int ret = -1;
+
+	if (EC_POINT_is_at_infinity(group, point))
+		return 1;
+	
+	p = group->field;
+
+	if (ctx == NULL)
+		{
+		ctx = new_ctx = BN_CTX_new();
+		if (ctx == NULL)
+			return -1;
+		}
+
+	BN_CTX_start(ctx);
+	rh = BN_CTX_get(ctx);
+	tmp = BN_CTX_get(ctx);
+	Z4 = BN_CTX_get(ctx);
+	Z6 = BN_CTX_get(ctx);
+	if (Z6 == NULL) goto err;
+
+	/* We have a curve defined by a Weierstrass equation
+	 *      y^2 = x^3 + a*x + b.
+	 * The point to consider is given in Jacobian projective coordinates
+	 * where  (X, Y, Z)  represents  (x, y) = (X/Z^2, Y/Z^3).
+	 * Substituting this and multiplying by  Z^6  transforms the above equation into
+	 *      Y^2 = X^3 + a*X*Z^4 + b*Z^6.
+	 * To test this, we add up the right-hand side in 'rh'.
+	 */
+
+	/* rh := X^2 */
+    if (!ec_GFp_mont_field_sqr(group,rh,point->X,ctx)) goto err;
+
+	if (!point->Z_is_one)
+		{
+		if (!ec_GFp_mont_field_sqr(group, tmp, point->Z, ctx)) goto err;
+		if (!ec_GFp_mont_field_sqr(group, Z4, tmp, ctx)) goto err;
+		if (!ec_GFp_mont_field_mul(group, Z6, Z4, tmp, ctx)) goto err;
+
+		/* rh := (rh + a*Z^4)*X */
+		if (group->a_is_minus3)
+			{
+			if (!BN_mod_lshift1_quick(tmp, Z4, p)) goto err;
+			if (!BN_mod_add_quick(tmp, tmp, Z4, p)) goto err;
+			if (!BN_mod_sub_quick(rh, rh, tmp, p)) goto err;
+            if (!ec_GFp_mont_field_mul(group,rh,rh,point->X,ctx)) goto err;
+			}
+		else
+			{
+			if (!ec_GFp_mont_field_mul(group, tmp, Z4, group->a, ctx)) goto err;
+			if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;
+			if (!ec_GFp_mont_field_mul(group, rh, rh, point->X, ctx)) goto err;
+			}
+
+		/* rh := rh + b*Z^6 */
+		if (!ec_GFp_mont_field_mul(group, tmp, group->b, Z6, ctx)) goto err;
+		if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;
+		}
+	else
+		{
+		/* point->Z_is_one */
+
+		/* rh := (rh + a)*X */
+		if (!BN_mod_add_quick(rh, rh, group->a, p)) goto err;
+		if (!ec_GFp_mont_field_mul(group, rh, rh, point->X, ctx)) goto err;
+		/* rh := rh + b */
+		if (!BN_mod_add_quick(rh, rh, group->b, p)) goto err;
+		}
+
+	/* 'lh' := Y^2 */
+	if (!ec_GFp_mont_field_sqr(group, tmp, point->Y, ctx)) goto err;
+
+	ret = (0 == BN_ucmp(tmp, rh));
+
+ err:
+	BN_CTX_end(ctx);
+	if (new_ctx != NULL)
+		BN_CTX_free(new_ctx);
+	return ret;
+	}
+
+
 static int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
 	{
 	/* return values:

makemkv-oss-1.12.3.tar.xz/libabi/src/ossl_ec.c -> makemkv-oss-1.14.0.tar.xz/libabi/src/ossl_ec.c Changed

makemkv-oss-1.12.3.tar.xz/libabi/src/sys_linux.c -> makemkv-oss-1.14.0.tar.xz/libabi/src/sys_linux.c Changed

@@ -27,6 +27,16 @@
 #include <sys/vfs.h>
 #include <linux/msdos_fs.h>
 
+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+#if (__GLIBC__>=2) && (__GLIBC_MINOR__>=24)
+#define SYSABI_USE_READDIR
+#endif
+#endif
+
+#if !defined(SYSABI_USE_READDIR) && !defined(SYSABI_USE_READDIR_R)
+#define SYSABI_USE_READDIR_R
+#endif
+
 static void statcvt(SYS_stat *buf,struct stat64 *st)
 {
 buf->st_mode = st->st_mode;
@@ -67,27 +77,32 @@
 
 int SYS_readdir(void* dirp,SYS_dirent *entry)
 {
- int err;
 size_t slen;
 struct dirent64 *pent;
+#ifdef SYSABI_USE_READDIR_R
+ int err;
 struct _data {
 struct dirent64 ent;
 char pad[8];
 } data;
+#endif
 
+#ifdef SYSABI_USE_READDIR_R
 pent = NULL;
-
 err = readdir64_r(dirp,&data.ent,&pent);
-
 if (err) return err;
+ data.ent.d_name[sizeof(data.ent.d_name)-1]=0;
+#else
+ pent = readdir64(dirp);
+#endif
+
 if (pent==NULL) return -1;
 
 entry->d_type = pent->d_type;
- data.ent.d_name[sizeof(data.ent.d_name)-1]=0;
- slen = strlen(data.ent.d_name);
+ slen = strlen(pent->d_name);
 if (slen>258) slen=258;
 
- memcpy(entry->d_name,data.ent.d_name,slen);
+ memcpy(entry->d_name,pent->d_name,slen);
 entry->d_name[slen]=0;
 
 return 0;

makemkv-oss-1.12.3.tar.xz/libffabi/inc/lgpl/ffabi.h -> makemkv-oss-1.14.0.tar.xz/libffabi/inc/lgpl/ffabi.h Changed

makemkv-oss-1.12.3.tar.xz/libffabi/src/ffabi.c -> makemkv-oss-1.14.0.tar.xz/libffabi/src/ffabi.c Changed

@@ -158,9 +158,11 @@
 return 0;
 }
 
-uint32_t __cdecl ffm_avcodec_version3(void)
+uint64_t __cdecl ffm_avcodec_version3(void)
 {
- return avcodec_version();
+ const uint32_t flags = FFABI_VERSION_FLAG_PATCHLEVEL_VALUE;
+ uint32_t version = avcodec_version()&0x7fffffff;
+ return (((uint64_t)flags)<<32) | version | 0x80000000;
 }
 
 #ifdef FFABI_AVCODEC_OLD_API
@@ -643,12 +645,19 @@
 
 #else
 
+static void ffm_frame_clean(AVFrame* frame)
+{
+ frame->extended_data = NULL;
+ frame->data[0] = (uint8_t*)(((uintptr_t)0)-3);
+ frame->linesize[0] = 0x7ffffff1;
+ frame->nb_samples = 0x7ffffff2;
+}
+
 int __cdecl ffm_audio_encode_put_frame(FFM_AudioEncodeContext* ctx,const uint8_t* frame_data[],unsigned int frame_size,unsigned int nb_samples,uint64_t pts)
 {
 int r;
 
 if (frame_data) {
- av_frame_unref(ctx->frame);
 
 ctx->frame->format = ctx->avctx->sample_fmt;
 #ifdef FFABI_HAVE_AV_FRAME_CHANNELS
@@ -676,6 +685,9 @@
 }
 
 r = avcodec_send_frame(ctx->avctx,ctx->frame);
+
+ ffm_frame_clean(ctx->frame);
+
 } else {
 if (!ctx->eos)
 {

makemkv-oss-1.12.3.tar.xz/libmakemkv/inc/lgpl/world.h -> makemkv-oss-1.14.0.tar.xz/libmakemkv/inc/lgpl/world.h Changed

makemkv-oss-1.12.3.tar.xz/libmakemkv/src/libmakemkv.vers -> makemkv-oss-1.14.0.tar.xz/libmakemkv/src/libmakemkv.vers Changed

makemkv-oss-1.12.3.tar.xz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.14.0.tar.xz/libmakemkv/src/libmkv.cpp Changed

makemkv-oss-1.12.3.tar.xz/libmmbd/inc/libmmbd/mmbd.h -> makemkv-oss-1.14.0.tar.xz/libmmbd/inc/libmmbd/mmbd.h Changed

makemkv-oss-1.12.3.tar.xz/libmmbd/src/aacs.cpp -> makemkv-oss-1.14.0.tar.xz/libmmbd/src/aacs.cpp Changed

@@ -44,12 +44,25 @@
 fflush(stderr);
 }
 
+#ifdef MMBD_WIN32_DEBUG
+#include <Windows.h>
+static void __cdecl windbg_print(void* user_context,uint32_t flags,const char* ,const uint16_t* messageW)
+{
+ OutputDebugStringW((LPCWSTR)messageW);
+ OutputDebugStringW(L"\n");
+}
+#endif
+
 static mmbd_output_proc_t get_output_proc()
 {
 if (getenv("MMBD_TRACE")) {
 return stderr_print;
 } else {
+#ifdef MMBD_WIN32_DEBUG
+ return windbg_print;
+#else
 return NULL;
+#endif
 }
 }
 
@@ -97,8 +110,41 @@
 return (AACS*)mmbd;
 }
 
+static int __cdecl mmbd_aacs_read_file(void** user_data,const char* file_path,uint8_t* buffer,uint64_t offset,unsigned int size)
+{
+ void* handle;
+ AACS_FILE_OPEN2 proc2;
+ AACS_FILE_H* file = NULL;
+ int r;
+
+ handle = user_data[0];
+ proc2 = (AACS_FILE_OPEN2)user_data[1];
+
+ if (NULL!=proc2)
+ {
+ file = (*proc2)(handle,file_path);
+ }
+ if (NULL==file)
+ {
+ return -1;
+ }
+ if (file->seek(file,offset,SEEK_SET)!=offset)
+ {
+ file->close(file);
+ return -1;
+ }
+
+ r = (int) file->read(file,buffer,size);
+
+ file->close(file);
+
+ return r;
+}
+
 AACS_PUBLIC int __cdecl aacs_open_device(AACS *aacs, const char *path, const char *keyfile_path)
 {
+ int err;
+
 if (keyfile_path) {
 const char* args[3];
 
@@ -109,8 +155,14 @@
 return AACS_ERROR_NO_CONFIG;
 }
 }
+ if (NULL==path)
+ {
+ err = mmbd_open_autodiscover((MMBD*)aacs,mmbd_aacs_read_file);
+ } else {
+ err = mmbd_open((MMBD*)aacs,path);
+ }
 
- if (mmbd_open((MMBD*)aacs,path)) {
+ if (err) {
 return AACS_ERROR_CORRUPTED_DISC;
 }
 
@@ -189,14 +241,17 @@
 return (const uint8_t *)"mmbd_fake_aacs_get_bdj_root_cert_hash";
 }
 
-AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *handle, void* p)
+AACS_PUBLIC void __cdecl aacs_set_fopen(AACS *aacs, void *handle, AACS_FILE_OPEN2 p)
 {
+ void** p_user_data = mmbd_user_data((MMBD*)aacs);
+ p_user_data[0] = handle;
+ p_user_data[1] = (void*)p;
 }
 
-static void* file_open = NULL;
-AACS_PUBLIC void* __cdecl aacs_register_file(void* p)
+static AACS_FILE_OPEN file_open = NULL;
+AACS_PUBLIC AACS_FILE_OPEN __cdecl aacs_register_file(AACS_FILE_OPEN p)
 {
- void* old = file_open;
+ AACS_FILE_OPEN old = file_open;
 file_open = p;
 return old;
 }

makemkv-oss-1.12.3.tar.xz/libmmbd/src/aacs.h -> makemkv-oss-1.14.0.tar.xz/libmmbd/src/aacs.h Changed

makemkv-oss-1.14.0.tar.xz/libmmbd/src/filesystem.h Added

@@ -0,0 +1,72 @@
+/*
+ * This file is part of libaacs
+ * Copyright (C) 2009-2010 Obliter0n
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AACS_FILESYSTEM_H_
+#define AACS_FILESYSTEM_H_
+
+#include <stdint.h>
+
+typedef struct aacs_file_s AACS_FILE_H;
+struct aacs_file_s
+{
+ void* internal;
+ void (__cdecl *close)(AACS_FILE_H *file);
+ int64_t (__cdecl *seek)(AACS_FILE_H *file, int64_t offset, int32_t origin);
+ int64_t (__cdecl *tell)(AACS_FILE_H *file);
+ int (__cdecl *eof)(AACS_FILE_H *file);
+ int64_t (__cdecl *read)(AACS_FILE_H *file, uint8_t *buf, int64_t size);
+ int64_t (__cdecl *write)(AACS_FILE_H *file, const uint8_t *buf, int64_t size);
+};
+
+typedef AACS_FILE_H* (__cdecl *AACS_FILE_OPEN)(const char* filename, const char *mode);
+
+/**
+ *
+ * Register function pointer that will be used to open a file
+ *
+ * @param p function pointer
+ * @return previous function pointer registered
+ */
+AACS_PUBLIC AACS_FILE_OPEN __cdecl aacs_register_file(AACS_FILE_OPEN p);
+
+/**
+ *
+ * Function that will be used to open a file
+ *
+ * NOTE: file name is relative to disc root directory !
+ *
+ * @param handle application-specific handle
+ * @param filename file to open
+ * @return pointer to AACS_FILE_H, NULL if error
+ */
+typedef AACS_FILE_H* (__cdecl *AACS_FILE_OPEN2)(void *handle, const char* filename);
+
+/**
+ *
+ * Register function pointer that will be used to open a file
+ *
+ * @param aacs aacs instance
+ * @param handle handle that will be passed to file open function
+ * @param p function pointer
+ */
+struct aacs;
+AACS_PUBLIC void __cdecl aacs_set_fopen(struct aacs *aacs, void *handle, AACS_FILE_OPEN2 p);
+
+
+#endif /* AACS_FILESYSTEM_H_ */

makemkv-oss-1.12.3.tar.xz/libmmbd/src/mmbd.cpp -> makemkv-oss-1.14.0.tar.xz/libmmbd/src/mmbd.cpp Changed

@@ -31,13 +31,11 @@
 */
 MMBD_PUBLIC MMBD* __cdecl mmbd_create_context(void* user_context,mmbd_output_proc_t output_proc,const char* argp[])
 {
-    CMMBDConn* mmbd = (CMMBDConn*)malloc(sizeof(CMMBDConn));
+    CMMBDConn* mmbd = CMMBDConn::create_instance(output_proc,user_context);
     if (!mmbd) {
         return NULL;
     }
 
-    new(mmbd) CMMBDConn(output_proc,user_context);
-
     if (!mmbd->initialize(argp)) {
         free(mmbd);
         return NULL;
@@ -55,11 +53,7 @@
 
     CMMBDConn* p = ((CMMBDConn*)mmbd);
 
-    p->terminate();
-    p->~CMMBDConn();
-
-    memset(mmbd,0xbb,sizeof(CMMBDConn));
-    free(mmbd);
+    CMMBDConn::destroy_instance(p);
 }
 
 /*  mmbd_get_engine_version_string
@@ -186,3 +180,28 @@
     if (!((CMMBDConn*)mmbd)->reinitialize(argp)) return -2;
     return 0;
 }
+
+/*  mmbd_user_data
+    An internal support function for libaacs emulation
+*/
+MMBD_PUBLIC void** __cdecl mmbd_user_data(MMBD *mmbd)
+{
+    if (mmbd==NULL) return NULL;
+    return ((CMMBDConn*)mmbd)->user_data();
+}
+
+/*  mmbd_open_autodiscover
+    Opens a disc, same as mmbd_open except it tries to discover
+    device path automatically. This API is mainly for libaacs
+    emulation, do not use this function.
+    read_file_proc  - a user-provided function that can read
+                      any file from the disc.
+    Return value    - 0 if success, non-zero if failed
+*/
+MMBD_PUBLIC int __cdecl mmbd_open_autodiscover(MMBD *mmbd,mmbd_read_file_proc_t read_file_proc)
+{
+    if (mmbd==NULL) return -1;
+
+    return ((CMMBDConn*)mmbd)->open_auto(read_file_proc);
+}
+

makemkv-oss-1.12.3.tar.xz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.14.0.tar.xz/libmmbd/src/mmconn.cpp Changed

@@ -25,6 +25,27 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+/*static*/ CMMBDConn* CMMBDConn::create_instance(mmbd_output_proc_t OutputProc,void* OutputUserContext)
+{
+ CMMBDConn* mmbd = (CMMBDConn*)malloc(sizeof(CMMBDConn));
+ if (!mmbd) {
+ return NULL;
+ }
+ new(mmbd)CMMBDConn(OutputProc,OutputUserContext);
+
+ return mmbd;
+}
+
+/*static*/ void CMMBDConn::destroy_instance(CMMBDConn* p)
+{
+ p->terminate();
+ p->~CMMBDConn();
+
+ memset((void*)p,0xbb,sizeof(CMMBDConn));
+ free(p);
+}
+
+
 CMMBDConn::CMMBDConn(mmbd_output_proc_t OutputProc,void* OutputUserContext)
 : m_output_proc(OutputProc)
 , m_output_context(OutputUserContext)
@@ -34,6 +55,7 @@
 , m_clip_count(0)
 , m_active(false)
 , m_job(false)
+ , m_scan_ctx(NULL)
 {
 m_apc.SetUiNotifier(this);
 encode_handle(m_ipc_handle,this);
@@ -41,6 +63,8 @@
 m_last_clip_info[0]=0xffffffff;
 m_auto_clip_info[0]=0;
 m_auto_clip_info[1]=0x0000ffff;
+
+ memset(m_user_data,0,sizeof(m_user_data));
 }
 
 CMMBDConn::~CMMBDConn()
@@ -103,23 +127,31 @@
 return convertArg(argp,&CMMBDConn::initializeU);
 }
 
-bool CMMBDConn::initializeU(const uint16_t* argp[])
+bool CMMBDConn::launch()
 {
- const utf16_t* p;
- char strbuf[300],*pd,*pe;
+ char strbuf[300];
 unsigned int err;
 const char* errtxt;
 
 if (!m_apc.Init('C',":makemkvcon",&err)) {
- switch(err) {
- case 1: errtxt="Can't locate makemkvcon executable"; break;
- case 2: errtxt="Version mismatch"; break;
- default: errtxt="Unknown error"; break;
+ switch (err) {
+ case 1: errtxt="Can't locate makemkvcon executable"; break;
+ case 2: errtxt="Version mismatch"; break;
+ default: errtxt="Unknown error"; break;
 }
 sprintf_s(strbuf,sizeof(strbuf),"Failed to launch MakeMKV in background : %s",errtxt);
 error_message(err,strbuf);
 return false;
 }
+ return true;
+}
+
+bool CMMBDConn::initializeU(const uint16_t* argp[])
+{
+ const utf16_t* p;
+ char strbuf[300],*pd,*pe;
+
+ if (!launch()) return false;
 
 if (!m_apc.InitMMBD(argp)) {
 error_message(20,"MakeMKV initialization failed");
@@ -312,6 +344,10 @@
 
 void CMMBDConn::UpdateDrive(unsigned int Index,const utf16_t *DriveName,AP_DriveState DriveState,const utf16_t *DiskName,const utf16_t *DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize)
 {
+ if ((NULL!=m_scan_ctx) && (AP_DriveStateInserted==DriveState))
+ {
+ m_scan_ctx->TestDisc(DeviceName,DiskData,DiskDataSize);
+ }
 }
 
 int CMMBDConn::ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text)
@@ -381,7 +417,7 @@
 return m_clip_info+first*2;
 }
 
-void CMMBDConn::error_message(uint32_t error_code,const char* message)
+void CMMBDConn::message_worker(uint32_t error_code,const char* message)
 {
 if (!m_output_proc) return;
 
@@ -390,7 +426,7 @@
 
 utf8toutf16(buffer,len,message,strlen(message)+1);
 
- (*m_output_proc)(m_output_context,error_code|MMBD_MESSAGE_FLAG_MMBD_ERROR,message,buffer);
+ (*m_output_proc)(m_output_context,error_code,message,buffer);
 }
 
 void CMMBDConn::reset_cpsid()
@@ -508,3 +544,127 @@
 return ((m_disc_flags&AP_MMBD_DISC_FLAG_BUSENC)!=0);
 }
 
+int CMMBDConn::open_auto(mmbd_read_file_proc_t read_file_proc)
+{
+ ScanContext scan_ctx(this->m_user_data,read_file_proc);
+
+ CMMBDConn* mmbd_scan = CMMBDConn::create_instance(this->m_output_proc,this->m_output_context);
+ if (!mmbd_scan) {
+ return -1;
+ }
+
+ warning_message(31,"No device path provided, scanning all inserted discs...");
+
+ if (!mmbd_scan->launch())
+ {
+ CMMBDConn::destroy_instance(mmbd_scan);
+ return -2;
+ }
+ mmbd_scan->m_active = true;
+
+ mmbd_scan->m_scan_ctx = &scan_ctx;
+ if (!mmbd_scan->m_apc.UpdateAvailableDrives())
+ {
+ mmbd_scan->m_scan_ctx = NULL;
+ CMMBDConn::destroy_instance(mmbd_scan);
+ return -31;
+ }
+
+ mmbd_scan->WaitJob();
+ mmbd_scan->WaitJob();
+
+ mmbd_scan->m_scan_ctx = NULL;
+ CMMBDConn::destroy_instance(mmbd_scan);
+
+ const uint16_t* locator = scan_ctx.GetLocator();
+ if (!locator)
+ {
+ error_message(30,"Failed to locate disc using user-specified file access callback");
+ return -30;
+ }
+
+ return openU(locator);
+}
+
+CMMBDConn::ScanContext::ScanContext(void** user_data,mmbd_read_file_proc_t file_proc)
+{
+ m_user_data = user_data;
+ m_file_proc = file_proc;
+ m_auto_locator[0]=0;
+ m_cache_mkb.size=0;
+ m_cache_cert0.size=0;
+}
+
+const uint16_t* CMMBDConn::ScanContext::GetLocator()
+{
+ if (0==m_auto_locator[0]) return NULL;
+ return m_auto_locator;
+}
+
+void CMMBDConn::ScanContext::TestDisc(const utf16_t *DeviceName,const void* DiskData,unsigned int DiskDataSize)
+{
+ DriveInfoItem item_mkb,item_cert0;
+
+ if (0!=m_auto_locator[0]) return;
+ if (0==DiskDataSize) return;
+
+ item_mkb.Id=0;
+ item_cert0.Id=0;
+
+ for (unsigned int offset=0; offset!=DiskDataSize; offset+=DriveInfoList_GetSerializedChunkSize(((const char*)DiskData) + offset))
+ {
+ DriveInfoItem item;
+ DriveInfoList_GetSerializedChunkInfo(((const char*)DiskData) + offset,&item);
+ switch ((uint32_t)item.Id)
+ {
+ case 0x05102201:
+ item_mkb=item;
+ break;
+ case 0x05102203:
+ item_cert0=item;
+ break;
+ }
+ }
+
+ if (item_cert0.Id!=0)
+ {
+ if (false==CompareItem(&item_cert0,&m_cache_cert0,"/AACS/Content000.cer")) return;
+ }
+ if (item_mkb.Id!=0)
+ {
+ if (false==CompareItem(&item_mkb,&m_cache_mkb,"/AACS/MKB_RO.inf")) return;
+ } else {
+ return;
+ }
+
+ // found!
+ size_t len = utf16len(DeviceName);
+ if (len>(MaxLocatorLen-4)) return;
+
+ m_auto_locator[0]='d';
+ m_auto_locator[1]='e';
+ m_auto_locator[2]='v';
+ m_auto_locator[3]=':';
+ memcpy(m_auto_locator+4,DeviceName,(len+1)*sizeof(uint16_t));
+ return;
+}
+
+bool CMMBDConn::ScanContext::CompareItem(const DriveInfoItem* item,CMMBDConn::cache_entry_t* cache_entry,const char* file_name)
+{
+ unsigned int cmp_size = item->Size;
+
+ if (cmp_size>sizeof(cache_entry->data)) cmp_size = sizeof(cache_entry->data);
+
+ if ((cache_entry->size<cmp_size) || (cache_entry->offset!=0))
+ {
+ cache_entry->size = 0;
+ if (cmp_size!=this->m_file_proc(m_user_data,file_name,cache_entry->data,0,cmp_size))
+ {
+ return false;
+ }
+ cache_entry->offset = 0;
+ cache_entry->size = cmp_size;
+ }
+
+ return (0==memcmp(cache_entry->data,item->Data,cmp_size));
+}

makemkv-oss-1.12.3.tar.xz/libmmbd/src/mmconn.h -> makemkv-oss-1.14.0.tar.xz/libmmbd/src/mmconn.h Changed

@@ -21,12 +21,34 @@
 #include <stdint.h>
 #include <lgpl/aproxy.h>
 #include <libmmbd/mmbd.h>
+#include <driveio/driveio.h>
 #include "crypto.h"
 #include "mmbdipc.h"
 
 class CMMBDConn : private CApClient::INotifier , public IMMBDIpc
 {
 static const uint32_t BD_SECTOR_SIZE = 2048;
+ typedef struct _cache_entry_t
+ {
+ uint64_t offset;
+ unsigned int size;
+ uint8_t data[128];
+ } cache_entry_t;
+ class ScanContext
+ {
+ static const unsigned int MaxLocatorLen = 63;
+ private:
+ void** m_user_data;
+ mmbd_read_file_proc_t m_file_proc;
+ uint16_t m_auto_locator[MaxLocatorLen+1];
+ cache_entry_t m_cache_mkb;
+ cache_entry_t m_cache_cert0;
+ public:
+ ScanContext(void** user_data,mmbd_read_file_proc_t file_proc);
+ const uint16_t* GetLocator();
+ void TestDisc(const utf16_t *DeviceName,const void* DiskData,unsigned int DiskDataSize);
+ bool CompareItem(const DriveInfoItem* item,CMMBDConn::cache_entry_t* cache_entry,const char* file_name);
+ };
 private:
 CMMBDApClient m_apc;
 mmbd_output_proc_t m_output_proc;
@@ -44,8 +66,10 @@
 uint32_t m_mkb_version;
 bool m_active;
 bool m_job;
-public:
- inline void* operator new(size_t,CMMBDConn* p) {
+ ScanContext* m_scan_ctx;
+ void* m_user_data[4];
+private:
+ inline void* operator new(size_t,CMMBDConn* p){
 return p;
 }
 inline void operator delete(void*,CMMBDConn*) {
@@ -54,13 +78,19 @@
 }
 CMMBDConn(mmbd_output_proc_t OutputProc,void* OutputUserContext);
 ~CMMBDConn();
+public:
+ static CMMBDConn* create_instance(mmbd_output_proc_t OutputProc,void* OutputUserContext);
+ static void destroy_instance(CMMBDConn*);
+public:
 bool initialize(const char* argp[]);
 bool initializeU(const uint16_t* argp[]);
 bool reinitialize(const char* argp[]);
 bool reinitializeU(const uint16_t* argp[]);
+ bool launch();
 const char* get_version_string();
 int open(const char *prefix,const char *locator);
 int openU(const uint16_t *locator);
+ int open_auto(mmbd_read_file_proc_t read_file_proc);
 int close();
 void terminate();
 int decrypt_unit(uint32_t name_flags,uint64_t file_offset,uint8_t* buf);
@@ -70,6 +100,7 @@
 int mmbdipc_version();
 const uint8_t* get_encoded_ipc_handle();
 int get_busenc();
+ inline void** user_data() { return m_user_data; }
 private:
 void SetTotalName(unsigned long Name);
 void UpdateCurrentBar(unsigned int Value);
@@ -87,7 +118,15 @@
 private:
 void WaitJob();
 uint32_t* GetClipInfo(uint32_t Name);
- void error_message(uint32_t error_code,const char* message);
+ void message_worker(uint32_t error_code,const char* message);
 bool convertArg(const char* argp[],CMMBDConn::argp_proc_t Proc);
+ inline void error_message(uint32_t error_code,const char* message)
+ {
+ message_worker(error_code|MMBD_MESSAGE_FLAG_MMBD_ERROR,message);
+ }
+ inline void warning_message(uint32_t error_code,const char* message)
+ {
+ message_worker(error_code|MMBD_MESSAGE_FLAG_WARNING,message);
+ }
 };

makemkv-oss-1.12.3.tar.xz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.14.0.tar.xz/makemkvgui/inc/lgpl/apdefs.h Changed

@@ -48,6 +48,8 @@
 static const unsigned int AP_vastr_OpenFileFilter=17;
 static const unsigned int AP_vastr_WebSiteURL=18;
 static const unsigned int AP_vastr_OpenDVDFileFilter=19;
+static const unsigned int AP_vastr_DefaultSelectionString=20;
+static const unsigned int AP_vastr_DefaultOutputFileName=21;
 //
 typedef enum _AP_ItemAttributeId
 {
@@ -288,9 +290,9 @@
 static const unsigned long APP_IFACE_SETTINGS_TAB_ADVANCED=6172;
 static const unsigned long APP_IFACE_SETTINGS_ADV_DEFAULT_PROFILE=6173;
 static const unsigned long APP_IFACE_SETTINGS_ADV_DEFAULT_SELECTION=6174;
-static const unsigned long APP_IFACE_SETTINGS_ADV_FFMPEG_PATH=6175;
-static const unsigned long APP_IFACE_SETTINGS_ADV_DTSHDDEC_PATH=6176;
+static const unsigned long APP_IFACE_SETTINGS_ADV_EXTERN_EXEC_PATH=6175;
 static const unsigned long APP_IFACE_SETTINGS_PROT_JAVA_PATH=6177;
+static const unsigned long APP_IFACE_SETTINGS_ADV_OUTPUT_FILE_NAME_TEMPLATE=6178;
 static const unsigned long APP_IFACE_BACKUPDLG_TEXT_CAPTION=6137;
 static const unsigned long APP_IFACE_BACKUPDLG_TEXT=6138;
 static const unsigned long APP_IFACE_BACKUPDLG_FOLDER=6139;
@@ -401,12 +403,13 @@
   apset_app_DefaultProfileName ,
   apset_app_DefaultSelectionString ,
   apset_app_Java ,
-  apset_app_old00 ,
+  apset_app_ccextractor ,
   apset_app_SiteInfoString ,
   apset_path_OpenFile ,
   apset_path_DestDir ,
   apset_path_BackupDirMRU ,
   apset_path_DestDirMRU ,
+  apset_app_DefaultOutputFileName ,
   apset_MaxValue
 } ApSettingId;

makemkv-oss-1.12.3.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.14.0.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/dirselectbox.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/dirselectbox.cpp Changed

@@ -161,13 +161,9 @@
 
 void CDirSelectBox::setText(const QString &Text,bool AddMRU)
 {
- if (AddMRU) {
- addMRU(Text,true);
- lineEditDir->setText(Text);
- comboBoxDir->setCurrentIndex(0);
- } else {
- lineEditDir->setText(Text);
- }
+ addMRU(Text,AddMRU,true);
+ lineEditDir->setText(Text);
+ comboBoxDir->setCurrentIndex(0);
 EmitValidChanged();
 emit SignalChanged();
 }
@@ -211,7 +207,7 @@
 if (AppendLast) {
 path = append(path,AppendLast);
 }
- addMRU(path,false);
+ addMRU(path,true,false);
 }
 if (*end==0) break;
 start = end+1;
@@ -260,7 +256,7 @@
 toolButtonAction->setEnabled(Enabled);
 }
 
-void CDirSelectBox::addMRU(const QString &Text,bool Top)
+void CDirSelectBox::addMRU(const QString &Text,bool Persistent,bool Top)
 {
 int count = comboBoxDir->count();
 
@@ -272,7 +268,7 @@
 if (Text == comboBoxDir->itemText(i)) {
 if (Top) {
 comboBoxDir->removeItem(i);
- comboBoxDir->insertItem(0,Text);
+ comboBoxDir->insertItem(0,Text,QVariant(Persistent));
 };
 added = true;
 break;
@@ -288,7 +284,7 @@
 }
 
 if (!added) {
- comboBoxDir->insertItem(Top?0:comboBoxDir->count(),Text);
+ comboBoxDir->insertItem(Top?0:comboBoxDir->count(),Text,QVariant(Persistent));
 }
 }
 
@@ -301,6 +297,7 @@
 
 for (int i=0;i<count;i++)
 {
+ if (!comboBoxDir->itemData(i).toBool()) continue;
 len += 1;
 len += comboBoxDir->itemText(i).length();
 }
@@ -314,6 +311,8 @@
 {
 int slen;
 
+ if (!comboBoxDir->itemData(i).toBool()) continue;
+
 slen = comboBoxDir->itemText(i).length();
 *p++='*';
 memcpy(p,Utf16FromQString(comboBoxDir->itemText(i)),slen*sizeof(utf16_t));

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/dirselectbox.h -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/dirselectbox.h Changed

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/logic.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/logic.cpp Changed

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/logic_posix.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/logic_posix.cpp Changed

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/mainwnd.cpp Changed

@@ -377,11 +377,6 @@
     return info.absoluteFilePath();
 }
 
-void MainWnd::SlotStartStreaming()
-{
-    m_app->StartStreaming();
-}
-
 void MainWnd::SlotBackup()
 {
     CBackupDialog dlg(m_app,mainIcon,this);
@@ -460,7 +455,6 @@
     settingsIcon = createIconPixmaps(AP_IMG_CONFIGURE,AP_IMG_CONFIGURE_COUNT);
     ejectIcon = createIconPixmaps(AP_IMG_EJECT,AP_IMG_EJECT_COUNT);
     cancelIcon = createIconPixmaps(AP_IMG_STOP,AP_IMG_STOP_COUNT);
-    startStreamingIcon = createIconPixmaps(AP_IMG_STREAM,AP_IMG_STREAM_COUNT);
     backupIcon = createIconPixmaps(AP_IMG_BACKUP,AP_IMG_BACKUP_COUNT);
     revertIcon = createIconPixmaps(AP_IMG_REVERT,AP_IMG_REVERT_COUNT);
     clearLogIcon = createIconPixmaps(AP_IMG_CLEARLOG,AP_IMG_CLEARLOG_COUNT);
@@ -507,11 +501,6 @@
     setPlainMenuRole(saveAllMkvAct);
     connect(saveAllMkvAct, SIGNAL(triggered()), this, SLOT(SlotSaveAllMkv()));
 
-    startStreamingAct = new QAction( *startStreamingIcon, UI_QSTRING(APP_IFACE_ACT_STREAMING_NAME), this);
-    startStreamingAct->setStatusTip(UI_QSTRING(APP_IFACE_ACT_STREAMING_STIP));
-    setPlainMenuRole(startStreamingAct);
-    connect(startStreamingAct, SIGNAL(triggered()), this, SLOT(SlotStartStreaming()));
-
     backupAct = new QAction( *backupIcon , UI_QSTRING(APP_IFACE_ACT_BACKUP_NAME), this);
     backupAct->setStatusTip(UI_QSTRING(APP_IFACE_ACT_BACKUP_STIP));
     setPlainMenuRole(backupAct);
@@ -621,7 +610,6 @@
     fileMenu->addAction(ejectAct);
     fileMenu->addAction(saveFolderBox->selectDialogAction());
     fileMenu->addAction(saveAllMkvAct);
-    fileMenu->addAction(startStreamingAct);
     fileMenu->addAction(backupAct);
     fileMenu->addSeparator();
     fileMenu->addAction(quitAct);
@@ -656,7 +644,6 @@
     mainToolBar->addAction(openFilesAct);
     mainToolBar->addAction(backupAct);
     mainToolBar->addAction(saveAllMkvAct);
-    mainToolBar->addAction(startStreamingAct);
     mainToolBar->addAction(settingsAct);
     mainToolBar->addAction(ejectAct);
     //mainToolBar->addAction(quitAct);
@@ -866,7 +853,6 @@
         openTestFileAct->setEnabled(false);
     }
     saveAllMkvAct->setEnabled(false);
-    startStreamingAct->setEnabled(false);
     saveFolderBox->selectDialogAction()->setEnabled(false);
     backupAct->setEnabled(false);
     closeDiskAct->setEnabled(false);
@@ -1190,9 +1176,9 @@
 
     dlg.exec();
 
-    bool oldExpertMode = iface_ExpertMode;
     ReReadSettings();
-    if (iface_ExpertMode!=oldExpertMode)
+
+    if (dlg.redrawRequired())
     {
         Refresh_TitleTree();
     }

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/qtstr.h -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/qtstr.h Changed

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/scsiinfo.cpp Changed

@@ -211,7 +211,7 @@
 struct _items{
 DriveInfoItem inquiry,drive_serial,firmware_date,firmware_string,current_profile;
 DriveInfoItem copyright_info,dvd_physical_info,capacity,bd_disc_info,mkb_small;
- DriveInfoItem svm_small,aacs,ccert_small,aacs_high,timestamp;
+ DriveInfoItem svm_small,aacs,ccert_small,aacs_high,timestamp,custom;
 } items;
 
 // extract all interesting items
@@ -267,6 +267,9 @@
 case 0x05102205:
 items.timestamp=item;
 break;
+ case 0x05102210:
+ items.custom=item;
+ break;
 default:
 break;
 }
@@ -371,6 +374,23 @@
 append_const(str," ");
 }
 
+ if ((items.custom.Size>1) && (items.custom.Data[items.custom.Size-1]==0))
+ {
+ QString customStr = QString::fromUtf8((const char*)items.custom.Data,items.custom.Size-1);
+ QStringList customList = customStr.split(QLatin1Char('\n'),QString::SkipEmptyParts);
+ if (customList.size()>=1)
+ {
+ append_const(str," ");
+ str.append(customList.at(0));
+ append_const(str," ");
+ }
+ for (int i=1; i<customList.size();i++)
+ {
+ str.append(customList.at(i));
+ append_const(str," ");
+ }
+ }
+
 //
 // Disk info
 //

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/settingdlg.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/settingdlg.cpp Changed

@@ -28,31 +28,27 @@
 tabWidget->setUsesScrollButtons(false);
 buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply , Qt::Horizontal);
 
+ // general
+ generalTab = new CGeneralTab();
+ tabWidget->addTab(generalTab,UI_QSTRING(APP_IFACE_SETTINGS_TAB_GENERAL));
+ connect(generalTab->check_ExpertMode,SIGNAL(stateChanged(int)),this,SLOT(SlotExpertStateChanged(int)));
+
 // dvd
 dvdTab = new CDVDTab(client);
- tabWidget->addTab(dvdTab, UI_QSTRING(APP_TTREE_VIDEO));
+ tabWidget->addTab(dvdTab,UI_QSTRING(APP_TTREE_VIDEO));
 
 // IO
 ioTab = new CIOTab();
- tabWidget->addTab(ioTab, UI_QSTRING(APP_IFACE_SETTINGS_TAB_IO));
+ tabWidget->addTab(ioTab,UI_QSTRING(APP_IFACE_SETTINGS_TAB_IO));
 
 // Language
 languageTab = new CLanguageTab(client);
- tabWidget->addTab(languageTab , UI_QSTRING(APP_IFACE_SETTINGS_TAB_LANGUAGE));
+ tabWidget->addTab(languageTab,UI_QSTRING(APP_IFACE_SETTINGS_TAB_LANGUAGE));
 
 // prot
 protTab = new CProtTab();
 tabWidget->addTab(protTab, UI_QSTRING(APP_IFACE_SETTINGS_TAB_PROT));
 
- // stream
- streamTab = new CStreamTab();
- tabWidget->addTab(streamTab, UI_QSTRING(APP_IFACE_SETTINGS_TAB_STREAMING));
-
- // general
- generalTab = new CGeneralTab();
- tabWidget->addTab(generalTab , UI_QSTRING(APP_IFACE_SETTINGS_TAB_GENERAL));
- connect(generalTab->check_ExpertMode, SIGNAL(stateChanged(int)), this, SLOT(SlotExpertStateChanged(int)));
-
 advancedTab = new CAdvancedTab(ap_client);
 advancedTabVisible = false;
 
@@ -68,7 +64,7 @@
 
 connect(this, SIGNAL(accepted()) , this , SLOT(SlotApply()));
 
- ReadSettings();
+ ReadSettings(true);
 };
 
 CSettingDialog::~CSettingDialog()
@@ -87,7 +83,7 @@
 {
 QMessageBox::critical(this,UI_QSTRING(APP_CAPTION_MSG),UI_QSTRING(APP_IFACE_SETTINGS_MSG_FAILED));
 }
- ReadSettings();
+ ReadSettings(false);
 
 if (restartRequired)
 {
@@ -96,7 +92,7 @@
 }
 }
 
-void CSettingDialog::ReadSettings()
+void CSettingDialog::ReadSettings(bool first)
 {
 static const utf16_t zero[1]={0};
 
@@ -163,29 +159,6 @@
 int dump_always = client->GetSettingInt(apset_bdplus_DumpAlways);
 protTab->check_DumpAlways->setCheckState( (dump_always==0) ? Qt::Unchecked : Qt::Checked );
 
- // stream
- int Enableupnp = client->GetSettingInt(apset_stream_EnableUPNP);
- streamTab->checkEnableUpnp->setCheckState( (Enableupnp==0) ? Qt::Unchecked : Qt::Checked );
-
- const utf16_t *ipaddress = client->GetSettingString(apset_stream_BindIp);
- if (ipaddress)
- {
- if (ipaddress[0]==0) ipaddress=NULL;
- }
- if (!ipaddress)
- {
- streamTab->comboAddress->setCurrentIndex(0);
- } else {
- if (streamTab->comboAddress->findText(QStringFromUtf16(ipaddress))<0)
- {
- streamTab->comboAddress->addItem(QStringFromUtf16(ipaddress));
- }
- streamTab->comboAddress->setCurrentIndex(streamTab->comboAddress->findText(QStringFromUtf16(ipaddress)));
- }
-
- int BindPort = client->GetSettingInt(apset_stream_BindPort);
- streamTab->spinPort->setValue(BindPort);
-
 // advanced
 const utf16_t *defaultProfile = client->GetSettingString(apset_app_DefaultProfileName);
 if (NULL==defaultProfile) defaultProfile=zero;
@@ -205,11 +178,28 @@
 if (NULL==defaultSelection) defaultSelection=zero;
 if (defaultSelection[0]==0)
 {
- defaultSelection = client->GetProfileString(0,2);
+ defaultSelection = client->GetAppString(AP_vastr_DefaultSelectionString);
 }
 advancedTab->lineEditSelection->setText(QStringFromUtf16(defaultSelection));
 
+ const utf16_t *defaultOutputFileName = client->GetSettingString(apset_app_DefaultOutputFileName);
+ if (NULL==defaultOutputFileName) defaultOutputFileName=zero;
+ if (defaultOutputFileName[0]==0)
+ {
+ defaultOutputFileName = client->GetAppString(AP_vastr_DefaultOutputFileName);
+ }
+ advancedTab->lineEditOutputFileName->setText(QStringFromUtf16(defaultOutputFileName));
+
+ advancedTab->ccextractorDir->setText(QStringFromUtf16(client->GetSettingString(apset_app_ccextractor)));
+
 toggleAdvanced(expert_mode!=0);
+
+ if (first)
+ {
+ newSettings = false;
+ oldExpertMode = (expert_mode!=0);
+ oldOutputFileName = advancedTab->lineEditOutputFileName->text();
+ }
 }
 
 bool CSettingDialog::WriteSettings(bool& restartRequired)
@@ -251,17 +241,6 @@
 client->SetSettingInt( apset_bdplus_DumpAlways , (protTab->check_DumpAlways->checkState() == Qt::Checked) ? 1 : 0 );
 client->SetSettingString(apset_app_Java,Utf16FromQString(protTab->javaDir->text()));
 
- // stream
- client->SetSettingInt(apset_stream_EnableUPNP , (streamTab->checkEnableUpnp->checkState() == Qt::Checked) ? 1 : 0 );
-
- if ( (streamTab->comboAddress->currentIndex()==0) && (streamTab->comboAddress->currentText()==streamTab->comboAddress->itemText(0)) )
- {
- client->SetSettingString(apset_stream_BindIp,NULL);
- } else {
- client->SetSettingString(apset_stream_BindIp,Utf16FromQString(streamTab->comboAddress->currentText()));
- }
- client->SetSettingInt(apset_stream_BindPort,streamTab->spinPort->value());
-
 // advanced
 if (advancedTab->comboProfile->currentIndex())
 {
@@ -269,19 +248,41 @@
 } else {
 client->SetSettingString(apset_app_DefaultProfileName,NULL);
 }
- if (advancedTab->lineEditSelection->text() == QStringFromUtf16(client->GetProfileString(0,2)))
+ if (advancedTab->lineEditSelection->text() == QStringFromUtf16(client->GetAppString(AP_vastr_DefaultSelectionString)))
 {
 client->SetSettingString(apset_app_DefaultSelectionString,NULL);
 } else {
 client->SetSettingString(apset_app_DefaultSelectionString,Utf16FromQString(advancedTab->lineEditSelection->text()));
 }
+ if (advancedTab->lineEditOutputFileName->text() == QStringFromUtf16(client->GetAppString(AP_vastr_DefaultOutputFileName)))
+ {
+ client->SetSettingString(apset_app_DefaultOutputFileName,NULL);
+ } else {
+ client->SetSettingString(apset_app_DefaultOutputFileName,Utf16FromQString(advancedTab->lineEditOutputFileName->text()));
+ }
+ client->SetSettingString(apset_app_ccextractor,Utf16FromQString(advancedTab->ccextractorDir->text()));
 
 restartRequired = (NULL!=client->GetAppString(AP_vastr_RestartRequired));
 
+ newSettings = true;
+ newExpertMode = (generalTab->check_ExpertMode->checkState() == Qt::Checked);
+ newOutputFileName = advancedTab->lineEditOutputFileName->text();
+
 // flush
 return client->SaveSettings();
 }
 
+bool CSettingDialog::redrawRequired()
+{
+ if (newSettings)
+ {
+ if (oldExpertMode!=newExpertMode) return true;
+ if (oldOutputFileName!=newOutputFileName) return true;
+ }
+ return false;
+}
+
+
 CIOTab::CIOTab(QWidget *parent) : QWidget(parent)
 {
 QGroupBox* box = new QGroupBox(UI_QSTRING(APP_IFACE_SETTINGS_IO_OPTIONS));
@@ -403,37 +404,6 @@
 this->setLayout(lay);
 }
 
-CStreamTab::CStreamTab(QWidget *parent) : QWidget(parent)
-{
- QGroupBox* box = new QGroupBox(UI_QSTRING(APP_IFACE_SETTINGS_IO_OPTIONS));
-
- checkEnableUpnp = new QCheckBox();
-
- comboAddress = new QComboBox();
- comboAddress->addItem(QString(UI_QSTRING(APP_IFACE_SETTINGS_IO_AUTO)));
- comboAddress->setEditable(true);
-
- spinPort = new QSpinBox();
- spinPort->setMinimum(1025);
- spinPort->setMaximum(65535);
-
- QGridLayout *b_lay = new QGridLayout();
-
- b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_STREAM_ENABLE_UPNP)),0,0,Qt::AlignRight);
- b_lay->addWidget(checkEnableUpnp,0,1);
- b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_STREAM_BIND_IP)),1,0,Qt::AlignRight);
- b_lay->addWidget(comboAddress,1,1);
- b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_STREAM_BIND_PORT)),2,0,Qt::AlignRight);
- b_lay->addWidget(spinPort,2,1);
- box->setLayout(b_lay);
-
- QBoxLayout *lay = new QVBoxLayout();
- lay->addWidget(box);
-
- lay->addStretch(2);
- this->setLayout(lay);
-}
-
 CGeneralTab::CGeneralTab(QWidget *parent) : QWidget(parent)
 {
 dataDir = new CDirSelectBox(NULL,CDirSelectBox::DirBoxDir,UI_QSTRING(APP_IFACE_SETTINGS_DATA_DIR));
@@ -618,6 +588,7 @@
 }
 
 lineEditSelection = new QLineEdit();
+ lineEditOutputFileName = new QLineEdit();
 
 QGridLayout *b_lay = new QGridLayout();
 
@@ -625,11 +596,18 @@
 b_lay->addWidget(comboProfile,0,1);
 b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_ADV_DEFAULT_SELECTION)),1,0,Qt::AlignRight);
 b_lay->addWidget(lineEditSelection,1,1);
+ b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_ADV_OUTPUT_FILE_NAME_TEMPLATE)),2,0,Qt::AlignRight);
+ b_lay->addWidget(lineEditOutputFileName,2,1);
 box->setLayout(b_lay);
 
+ QString titleExternExe = UI_QSTRING(APP_IFACE_SETTINGS_ADV_EXTERN_EXEC_PATH);
+ ccextractorDir = new CDirSelectBox(ap_client,CDirSelectBox::DirBoxFile,
+ titleExternExe.arg(QLatin1String("ccextractor")));
+
 QBoxLayout *lay = new QVBoxLayout();
 
 lay->addWidget(box);
+ lay->addWidget(ccextractorDir);
 
 lay->addStretch(2);
 this->setLayout(lay);

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/settingdlg.h -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/settingdlg.h Changed

@@ -97,19 +97,6 @@
     CProtTab(QWidget *parent = 0);
 };
 
-class CStreamTab : public QWidget
-{
-    Q_OBJECT
-
-public:
-    QCheckBox*      checkEnableUpnp;
-    QComboBox*      comboAddress;
-    QSpinBox*       spinPort;
-
-public:
-    CStreamTab(QWidget *parent = 0);
-};
-
 class CAdvancedTab : public QWidget
 {
     Q_OBJECT
@@ -117,6 +104,8 @@
 public:
     QComboBox*      comboProfile;
     QLineEdit*      lineEditSelection;
+    QLineEdit*      lineEditOutputFileName;
+    CDirSelectBox*  ccextractorDir;
 
 public:
     CAdvancedTab(CGUIApClient* ap_client,QWidget *parent = 0);
@@ -140,19 +129,26 @@
     CLanguageTab* languageTab;
     CIOTab* ioTab;
     CDVDTab* dvdTab;
-    CStreamTab* streamTab;
     CProtTab* protTab;
     CAdvancedTab* advancedTab;
     bool advancedTabVisible;
+private:
+    bool newSettings;
+    bool oldExpertMode;
+    bool newExpertMode;
+    QString oldOutputFileName;
+    QString newOutputFileName;
 
 private:
     void toggleAdvanced(bool expert_mode);
 private slots:
     void SlotApply();
     void SlotExpertStateChanged(int state);
-public:
-    void ReadSettings();
+private:
+    void ReadSettings(bool first);
     bool WriteSettings(bool& restartRequired);
+public:
+    bool redrawRequired();
 };

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/spawn_posix.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/spawn_posix.cpp Changed

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[21912]={
+static const unsigned short en_po_str[21935]={
 'e','n','g',':','E','n','g','l','i','s','h',0,
 'D','B','G',' ','A','S','S','E','R','T',':',' ','%','1',' ','a','t',' ','%','2',':','%','3',0,
 'L','I','B','M','K','V','_','T','R','A','C','E',':',' ','%','1',0,
@@ -360,6 +360,7 @@
 'V','O','B','S','U','B',' ','s','u','b','t','i','t','l','e','s',0,
 'A','C','3',' ','a','u','d','i','o',0,
 'A','A','C',' ','a','u','d','i','o',0,
+'T','e','x','t',' ','s','u','b','t','i','t','l','e','s',0,
 'D','e','f','a','u','l','t',0,
 'F','o','r','c','e','d',0,
 'M','a','k','e','M','K','V',' ','B','E','T','A',0,
@@ -519,9 +520,9 @@
 'A','d','v','a','n','c','e','d',0,
 'D','e','f','a','u','l','t',' ','p','r','o','f','i','l','e',' ',':',0,
 'D','e','f','a','u','l','t',' ','s','e','l','e','c','t','i','o','n',' ','r','u','l','e',' ',':',0,
-'F','F','M','P','E','G',' ','l','o','c','a','t','i','o','n',0,
-'d','t','s','d','e','c','o','d','e','r','d','l','l','.','d','l','l',' ','l','o','c','a','t','i','o','n',0,
+'%','1',' ','e','x','e','c','u','t','a','b','l','e',' ','l','o','c','a','t','i','o','n',0,
 'C','u','s','t','o','m',' ','J','a','v','a',' ','e','x','e','c','u','t','a','b','l','e',' ','l','o','c','a','t','i','o','n',0,
+'O','u','t','p','u','t',' ','f','i','l','e',' ','n','a','m','e',' ','t','e','m','p','l','a','t','e',' ',':',0,
 'P','r','o','f','i','l','e',0,
 'P','r','o','p','e','r','t','i','e','s',0,
 'T','i','t','l','e',0,
@@ -574,7 +575,7 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1117]={
+static const unsigned int en_po_off[1119]={
 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,1010,301,
 1011,320,1012,323,2001,329,2002,378,2003,464,2004,518,2006,586,2007,703,2008,858,2009,981,2010,1109,
 2011,1154,2012,1298,2013,1382,2014,1468,2015,1516,2016,1598,2017,1761,2018,1876,2019,1938,2020,1978,2021,2145,
@@ -606,26 +607,26 @@
 5202,16711,5203,16716,5204,16725,5207,16734,5208,16740,5209,16755,5210,16764,5214,16769,5215,16778,5216,16784,5217,16801,
 5218,16813,5219,16829,5220,16840,5221,16853,5222,16864,5223,16870,5224,16880,5225,16896,5226,16910,5227,16922,5228,16932,
 5233,16950,5234,16963,5235,16977,5238,16996,5239,17006,5240,17016,5248,17031,5249,17041,5250,17049,5301,17058,5302,17069,
-5303,17123,5304,17187,5305,17198,5306,17215,5307,17225,5380,17235,5381,17243,6000,17250,6001,17263,6002,17282,6003,17301,
-6005,17335,6006,17356,6007,17370,6008,17452,6010,17466,6011,17478,6012,17485,6013,17529,6014,17536,6015,17561,6016,17579,
-6017,17626,6018,17647,6019,17668,6020,17674,6021,17681,6022,17698,6023,17705,6024,17738,6026,17762,6030,17819,6031,17825,
-6032,17831,6034,17837,6035,17845,6036,17855,6037,17863,6038,17888,6039,17900,6040,17912,6041,17941,6042,17996,6043,18009,
-6044,18037,6045,18050,6046,18063,6047,18085,6048,18095,6050,18119,6051,18164,6052,18257,6053,18269,6054,18285,6055,18301,
-6056,18316,6057,18329,6058,18350,6059,18356,6060,18363,6061,18370,6062,18383,6063,18397,6064,18414,6065,18432,6066,18448,
-6067,18461,6068,18473,6069,18487,6070,18492,6071,18501,6072,18508,6073,18515,6074,18523,6075,18536,6076,18541,6077,18565,
-6078,18596,6079,18651,6080,18721,6081,18729,6082,18734,6083,18753,6084,18777,6085,18797,6086,18802,6087,18835,6088,18877,
-6089,18897,6090,18902,6091,18907,6092,18916,6093,18923,6094,18943,6095,18957,6096,18978,6097,18986,6098,19010,6099,19072,
-6100,19093,6101,19104,6102,19116,6103,19124,6104,19129,6105,19154,6106,19161,6107,19186,6108,19207,6109,19248,6110,19265,
-6111,19276,6112,19293,6119,19307,6120,19337,6121,19366,6122,19395,6123,19429,6124,19460,6125,19492,6126,19512,6127,19542,
-6128,19570,6129,19592,6130,19606,6131,19632,6132,19640,6133,19663,6134,19674,6135,19686,6136,19706,6137,19726,6138,19738,
-6139,20003,6142,20035,6143,20058,6144,20069,6145,20086,6146,20096,6147,20121,6148,20129,6149,20149,6150,20191,6151,20215,
-6152,20255,6153,20264,6154,20285,6156,20306,6157,20311,6158,20316,6159,20342,6161,20355,6162,20369,6163,20395,6164,20413,
-6165,20416,6166,20426,6167,20437,6168,20460,6169,20488,6170,20502,6171,20537,6172,20570,6173,20579,6174,20597,6175,20622,
-6176,20638,6177,20665,6180,20697,6181,20705,6200,20716,6201,20722,6202,20728,6203,20734,6204,20744,6205,20749,6206,20761,
-6207,20770,6209,20784,6210,20797,6211,20808,6212,20823,6213,20835,6214,20844,6215,20855,6216,20864,6220,20872,6221,20896,
-6222,20909,6223,20920,6224,20930,6225,20943,6226,21312,6227,21330,6228,21431,6229,21442,6300,21459,6301,21488,6302,21506,
-6303,21521,6304,21531,6305,21542,6306,21558,6307,21577,6308,21593,6309,21616,6320,21639,6321,21671,6322,21703,6323,21728,
-6324,21744,6325,21756,6326,21768,6327,21788,6329,21807,6330,21828,6331,21861,6332,21894,0};
+5303,17123,5304,17187,5305,17198,5306,17215,5307,17225,5308,17235,5380,17250,5381,17258,6000,17265,6001,17278,6002,17297,
+6003,17316,6005,17350,6006,17371,6007,17385,6008,17467,6010,17481,6011,17493,6012,17500,6013,17544,6014,17551,6015,17576,
+6016,17594,6017,17641,6018,17662,6019,17683,6020,17689,6021,17696,6022,17713,6023,17720,6024,17753,6026,17777,6030,17834,
+6031,17840,6032,17846,6034,17852,6035,17860,6036,17870,6037,17878,6038,17903,6039,17915,6040,17927,6041,17956,6042,18011,
+6043,18024,6044,18052,6045,18065,6046,18078,6047,18100,6048,18110,6050,18134,6051,18179,6052,18272,6053,18284,6054,18300,
+6055,18316,6056,18331,6057,18344,6058,18365,6059,18371,6060,18378,6061,18385,6062,18398,6063,18412,6064,18429,6065,18447,
+6066,18463,6067,18476,6068,18488,6069,18502,6070,18507,6071,18516,6072,18523,6073,18530,6074,18538,6075,18551,6076,18556,
+6077,18580,6078,18611,6079,18666,6080,18736,6081,18744,6082,18749,6083,18768,6084,18792,6085,18812,6086,18817,6087,18850,
+6088,18892,6089,18912,6090,18917,6091,18922,6092,18931,6093,18938,6094,18958,6095,18972,6096,18993,6097,19001,6098,19025,
+6099,19087,6100,19108,6101,19119,6102,19131,6103,19139,6104,19144,6105,19169,6106,19176,6107,19201,6108,19222,6109,19263,
+6110,19280,6111,19291,6112,19308,6119,19322,6120,19352,6121,19381,6122,19410,6123,19444,6124,19475,6125,19507,6126,19527,
+6127,19557,6128,19585,6129,19607,6130,19621,6131,19647,6132,19655,6133,19678,6134,19689,6135,19701,6136,19721,6137,19741,
+6138,19753,6139,20018,6142,20050,6143,20073,6144,20084,6145,20101,6146,20111,6147,20136,6148,20144,6149,20164,6150,20206,
+6151,20230,6152,20270,6153,20279,6154,20300,6156,20321,6157,20326,6158,20331,6159,20357,6161,20370,6162,20384,6163,20410,
+6164,20428,6165,20431,6166,20441,6167,20452,6168,20475,6169,20503,6170,20517,6171,20552,6172,20585,6173,20594,6174,20612,
+6175,20637,6177,20660,6178,20692,6180,20720,6181,20728,6200,20739,6201,20745,6202,20751,6203,20757,6204,20767,6205,20772,
+6206,20784,6207,20793,6209,20807,6210,20820,6211,20831,6212,20846,6213,20858,6214,20867,6215,20878,6216,20887,6220,20895,
+6221,20919,6222,20932,6223,20943,6224,20953,6225,20966,6226,21335,6227,21353,6228,21454,6229,21465,6300,21482,6301,21511,
+6302,21529,6303,21544,6304,21554,6305,21565,6306,21581,6307,21600,6308,21616,6309,21639,6320,21662,6321,21694,6322,21726,
+6323,21751,6324,21767,6325,21779,6326,21791,6327,21811,6329,21830,6330,21851,6331,21884,6332,21917,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

makemkv-oss-1.12.3.tar.xz/makemkvgui/src/uisync.cpp -> makemkv-oss-1.14.0.tar.xz/makemkvgui/src/uisync.cpp Changed

Changes of Revision 51