Changes - j0ke.net Open Build Service

Changes of Revision 15

[-] [+]	Changed	makemkv.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat May 11 11:09:44 UTC 2013 - cs@linux-administrator.com + +- update to version 1.8.1 + +------------------------------------------------------------------- Fri Jan 4 18:36:20 UTC 2013 - cs@linux-administrator.com - update to version 1.7.10
[-] [+]	Changed	makemkv.spec ^
@@ -6,7 +6,7 @@ # norootforbuild Name: makemkv -Version: 1.7.10 +Version: 1.8.1 Release: 1 Summary: One-click video converter Group: Multimedia @@ -80,6 +80,9 @@ %{_datadir}/MakeMKV/makemkv_ptb.mo.gz %{_datadir}/MakeMKV/makemkv_spa.mo.gz %{_datadir}/MakeMKV/makemkv_swe.mo.gz +%{_datadir}/MakeMKV/makemkv_chi.mo.gz +%{_datadir}/MakeMKV/makemkv_ita.mo.gz +%{_datadir}/MakeMKV/makemkv_pol.mo.gz %{_datadir}/pixmaps/playbluray.png %{_datadir}/applications/playBluRay.desktop %{_datadir}/MakeMKV/default.mmcp.xml
[-] [+]	Changed	makemkv-oss-install.patch ^
@@ -1,5 +1,5 @@ ---- makemkv-oss-1.7.10/makefile.linux.orig 2013-01-04 19:24:14.092122867 +0100 -+++ makemkv-oss-1.7.10/makefile.linux 2013-01-04 19:24:18.252119201 +0100 +--- makemkv-oss-1.8.1/makefile.linux.orig 2013-01-04 19:24:14.092122867 +0100 ++++ makemkv-oss-1.8.1/makefile.linux 2013-01-04 19:24:18.252119201 +0100 @@ -14,7 +14,7 @@ BUILDINFO_BUILD_DATE=$(shell date) DESTDIR=
[-] [+]	Deleted	makemkv-bin-1.7.10.tar.bz2/bin/mipsel32 ^
-(directory)
	Deleted	makemkv-bin-1.7.10.tar.bz2/bin/mipsel32/makemkvcon ^
	Changed	makemkv-bin-1.8.1.tar.bz2/bin/amd64/makemkvcon ^
	Changed	makemkv-bin-1.8.1.tar.bz2/bin/i386/makemkvcon ^
	Changed	makemkv-bin-1.8.1.tar.bz2/bin/i386/mmdtsdec ^
[-] [+]	Changed	makemkv-bin-1.8.1.tar.bz2/makefile.linux ^
@@ -49,4 +49,7 @@ install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ptb.mo.gz install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dut.mo.gz install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_swe.mo.gz + install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ita.mo.gz + install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_chi.mo.gz + install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_pol.mo.gz
[-] [+]	Changed	makemkv-bin-1.8.1.tar.bz2/src/eula_en_linux.txt ^
@@ -1,4 +1,4 @@ -Copyright (C) 2007-2012 GuinpinSoft inc +Copyright (C) 2007-2013 GuinpinSoft inc IMPORTANT NOTE
[-] [+]	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/default.mmcp.xml ^
@@ -7,6 +7,9 @@ <mkvSettings ignoreForcedSubtitlesFlag="true" useISO639Type2T="false" + setFirstAudioTrackAsDefault="true" + setFirstSubtitleTrackAsDefault="true" + insertFirstChapter00IfMissing="true" /> <!-- Settings overridable in preferences -->
[-] [+]	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/flac.mmcp.xml ^
@@ -7,6 +7,9 @@ <mkvSettings ignoreForcedSubtitlesFlag="true" useISO639Type2T="false" + setFirstAudioTrackAsDefault="true" + setFirstSubtitleTrackAsDefault="true" + insertFirstChapter00IfMissing="true" /> <!-- Settings overridable in preferences -->
	Added	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_chi.mo.gz ^
	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_deu.mo.gz ^
	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_dut.mo.gz ^
	Added	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_ita.mo.gz ^
	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_jpn.mo.gz ^
	Added	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_pol.mo.gz ^
	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_ptb.mo.gz ^
	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_spa.mo.gz ^
	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/makemkv_swe.mo.gz ^
[-] [+]	Changed	makemkv-bin-1.8.1.tar.bz2/src/share/wdtv.mmcp.xml ^
@@ -7,6 +7,9 @@ <mkvSettings ignoreForcedSubtitlesFlag="true" useISO639Type2T="false" + setFirstAudioTrackAsDefault="true" + setFirstSubtitleTrackAsDefault="true" + insertFirstChapter00IfMissing="true" /> <!-- Settings overridable in preferences -->
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/api_darwin.cpp ^
@@ -1,48 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#include <stdint.h> -#include <unistd.h> -#include <errno.h> -#include <sys/types.h> -#include <stdio.h> -#include <sys/param.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <mach-o/dyld.h> -#include <crt_externs.h> -#include <lgpl/sysabi.h> - -int SYS_posix_getmyname(char buffer,int length) -{ - bzero(buffer,length); - - uint32_t len=length; - if (0!=_NSGetExecutablePath(buffer,&len)) - { - return 0; - } - buffer[length-1]=0; - - return (int) strlen(buffer); -} - -char** SYS_posix_envp() -{ - return *_NSGetEnviron(); -} -
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/api_win.cpp ^
@@ -1,212 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#include <lgpl/aproxy.h> -#include <windows.h> -#include <winnt.h> -#include <lgpl/smem.h> - -extern bool AppEngMain(const char ver,bool); -HANDLE appThread; - -static DWORD WINAPI DebugEngMainThreadProc(LPVOID lpParameter) -{ - AppEngMain((const char)lpParameter,false); - CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); - return 0; -} - -typedef BOOL (WINAPI LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); - -static bool IsWow64() -{ - BOOL bIsWow64 = FALSE; - LPFN_ISWOW64PROCESS fnIsWow64Process; - - if (0!=GetEnvironmentVariableA("APROXY_FORCE_32BIT",NULL,0)) - { - return false; - } - - fnIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress( - GetModuleHandleW(L"KERNEL32"),"IsWow64Process"); - - if (NULL != fnIsWow64Process) - { - if (!fnIsWow64Process(GetCurrentProcess(),&bIsWow64)) - { - // handle error - bIsWow64 = FALSE; - } - } - return (FALSE!=bIsWow64); -} - - -int ApSpawnApp(const char* verstr,const char* AppName,char* response,size_t responselength) -{ - wchar_t appname[1024]; - wchar_t cmdline[64]; - - if (GetModuleFileNameW(NULL,appname,1024)>1023) return 100001; - - wchar_t* app_end = appname + wcslen(appname) - 1; - while( (app_end!='\\') && (app_end!='/') ) - { - app_end--; - } - app_end++; - const char p = AppName; - while(p!=0) { (app_end++) = (p++); }; - - if ( (IsWow64()) && true ) - { - wcscpy(app_end,L"64.exe"); - } else { - wcscpy(app_end,L".exe"); - } - - memcpy(cmdline,L"xxx guiserver ",14sizeof(wchar_t)); - const char pv = verstr; - wchar_t* pc = cmdline+14; - while(pv!=0) - { - (pc++)=(pv++); - } - pc=0; - - STARTUPINFOW si; - PROCESS_INFORMATION pi; - HANDLE hin; - SECURITY_ATTRIBUTES pipe_si; - - memset(&pipe_si,0,sizeof(pipe_si)); - pipe_si.nLength=sizeof(pipe_si); - pipe_si.bInheritHandle=TRUE; - - memset(&si,0,sizeof(si)); - si.cb=sizeof(si); - si.dwFlags = STARTF_USESTDHANDLES; - - if (0==CreatePipe(&hin,&si.hStdOutput,&pipe_si,0)) - { - return 0x10000000\|GetLastError(); - } - -#ifdef APP_DEBUG_INPROC - SetStdHandle(STD_OUTPUT_HANDLE,si.hStdOutput); - appThread=CreateThread(NULL,0,DebugEngMainThreadProc,(LPVOID)verstr,0,NULL); - if (NULL==appThread) - { - return 0x20000000\|GetLastError(); - }; -#else - if (0==CreateProcessW(appname,cmdline,NULL,NULL,TRUE,DETACHED_PROCESS,NULL,NULL,&si,&pi)) - { - return 0x30000000\|GetLastError(); - } - - CloseHandle(pi.hThread); - CloseHandle(pi.hProcess); - CloseHandle(si.hStdOutput); -#endif - - // read answer - for (unsigned int i=0;i<(responselength-1);i++) - { - DWORD rd; - - do { - if (0==ReadFile(hin,response+i,1,&rd,NULL)) - { - return 0x40000000\|GetLastError(); - } - } while(0==rd); - - if (response[i]=='$') - { - response[i]=0; - - // break pipe - CloseHandle(hin); - return 0; - } - } - - return 0x50000000\|GetLastError(); -} - -void* ApOpenShmem(const char name) -{ - uintptr_t v=0; - - while(name!=0) - { - v<<=4; - v+= (name-'a'); - name++; - } - - HANDLE hs = (HANDLE)(void)v; - if (NULL==hs) return NULL; - return MapViewOfFile(hs,FILE_MAP_WRITE,0,0,0); -} - -bool ApOpenSgrp(AP_SGRP sgrp,const uint64_t data) -{ - sgrp->a_id = (uintptr_t) data[0]; - sgrp->b_id = (uintptr_t) data[1]; - - return true; -} - -bool ApSemInc(AP_SGRP sgrp,uintptr_t sid) -{ - if (0==ReleaseSemaphore((HANDLE)(void)sid,1,NULL)) return false; - return true; -} - -bool ApSemDec(AP_SGRP sgrp,uintptr_t sid) -{ - DWORD r,w; - -#ifdef APP_DEBUG_INPROC - w = INFINITE; -#else - w = (AP_SEM_TIMEOUT1000); -#endif - - r = WaitForSingleObject((HANDLE)(void)sid,w); - - return (r==WAIT_OBJECT_0); -} - -uintptr_t ApDebugOpen(const char name) -{ - HANDLE handle = CreateFileA(name,GENERIC_WRITE,FILE_SHARE_READ,NULL,CREATE_ALWAYS,0,NULL); - if (handle==INVALID_HANDLE_VALUE) return 0; - return (uintptr_t)handle; -} - -void ApDebugOut(uintptr_t file,const char* string) -{ - DWORD written; - if (file==0) return; - - WriteFile((HANDLE)file,string,(DWORD)strlen(string),&written,NULL); - FlushFileBuffers((HANDLE)file); -} -
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img ^
-(directory)
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/128 ^
-(directory)
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/128/backup.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/128/download_manager.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/128/eject.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/128/mkv_icon.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/128/revert.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/128/stream.png ^
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16 ^
-(directory)
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/backup.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/configure.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/download_manager.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/eject.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/mkv_icon.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/revert.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/stop.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/16/stream.png ^
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22 ^
-(directory)
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/backup.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/configure.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/download_manager.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/eject.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/mkv_icon.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/revert.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/stop.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/22/stream.png ^
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32 ^
-(directory)
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32/backup.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32/configure.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32/download_manager.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32/eject.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32/revert.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32/stop.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/32/stream.png ^
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64 ^
-(directory)
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/backup.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/bluray_to_hd.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/cd_loading.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/dvd_to_hd.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/eject.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/hddvd_to_hd.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/revert.png ^
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/64/stream.png ^
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/ico ^
-(directory)
	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/img/ico/mkv_icon_all.ico ^
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/logic_win.cpp ^
@@ -1,28 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#include "qtapp.h" -#include <windows.h> -#include <winnt.h> - -QT_C_ASSERT( sizeof(wchar_t) == sizeof(utf16_t) ); - -uint64_t get_free_space(const utf16_t Folder) -{ - ULARGE_INTEGER a1,a2,a3; - GetDiskFreeSpaceExW((const wchar_t*)Folder,&a1,&a2,&a3); - return a1.QuadPart; -}
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/macutil.mm ^
@@ -1,53 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#include <stdint.h> -#include <unistd.h> -#include <sys/types.h> - -#include <mach/mach.h> - -#import <servers/bootstrap.h> -#import <Foundation/Foundation.h> -#import <CoreServices/CoreServices.h> - -mach_port_t MacBootstrapGetPort(const char name) -{ - int nserr; - - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - - NSString ns_port_name = [NSString stringWithUTF8String:name]; - - NSMachPort nsport = (NSMachPort*) [[NSMachBootstrapServer sharedInstance] portForName:ns_port_name]; - - if (nil==nsport) return MACH_PORT_NULL; - - mach_port_t port = [nsport machPort]; - - if (port != MACH_PORT_NULL) - { - if (mach_port_insert_right(mach_task_self(),port,port,MACH_MSG_TYPE_COPY_SEND)!=KERN_SUCCESS) - { - return MACH_PORT_NULL; - } - } - - [pool release]; - - return port; -} -
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/notify_growl.mm ^
@@ -1,70 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#import <Foundation/Foundation.h> -#import <Growl/Growl.h> - -class QMainWindow; - -#include <QtCore/QString.h> -#include "notify.h" - -void notifyInit() -{ - NSAutoreleasePool pool = [[NSAutoreleasePool alloc] init]; - - [GrowlApplicationBridge registerWithDictionary:nil]; - - [pool release]; -} - -void notifyStart(QMainWindow* mainWindow,unsigned long Id,const QString &Name) -{ -} - -void notifyUpdate(QMainWindow* mainWindow,unsigned int Value,unsigned int MaxValue,unsigned int TimeElapsed) -{ -} - -void notifyFinish(QMainWindow* mainWindow) -{ -} - -void notifyEvent(QMainWindow* mainWindow,unsigned long Id,const char* IdName,const QString &Text,const QString &Name) -{ - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - - QByteArray dataText = Text.toUtf8(); - NSString* stringName = [[NSString alloc] initWithUTF8String: IdName]; - NSString* stringText = [[NSString alloc] initWithUTF8String: dataText.data() ]; - - [GrowlApplicationBridge notifyWithTitle:@"MakeMKV" - description:stringText - notificationName:stringName - iconData:nil - priority:0 - isSticky:NO - clickContext:nil]; - - [stringName release]; - [stringText release]; - [pool release]; -} - -void notifyCleanup() -{ -} -
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/notify_mlion.mm ^
@@ -1,100 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#import <Foundation/Foundation.h> -#import <NSUserNotification.h> - -class QMainWindow; - -#include <QtCore/QString.h> -#include "notify.h" - -static NSUserNotificationCenter NotificationCenter = nil; -static Class UserNotification = nil; -static unsigned int activity_time = 0; - -void notifyInit() -{ - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - NSBundle* foundation = [NSBundle bundleWithIdentifier:@"com.apple.Foundation"]; - Class nclass; - - if (foundation != nil ) - { - nclass = [foundation classNamed:@"NSUserNotificationCenter"]; - if (nclass != nil) - { - NotificationCenter = [nclass defaultUserNotificationCenter]; - if (NotificationCenter != nil) - { - UserNotification = [foundation classNamed:@"NSUserNotification"]; - if (UserNotification == nil) - { - NotificationCenter = nil; - } - } - } - } - [pool release]; -} - -void notifyStart(QMainWindow* mainWindow,unsigned long Id,const QString &Name) -{ - activity_time = 0; -} - -void notifyUpdate(QMainWindow* mainWindow,unsigned int Value,unsigned int MaxValue,unsigned int TimeElapsed) -{ - if ((TimeElapsed-activity_time)>25000) - { - UpdateSystemActivity(0); - activity_time = TimeElapsed; - } -} - -void notifyFinish(QMainWindow* mainWindow) -{ -} - -void notifyEvent(QMainWindow* mainWindow,unsigned long Id,const char* IdName,const QString &Text,const QString &Name) -{ - if (NotificationCenter != nil) - { - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - QByteArray dataText = Text.toUtf8(); - NSString* stringText = [[NSString alloc] initWithUTF8String: dataText.data() ]; - QByteArray dataName = Name.toUtf8(); - NSString* stringName = [[NSString alloc] initWithUTF8String: dataName.data() ]; - NSUserNotification* notification = [[UserNotification alloc] init]; - - [notification setTitle: stringName]; - [notification setInformativeText: stringText]; - [notification setHasActionButton: NO]; - [notification setOtherButtonTitle: @""]; - - [NotificationCenter deliverNotification: notification]; - - [notification release]; - [stringName release]; - [stringText release]; - [pool release]; - } -} - -void notifyCleanup() -{ -} -
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/notify_win.cpp ^
@@ -1,92 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#include "qtapp.h" -#include "notify.h" -#include <windows.h> -#include <shobjidl.h> - -//MIDL_INTERFACE("ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf") -class ITaskbarList3Lite : public ITaskbarList2 -{ -public: - virtual HRESULT STDMETHODCALLTYPE SetProgressValue( - / [in] / HWND hwnd, - / [in] / ULONGLONG ullCompleted, - / [in] / ULONGLONG ullTotal) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetProgressState( - / [in] / HWND hwnd, - / [in] / ULONG tbpFlags) = 0; -}; - - -static ITaskbarList3Lite ptl = NULL; -static unsigned int activity_time = 0; - -void notifyInit() -{ - static const UCHAR iidtl3[16]={0x91,0xfb,0x1a,0xea,0x28,0x9e,0x86,0x4b,0x90,0xe9,0x9e,0x9f,0x8a,0x5e,0xef,0xaf}; - if (CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, (UUID)iidtl3, (void*)&ptl)!=S_OK) - { - ptl = NULL; - } -} - -void notifyStart(QMainWindow mainWindow,unsigned long Id,const QString &Name) -{ - if (ptl) - { - ptl->SetProgressState(mainWindow->winId(),2); - } - activity_time = 0; -} - -void notifyUpdate(QMainWindow* mainWindow,unsigned int Value,unsigned int MaxValue,unsigned int TimeElapsed) -{ - if (ptl) - { - ptl->SetProgressValue(mainWindow->winId(),Value,MaxValue); - } - if ((TimeElapsed-activity_time)>15000) - { - SetThreadExecutionState(ES_SYSTEM_REQUIRED); - activity_time = TimeElapsed; - } -} - -void notifyEvent(QMainWindow* mainWindow,unsigned long Id,const char* IdName,const QString &Text,const QString &Name) -{ -} - -void notifyFinish(QMainWindow* mainWindow) -{ - if (ptl) - { - ptl->SetProgressState(mainWindow->winId(),0); - } -} - -void notifyCleanup() -{ - if (ptl) - { - ptl->Release(); - ptl = NULL; - } -} - -
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/qt_rsrc.qrc ^
@@ -1,43 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>img/128/download_manager.png</file> - <file>img/32/download_manager.png</file> - <file>img/22/download_manager.png</file> - <file>img/16/download_manager.png</file> - <file>img/32/configure.png</file> - <file>img/22/configure.png</file> - <file>img/16/configure.png</file> - <file>img/128/eject.png</file> - <file>img/64/eject.png</file> - <file>img/32/eject.png</file> - <file>img/22/eject.png</file> - <file>img/16/eject.png</file> - <file>img/32/stop.png</file> - <file>img/22/stop.png</file> - <file>img/16/stop.png</file> - <file>img/64/dvd_to_hd.png</file> - <file>img/64/hddvd_to_hd.png</file> - <file>img/64/bluray_to_hd.png</file> - <file>img/64/cd_loading.png</file> - <file>img/128/mkv_icon.png</file> - <file>img/64/mkv_icon.png</file> - <file>img/32/mkv_icon.png</file> - <file>img/22/mkv_icon.png</file> - <file>img/16/mkv_icon.png</file> - <file>img/128/stream.png</file> - <file>img/64/stream.png</file> - <file>img/32/stream.png</file> - <file>img/22/stream.png</file> - <file>img/16/stream.png</file> - <file>img/128/backup.png</file> - <file>img/64/backup.png</file> - <file>img/32/backup.png</file> - <file>img/22/backup.png</file> - <file>img/16/backup.png</file> - <file>img/128/revert.png</file> - <file>img/64/revert.png</file> - <file>img/32/revert.png</file> - <file>img/22/revert.png</file> - <file>img/16/revert.png</file> -</qresource> -</RCC>
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/sem_darwin.cpp ^
@@ -1,66 +0,0 @@ -/* - MakeMKV GUI - Graphics user interface application for MakeMKV - - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> - - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - -/ -#include <lgpl/aproxy.h> -#include <lgpl/smem.h> -#include <lgpl/sstring.h> -#include <stdint.h> -#include <unistd.h> -#include <sys/types.h> -#include <stdio.h> - -#include <mach/mach.h> -#include <mach/message.h> - -mach_port_t MacBootstrapGetPort(const char name); - -bool ApOpenSgrp(AP_SGRP sgrp,const uint64_t data) -{ - mach_port_t port[2]; - - for (unsigned int i=0;i<2;i++) - { - port[i] = MacBootstrapGetPort( ((const char)data) + data[i]); - if (port==MACH_PORT_NULL) return false; - } - sgrp->a_id = port[0]; - sgrp->b_id = port[1]; - - return true; -} - -bool ApSemInc(AP_SGRP sgrp,uintptr_t sid) -{ - kern_return_t kerr; - - kerr = semaphore_signal((semaphore_t)sid); - - return(kerr==KERN_SUCCESS); -} - -bool ApSemDec(AP_SGRP *sgrp,uintptr_t sid) -{ - mach_timespec_t tm; - kern_return_t kerr; - - tm.tv_sec = AP_SEM_TIMEOUT; - tm.tv_nsec = 0; - - kerr = semaphore_timedwait((semaphore_t)sid,tm); - - return(kerr==KERN_SUCCESS); -} -
[-] [+]	Deleted	makemkv-oss-1.7.10.tar.bz2/makemkvgui/src/win_rsrc.rc ^
@@ -1,25 +0,0 @@ - -0 ICON "img/ico/mkv_icon_all.ico" - -1 VERSIONINFO - FILEVERSION 1,7,10,0 - PRODUCTVERSION 1,7,10,0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "GuinpinSoft inc" - VALUE "FileDescription", "MakeMKV GUI application" - VALUE "FileVersion", "v1.7.10" - VALUE "LegalCopyright", "Copyright (C) 2007-2012 GuinpinSoft inc" - VALUE "ProductName", "MakeMKV" - VALUE "ProductVersion", "v1.7.10" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END -
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/License.txt ^
@@ -0,0 +1,578 @@ +Copyright (C) 2007-2013 GuinpinSoft inc + +IMPORTANT NOTE + +The Software, as defined below, is protected by copyright, which is vested in GuinpinSoft inc. + +The Software may only be used in accordance with the terms and conditions set out in this document. + +If you do not read and agree to be bound by the terms and conditions defined in this document, you are not permitted to keep or use the Software in any way whatsoever and must destroy or return all copies of these items which are in your possession. + + +END USER LICENSE AGREEMENT + +DEFINITIONS + +The following definitions apply to the terms and conditions included in this Agreement. + +MakeMKV +means a computer program, developed by GuinpinSoft inc, for converting audio/video clips between different formats. + +Open-source Software +means certain files included into MakeMKV software package that are licensed under various open-source licenses. The full list of such files is specified in Appendix A. The full text of corresponding open-source licenses can be found in Appendix B. + +Software +means MakeMKV, all program and information files and other documentation which are part of the MakeMKV Software package but excluding Open-source Software. + +Individual +means a particular person. + + +TERMS OF AGREEMENT + +This is a legal agreement between you, the users, and GuinpinSoft inc. By installing or using this Software, you agree to be bound by the terms of this agreement. If you do not agree to these terms, you may not use or install the Software. + +You are entitled to use the Software on all personal computers (laptops/desktops). "Use" means loaded in temporary memory or permanent storage on the computer. + +You may not use the Software for any unlawful activity. Specifically, you may not use the Software to commit copyright infringement, you may only use the Software to make copies of works where you either hold the copyright or have obtained permission to copy from the copyright owner or where you allowed to make a copy by applicable law. If you violate the law you may be subject to claims for damages and/or criminal penalties. + +The Software contains cryptographic functionality. The use of cryptographic software without a permit may be illegal in some jurisdictions. By the nature of audio/video format conversion the Software may bypass certain copy protection mechanisms to access audio/video data. You, the user, must check your local laws and regulations before using the Software to ensure that both activities are allowed in your jurisdiction. + +You may not sell, rent, lease or sublicense the Software, without the explicit written consent of GuinpinSoft inc. + +The Software is protected by copyright laws and international treaties. + +All intellectual property rights such as but not limited to patents, trademarks, copyrights or trade secret rights related to the Software are the property of and remains vested in GuinpinSoft inc. + +You shall not modify, translate, reverse engineer, decompile or disassemble the Software or any part thereof or otherwise attempt to derive source code, create or use derivative works therefrom. + +You are not allowed to remove, alter or destroy any proprietary, trademark or copyright markings or notices placed upon or contained with the Software. + +You are allowed to redistribute the Software in it original unmodified form. In addition, as a special exception, you may extract and repackage Linux-specific part of the Software for the purpose of creating a distribution-specific package, as long as program files and this license remain unchanged. + + +YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT USE OF THE SOFTWARE IS AT YOUR OWN RISK AND THAT THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTIES OR CONDITIONS WHATSOEVER. GUINPINSOFT INC DOES NOT WARRANT THAT THE FUNCTIONS OF THE SOFTWARE WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE. YOU ASSUME RESPONSIBILITY FOR SELECTING THE SOFTWARE TO ACHIEVE YOUR INTENDED RESULTS, AND FOR THE USE AND THE RESULTS OBTAINED FROM THE SOFTWARE. + +GUINPINSOFT INC DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES RELATED TO: NON-INFRINGEMENT, LACK OF VIRUSES, ACCURACY OR COMPLETENESS OF RESPONSES OR RESULTS, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +IN NO EVENT SHALL GUINPINSOFT INC BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR FOR ANY DAMAGES WHATSOEVER (INCLUDING BUT NOT LIMITED TO DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, PERSONAL INJURY, LOSS OF PRIVACY OR OTHER PECUNIARY OR OTHER LOSS WHATSOEVER) ARISING OUT OF USE OR INABILITY TO USE THE SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +REGARDLESS OF THE FORM OF ACTION, GUINPINSOFT INC AGGREGATE LIABILITY ARISING OUT OF OR RELATED TO THIS AGREEMENT SHALL NOT EXCEED THE TOTAL AMOUNT PAYABLE BY YOU UNDER THIS AGREEMENT. THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY TO THE MAXIMUM EXTENT ALLOWED BY APPLICABLE LAW. + +The Software may be subject to export or import regulations, and the user agrees to comply strictly with all such laws and regulations. The user agrees not to export or re-export the Software or any part thereof or information pertaining thereto to any country for which a U.S. government agency requires an export license or other governmental approval without first obtaining such license or approval. + +Any variation to the terms of this Agreement shall only be valid if made in writing by GuinpinSoft inc. + +Appendix A +List of Open-source Software components + +Files in this package are licensed under various licenses. Please see the header of each individual file for licensing information. All binary files and files without explicit license information are licensed under terms of this Agreement. + +Appendix B +Full text of open-source licenses: + +------------------------------------------------------------------------------- + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + +
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/inc/lgpl/expatabi.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/inc/lgpl/httpabi.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/inc/lgpl/osslabi.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -31,7 +31,7 @@ /* AES / typedef struct _OSSL_AES_KEY OSSL_AES_KEY; -unsigned int OSSL_sizeof_AES_KEY(); +unsigned int OSSL_sizeof_AES_KEY(); int OSSL_AES_set_encrypt_key(const unsigned char userKey, const int bits, OSSL_AES_KEY key); @@ -42,7 +42,7 @@ const OSSL_AES_KEY key); void OSSL_AES_decrypt(const unsigned char in, unsigned char out, const OSSL_AES_KEY key); - + void OSSL_AES_cbc_decrypt(const unsigned char in, unsigned char out, const unsigned long length, const OSSL_AES_KEY key, unsigned char *ivec);
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/inc/lgpl/sysabi.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/inc/lgpl/zlibabi.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/httplinux.cpp ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/httpmac.cpp ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -47,7 +47,7 @@ return -4; } - CFHTTPMessageSetHeaderFieldValue( messageRef, CFSTR("User-Agent"), sagent ); + CFHTTPMessageSetHeaderFieldValue( messageRef, CFSTR("User-Agent"), sagent ); CFRelease(sagent); CFReadStreamRef readStreamRef = CFReadStreamCreateForHTTPRequest( kCFAllocatorDefault, messageRef );
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/httpwin.cpp ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/ossl_aes.c ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -26,7 +26,7 @@ unsigned int OSSL_sizeof_AES_KEY() { return (((sizeof(AES_KEY) + (sizeof(void)-1))/sizeof(void))sizeof(void)); -} +} int OSSL_AES_set_encrypt_key(const unsigned char userKey, const int bits, OSSL_AES_KEY key) @@ -45,7 +45,7 @@ { AES_encrypt(in,out,(AES_KEY)key); } - + void OSSL_AES_decrypt(const unsigned char in, unsigned char out, const OSSL_AES_KEY key) {
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/ossl_ec.c ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -134,7 +134,7 @@ return EC_POINT_set_affine_coordinates_GFp((const EC_GROUP )grp, (EC_POINT )point, (const BIGNUM )x, (const BIGNUM )y, (BN_CTX )ctx); } - + int OSSL_EC_POINT_get_affine_coordinates_GFp(const OSSL_EC_GROUP grp, const OSSL_EC_POINT point, OSSL_BIGNUM x, OSSL_BIGNUM y, OSSL_BN_CTX ctx) {
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/ossl_sha.c ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/sys_linux.c ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/xpat.c ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libabi/src/zlib.c ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -48,11 +48,11 @@ { int err; uLongf dlen; - + dlen = destLen; err = compress2(dest,&dlen,source,sourceLen,compressionLevel); destLen = (unsigned int)dlen; - + return ZLIB_translateError(err); }
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/inc/driveio/driveio.h ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -48,7 +48,7 @@ // 31......24 23..16 16.0 // [Category] [Type] [Id] // -typedef enum _DriveInfoId +typedef enum _DriveInfoId { // dicat_Invalid diid_InvalidValue=0,
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/inc/driveio/scsicmd.h ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/inc/lgpl/tcpip.h ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -64,13 +64,13 @@ /* WinSock DLL. / return err; } - + if ( LOBYTE( wsaData.wVersion ) != 2 \|\| HIBYTE( wsaData.wVersion ) != 0 ) { / Tell the user that we could not find a usable / / WinSock DLL. */ WSACleanup( ); - return -1; + return -1; } return 0; }
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/drives/drive.h ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/drives/pioneer.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/drives/xboxhddvd.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/infolist.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -133,7 +133,7 @@ m_last = pitem; m_count ++; - + return true; }
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/scsihlp.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -42,7 +42,7 @@ cmd.CdbLen = CdbLen; bufsize = BufferSize; - if (bufsize>0xffff) + if (bufsize>0xffff) { if (false==Read) return -1; bufsize = 0xffff; @@ -186,7 +186,7 @@ } - if ( (res.Status==2) && + if ( (res.Status==2) && (res.SenseData[0]==0x70) && (res.SenseData[2]==2) && (res.SenseData[7]>=10) && @@ -318,7 +318,7 @@ } } else { *BufferSize=0; - if (res.Status!=0) + if (res.Status!=0) { return 0; }
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/scsihlp.h ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/stdquery.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -198,7 +198,7 @@ if (0==memcmp(ptr+8,"BDW",3)) struct_size=112; if (0==memcmp(ptr+8,"BDR",3)) struct_size=112; if (0==struct_size) break; - if (struct_size>rest) + if (struct_size>rest) { if (ZeroOnOverflow) return 0; break; @@ -469,7 +469,7 @@ bool ready; if (0!=(err=TestUnitReady(ScsiTarget,&ready))) return err; - if (false==ready) + if (false==ready) { return FailIfNotReady?EBUSY:0; }
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/tipclient.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/tipcommon.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -141,8 +141,8 @@ static unsigned int decode_int(const uint8_t* buf,uint64_t* pval) { - if (0==buf) - { + if (0==buf) + { *pval = 0; return 1; } @@ -201,25 +201,25 @@ uint8_t buf[10]; err=recv_char(s,&buf[0]); - if (err<0) + if (err<0) { return err; } - if (buf[0]>(sizeof(buf)-1)) + if (buf[0]>(sizeof(buf)-1)) { return -ERANGE; } err=recv_data(s,buf+1,buf[0]); - if (err<0) + if (err<0) { return err; } uint64_t pv; - if (decode_int(buf,&pv)!= (1+buf[0]) ) + if (decode_int(buf,&pv)!= (1+buf[0]) ) { return -ERANGE; }
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/tipcommon.h ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libdriveio/src/tipserver.cpp ^
@@ -1,7 +1,7 @@ /* libDriveIo - MMC drive interrogation library - Copyright (C) 2009-2010 GuinpinSoft inc <libdriveio@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libdriveio@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -69,14 +69,14 @@ } err=recv_data(s,p_in,Cmd.InputLen); - if (err<0) + if (err<0) { free(mem_in); return err; } err=recv_int(s,&ti); - if (err<0) + if (err<0) { free(mem_in); return err; @@ -92,7 +92,7 @@ if (Cmd.OutputLen>SmallBufferSize) { Cmd.OutputBuffer = mem_out = malloc(Cmd.OutputLen); - if (NULL==mem_out) + if (NULL==mem_out) { free(mem_in); return -ENOMEM;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libffcodec/src/ffcodec.c ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libffcodec/src/ffcodec.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libffcodec/src/misc.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -60,7 +60,7 @@ typedef int (ffcdecl AVIOReadProc)(uintptr_t fd, unsigned char buf, unsigned int size); typedef int (ffcdecl AVIOWriteProc)(uintptr_t fd, const unsigned char buf, unsigned int size); -typedef struct AVIOContext +typedef struct AVIOContext { uintptr_t fd; uint64_t pos;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/inc/lgpl/cassert ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/inc/lgpl/smem.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/inc/lgpl/world.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -52,8 +52,8 @@ virtual void __cdecl iso6392T(char* lang)=0; }; -#define WORLD_VER 19 // increment on changes -#define WORLD_NAME ( ((sizeof(IWorld))<<8) + WORLD_VER ) +#define WORLD_VER 20 // increment on changes +#define WORLD_NAME ( (WORLD_VER<<8) \| sizeof(IWorld) \| 1 ) #ifdef LGPL_WORLD_LOCAL #define my_world my_lgpl_local_world
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/inc/libmkv/ebmlwrite.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -30,7 +30,7 @@ bool m_OvrOffsetSet; public: CEbmlWrite(IMkvWriteTarget *Writer) - : m_Writer(Writer) , + : m_Writer(Writer) , m_Offset(0) , m_OvrOffsetSet(false) {
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/inc/libmkv/internal.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/inc/libmkv/libmkv.h ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -26,19 +26,6 @@ typedef char mkv_utf8_t; -#ifdef HAVE_FSOURCE_PRIV -#include <fsource/libmkvpriv.h> -#else - -typedef struct _mkv_track_video_priv_pub -{ - int t0; - int t1; - bool t2; -} mkv_track_video_priv_t; - -#endif - static const unsigned int MKV_CHUNK_KEYFRAME=1; static const unsigned int MKV_CHUNK_CLUSTER_START=2; static const unsigned int MKV_CHUNK_CHAPTER_MARK=4; @@ -65,7 +52,7 @@ public: int64_t timecode; int64_t duration; - uint16_t flags; + uint32_t flags; public: inline bool keyframe() const { return (0!=(flags&MKV_CHUNK_KEYFRAME)); } inline bool cluster_start() const { return (0!=(flags&MKV_CHUNK_CLUSTER_START)); } @@ -130,8 +117,7 @@ int fps_n; int fps_d; - // private, do not use - mkv_track_video_priv_t priv; + uint64_t priv[2]; } video; struct _audio @@ -174,30 +160,11 @@ virtual IMkvFrameSource* MkvGetStream(unsigned int Index)=0; }; -typedef enum _MkvChapterType -{ - mccUnknown, - mccChapterMark, - mccTimecode -} MkvChapterType; - -static const unsigned int MKV_MAX_CHAPTER_NAMES=25; - typedef struct _MkvChapterInfo { - MkvChapterType type; - union _position - { - uint64_t time_c; - struct _loc - { - uint32_t seg; - uint64_t off; - } loc; - } position; - unsigned int name_count; - const char* name_lang[MKV_MAX_CHAPTER_NAMES]; - const mkv_utf8_t* name_text[MKV_MAX_CHAPTER_NAMES]; + unsigned int name_count; + const char* const * name_lang; + const mkv_utf8_t* const * name_text; } MkvChapterInfo; typedef struct _MkvAttachmentInfo @@ -237,6 +204,7 @@ bool useISO639Type2T; bool setFirstAudioTrackAsDefault; bool setFirstSubtitleTrackAsDefault; + bool insertFirstChapter00IfMissing; } MkvProfileInfo; typedef struct _MkvFormatInfo
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/src/ebmlwrite.cpp ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/src/libmkv.cpp ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -58,7 +58,7 @@ return UnscaledTimecode / TIMECODE_SCALE; } -static inline int64_t TimecodeFromClock(int64_t MkvClockTimecode) +static inline uint64_t TimecodeFromClock(uint64_t MkvClockTimecode) { return ((MkvClockTimecode25)/27); } @@ -106,7 +106,7 @@ static void OverwriteIntegerData(IOCallback & output, uint64_t Value, uint64_t Position, unsigned int Size) { binary FinalData[8]; // we don't handle more than 64 bits integers - + uint64 TempValue = Value; for (unsigned int i=0; i<Size;i++) { FinalData[Size-i-1] = TempValue & 0xFF; @@ -121,40 +121,6 @@ static void FinishCluster(KaxCluster cluster,IOCallback File,KaxSegment Segment); -static bool AtKeyFrame(IMkvTrack Input) -{ - bool rtn = false; - for (unsigned int i=0;i<Input->MkvGetStreamCount();i++) - { - IMkvFrameSource p; - p = Input->MkvGetStream(i); - - if (false==p->FetchFrames(1)) return false; - if (0==p->GetAvailableFramesCount()) continue; - - if (false==p->PeekFrame(0)->keyframe()) return false; - } - - return true; -} - -static bool AtClusterStart(IMkvTrack Input) -{ - bool rtn = false; - for (unsigned int i=0;i<Input->MkvGetStreamCount();i++) - { - IMkvFrameSource p; - p = Input->MkvGetStream(i); - - if (false==p->FetchFrames(1)) return false; - if (0==p->GetAvailableFramesCount()) continue; - - if (false==p->PeekFrame(0)->cluster_start()) return false; - } - - return true; -} - static int64_t GetClusterTimecode(IMkvTrack Input) { int64_t rtn = -1; @@ -165,7 +131,7 @@ p = Input->MkvGetStream(i); - if (false==p->FetchFrames(1)) return false; + CNZ(p->FetchFrames(1)); frameCount = p->GetAvailableFramesCount(); @@ -218,20 +184,15 @@ { private: KaxChapters m_Chapters; - std::vector<KaxChapterAtom> m_ChapterMarks; + std::vector<KaxChapterAtom> m_Atoms; unsigned int m_RealCount; bool m_DoRender; IMkvTitleInfo m_TitleInfo; MkvFormatInfo* m_FormatInfo; public: - CChapters(IMkvTitleInfo* TitleInfo,MkvFormatInfo* FormatInfo) + CChapters(IMkvTitleInfo* TitleInfo,MkvFormatInfo* FormatInfo) : m_RealCount(0) , m_TitleInfo(TitleInfo) , m_FormatInfo(FormatInfo) { - Init(); - } - void Init() - { - MkvChapterType ctype; MkvChapterInfo ti; unsigned int chap_count = m_TitleInfo->GetChapterCount(); @@ -239,86 +200,31 @@ if (chap_count==0) return; - memset(&ti,0,sizeof(ti)); - m_TitleInfo->GetChapterInfo(&ti,0); - ctype = ti.type; + KaxEditionEntry &edit = CreateEdition(); - // verify type for (unsigned int i=0;i<chap_count;i++) { + KaxChapterAtom* atom; + memset(&ti,0,sizeof(ti)); m_TitleInfo->GetChapterInfo(&ti,i); - if (ti.type!=ctype) - { - throw mkv_error_exception("Mixed chapter types are not supported (yet?)."); - } - } - - switch(ctype) - { - case mccChapterMark: - ReserveChapterMarks(1+chap_count); - SetEmptyChapterName(m_ChapterMarks[0],0); - for (unsigned int i=0;i<chap_count;i++) - { - memset(&ti,0,sizeof(ti)); - m_TitleInfo->GetChapterInfo(&ti,i); - if (ti.name_count) - { - for (unsigned int j=0;j<ti.name_count;j++) - { - SetChapterName(m_ChapterMarks[i+1],ti.name_lang[j],ti.name_text[j]); - } - } else { - SetEmptyChapterName(m_ChapterMarks[i+1],i+1); - } - } - m_DoRender = (chap_count>0); - break; - case mccTimecode: - { - KaxEditionEntry &edit = CreateEdition(); - for (unsigned int i=0;i<chap_count;i++) - { - memset(&ti,0,sizeof(ti)); - m_TitleInfo->GetChapterInfo(&ti,i); - if (i==0) - { - if (IsVerySmallTimecode(ti.position.time_c)) - { - ti.position.time_c=0; - } else { - KaxChapterAtom& first_atom = AddNewChild<KaxChapterAtom>(edit); - GetChild<EbmlUInteger,KaxChapterUID>( first_atom ) = Rand64(); - GetChild<EbmlUInteger,KaxChapterTimeStart>( first_atom ) = 0; - SetEmptyChapterName(&first_atom,0); - m_RealCount++; - } - } + atom = & AddNewChild<KaxChapterAtom>(edit); + GetChild<EbmlUInteger,KaxChapterUID>( atom ) = Rand64(); - KaxChapterAtom& atom = AddNewChild<KaxChapterAtom>(edit); - GetChild<EbmlUInteger,KaxChapterUID>( atom ) = Rand64(); - GetChild<EbmlUInteger,KaxChapterTimeStart>( atom ) = TimecodeFromClock(ti.position.time_c); + GetChild<EbmlUInteger,KaxChapterTimeStart>( atom ) = 0; + GetChild<EbmlUInteger,KaxChapterTimeStart>( atom ).SetDefaultSize(MAX_TIMECODE_SIZE_BYTES); + GetChild<EbmlUInteger,KaxChapterTimeEnd>( atom ) = 0; + GetChild<EbmlUInteger,KaxChapterTimeEnd>( atom ).SetDefaultSize(MAX_TIMECODE_SIZE_BYTES); - if (ti.name_count) - { - for (unsigned int j=0;j<ti.name_count;j++) - { - SetChapterName(&atom,ti.name_lang[j],ti.name_text[j]); - } - } else { - SetEmptyChapterName(&atom,m_RealCount); - } - m_RealCount++; - } + for (unsigned int j=0;j<ti.name_count;j++) + { + SetChapterName(atom,ti.name_lang[j],ti.name_text[j]); } - m_DoRender = (m_RealCount>1); - break; - default: - throw mkv_error_exception("Unsupported chapter type"); - break; + + m_Atoms.push_back(atom); } + m_DoRender = (chap_count>0); } void Render(IOCallback &File,KaxSeek Seek,const KaxSegment & FileSegment) { @@ -334,49 +240,35 @@ { if (!m_DoRender) return; - MKV_ASSERT(m_RealCount < m_ChapterMarks.size() ); MKV_ASSERT(Timecode < MAX_TIMECODE); - if (m_RealCount==0) + if (m_RealCount>0) { - MKV_ASSERT( m_ChapterMarks.size() >= 2 ); - - if (IsVerySmallTimecode(Timecode)) - { - m_ChapterMarks[0]->VoidMe(File); - Timecode = 0; - } else { - GetChild<EbmlUInteger,KaxChapterTimeStart>( (m_ChapterMarks[0]) ) = 0; - m_ChapterMarks[0]->OverwriteData(File,true); - } - m_RealCount=1; + GetChild<EbmlUInteger,KaxChapterTimeEnd>( (m_Atoms[m_RealCount-1]) ) = TimecodeFromClock(Timecode); + CNZ(m_Atoms[m_RealCount-1]->OverwriteData(File,true)); } - - GetChild<EbmlUInteger,KaxChapterTimeStart>( (m_ChapterMarks[m_RealCount]) ) = TimecodeFromClock(Timecode); - m_ChapterMarks[m_RealCount]->OverwriteData(File,true); + GetChild<EbmlUInteger,KaxChapterTimeStart>( (m_Atoms[m_RealCount]) ) = TimecodeFromClock(Timecode); + CNZ(m_Atoms[m_RealCount]->OverwriteData(File,true)); m_RealCount++; } - void Finalize(IOCallback &File,KaxSeek* Seek) + void Finalize(IOCallback &File,KaxSeek* Seek,uint64_t Duration) { if (!m_DoRender) return; - if (!m_ChapterMarks.empty()) - { - for (unsigned int i=m_RealCount;i<m_ChapterMarks.size();i++) - { - CNZ(m_ChapterMarks[i]->VoidMe(File)); - } - } if (m_RealCount<2) { - CNZ(m_Chapters.VoidMe(File)); + VoidElement(&m_Chapters,File); VoidElement(Seek,File); + return; + } + + GetChild<EbmlUInteger,KaxChapterTimeEnd>( m_Atoms[m_RealCount-1] ) = TimecodeFromClock(Duration); + CNZ(m_Atoms[m_RealCount-1]->OverwriteData(File,true)); + + for (unsigned int i=m_RealCount;i<m_Atoms.size();i++) + { + VoidElement(m_Atoms[i],File); } - } - static bool IsVerySmallTimecode(uint64_t Timecode) - { - static const uint64_t SmallTimecode = 108000000ll; // 0.1 sec - return (Timecode<=SmallTimecode); } private: void SetChapterName(KaxChapterAtom atom,const char lang,const mkv_utf8_t name) @@ -388,33 +280,10 @@ lgpl_iso6392T(langBuf); lang=langBuf; } - KaxChapterDisplay& disp = GetChild<KaxChapterDisplay>(atom); + KaxChapterDisplay& disp = AddNewChild<KaxChapterDisplay>(atom); GetChild<EbmlString,KaxChapterLanguage>(disp) = lang; GetChild<EbmlUnicodeString,KaxChapterString>(disp) = UTF8string(name); } - void SetEmptyChapterName(KaxChapterAtom* atom,unsigned int Id) - { - char ChapterName[128]; - sprintf_s(ChapterName,128,"Chapter %02u",Id+0); - SetChapterName(atom,"eng",ChapterName); - } - void ReserveChapterMarks(unsigned int Count) - { - if (0==Count) return; - - m_ChapterMarks.resize(Count); - - KaxEditionEntry &edit = CreateEdition(); - - for (unsigned int i=0;i<Count;i++) - { - m_ChapterMarks[i] = & AddNewChild<KaxChapterAtom>(edit); - GetChild<EbmlUInteger,KaxChapterUID>( (m_ChapterMarks[i]) ) = Rand64(); - - GetChild<EbmlUInteger,KaxChapterTimeStart>( (m_ChapterMarks[i]) ) = 0; - GetChild<EbmlUInteger,KaxChapterTimeStart>( (m_ChapterMarks[i]) ).SetDefaultSize(MAX_TIMECODE_SIZE_BYTES); - } - } KaxEditionEntry& CreateEdition() { KaxEditionEntry &edit = GetChild<KaxEditionEntry>(m_Chapters); @@ -655,7 +524,7 @@ track_default = 1; } - if ( (ttype==track_subtitle) && + if ( (ttype==track_subtitle) && (FormatInfo->profile.setFirstSubtitleTrackAsDefault) && IsFirstTrackOfType(Input,mttSubtitle,i) ) { @@ -739,7 +608,7 @@ { sprintf_s(fps_string,sizeof(fps_string),"%d",ti->u.video.fps_n); } - else + else { int fps_1=ti->u.video.fps_n/ti->u.video.fps_d; int64_t fps_2=( ( ((int64_t)ti->u.video.fps_n) 10000) / ti->u.video.fps_d) - (((int64_t)fps_1)10000); @@ -791,7 +660,7 @@ cc.PushElement(new NoDefault<KaxContentCompAlgo>); GetChild<EbmlUInteger,KaxContentCompAlgo>(cc) = track_info[i].compression_type; - + if (ti->header_comp_size) { GetChild<EbmlBinary,KaxContentCompSettings>(cc).CopyBuffer(ti->header_comp_data,ti->header_comp_size); @@ -813,7 +682,7 @@ KaxAttached pa; TitleInfo->GetAttachmentInfo(&ainfo,i); - + pa = & AddNewChild<KaxAttached>(MyAttachments); GetChild<EbmlUnicodeString,KaxFileName>(pa) = UTF8string(ainfo.name); GetChild<EbmlString,KaxMimeType>(pa) = ainfo.mime_type; @@ -833,28 +702,29 @@ MyTracks.RemoveAll(); KaxCluster curr_cluster=NULL,prev_cluster=NULL; - int64_t cluster_timecode=0,cue_timecode=0,frame_timecode; + int64_t cluster_timecode=0,frame_timecode; int64_t max_duration=0; uint64_t prg_val=0; int64_t frame_end; - bool cue_cluster=false; - - cue_timecode -= 9990000000ll; while(true) { - int64_t min_timecode; - unsigned int stream_id; + int64_t min_timecode1,min_timecode2; + unsigned int stream_id1,stream_id2,stream_id; IMkvFrameSource stream; + int clusterFlags; + bool new_cluster; - min_timecode=BAD_TIMECODE; + min_timecode1=min_timecode2=BAD_TIMECODE; + clusterFlags = 0; - for (unsigned int i=0;i<Input->MkvGetStreamCount();i++) + for (unsigned int i=0;i<tracks.size();i++) { - bool force_fetch; + bool force_fetch,type2; unsigned int frames_scan; force_fetch = ( (track_info[i].info.type==mttVideo) \|\| (track_info[i].info.type==mttAudio) ); + type2 = true; if (false==Input->MkvGetStream(i)->FetchFrames(1,force_fetch)) { @@ -866,20 +736,35 @@ { frames_scan = Input->MkvGetStream(i)->GetAvailableFramesCount(); } + + if ( (track_info[i].info.type!=mttSubtitle) && frames_scan) + { + if (Input->MkvGetStream(i)->PeekFrame(0)->cluster_start()) + { + type2 = false; + clusterFlags \|= 1; + } else { + clusterFlags \|= 2; + } + } for (unsigned int j=0;j<frames_scan;j++) { int64_t dts; IMkvChunk* tf = Input->MkvGetStream(i)->PeekFrame(j); + if (tf->timecode==-1) throw mkv_error_exception("Frame not timestamped"); dts = ScaleTimecode(TimecodeFromClock(tf->timecode)+(TIMECODE_SCALE/2)); - if ( (dts<min_timecode) ) + if (dts<min_timecode1) { - if (tf->timecode==-1) throw mkv_error_exception("Frame not timestamped"); - - min_timecode = dts; - stream_id = i; + min_timecode1 = dts; + stream_id1 = i; + } + if ( (dts<min_timecode2) && type2 ) + { + min_timecode2 = dts; + stream_id2 = i; } } if (track_info[i].compression_type==MKV_TRACK_COMPRESSION_ZLIB) @@ -893,12 +778,48 @@ } } } - if (min_timecode==BAD_TIMECODE) + switch(clusterFlags) { - // no more frames + case 0: + stream_id = 0; + new_cluster = false; + break; + case 1: + if (Input->MkvGetStream(0)->GetAvailableFramesCount()) + { + stream_id = 0; + } else { + stream_id = stream_id1; + } + new_cluster = true; + break; + case 2: + stream_id = stream_id1; + new_cluster = false; + break; + case 3: + stream_id = stream_id2; + new_cluster = false; break; } + if (new_cluster) + { + for (unsigned int i=0;i<tracks.size();i++) + { + if (Input->MkvGetStream(i)->GetAvailableFramesCount()>0) + { + Input->MkvGetStream(i)->PeekFrame(0)->flags &= (~MKV_CHUNK_CLUSTER_START); + } + } + }; + + if (NULL==curr_cluster) + { + new_cluster=true; + stream_id=0; + } + // update UI if (0==stream_id) { @@ -907,50 +828,19 @@ IMkvChunk* frame,prev_frame; - stream = Input->MkvGetStream(stream_id); + stream = Input->MkvGetStream(stream_id); + if (stream->GetAvailableFramesCount()==0) + { + // no more frames + break; + } frame = stream->PeekFrame(0); if (frame->chapter_mark()) { - // dvd-style position based chapters Chapters.AddChapterMark(frame->timecode,File); } - bool new_cluster; - - new_cluster=false; - if (NULL==curr_cluster) - { - new_cluster=true; - } else { - int64_t cluster_duration,cluster_size; - - cluster_duration = frame->timecode - cluster_timecode; - cluster_size = File.getFilePointer() - curr_cluster->GetElementPosition(); - - if (cluster_duration > 432000000ll) - { - if (AtKeyFrame(Input)) - { - new_cluster=true; - } - } - if (cluster_duration > 864000000ll) - { - if (AtClusterStart(Input)) - { - new_cluster=true; - } - } - if (cluster_size > (1210241024)) - { - if (AtClusterStart(Input)) - { - new_cluster=true; - } - } - } - if (new_cluster) { if (NULL!=curr_cluster) @@ -958,7 +848,6 @@ FinishCluster(curr_cluster,&File,&FileSegment); } prev_cluster = curr_cluster; - cue_cluster = false; curr_cluster = & AddNewChild<KaxCluster>(FileSegment); curr_cluster->SetSizeInfinite(); curr_cluster->SetParent(FileSegment); @@ -984,6 +873,13 @@ } } + if (frame->get_size()==0) + { + CNZ(frame->compress_wait()); + stream->PopFrame(); + continue; + } + // have a frame and a cluster // update entire file duration @@ -1018,7 +914,7 @@ fetch_frames = 1; } - if (false==stream->FetchFrames(fetch_frames,true)) + if (false==stream->FetchFrames(fetch_frames,true)) { throw mkv_error_exception("Error while reading input"); } @@ -1042,7 +938,7 @@ { prev_frame = frame; frame=stream->PeekFrame(i); - if (frame->keyframe()!=frame_keyframe) + if ( (frame->keyframe()!=frame_keyframe) \|\| frame->cluster_start() ) { frames_count=i; break; @@ -1177,15 +1073,10 @@ CNZ(blks->Render(File)); } - if ( (track_info[stream_id].info.type==mttVideo) && - frame->cluster_start() && - (!cue_cluster) && - ((frame_timecode-cue_timecode)>270000000ll) ) + if (new_cluster) { KaxCuePoint cp = & AddNewChild<KaxCuePoint>(AllCues); cp->PositionSet(blki,blkg,TIMECODE_SCALE); - cue_timecode = frame_timecode; - cue_cluster = true; } delete blks; @@ -1205,7 +1096,7 @@ CNZ(AllCues.Render(File)); UpdateSeekEntry(seek_cues,File,AllCues,FileSegment); - Chapters.Finalize(File,seek_chap); + Chapters.Finalize(File,seek_chap,max_duration); // delete empty tracks for (unsigned int i=0;i<Input->MkvGetStreamCount();i++) @@ -1224,8 +1115,8 @@ static void FinishCluster(KaxCluster cluster,IOCallback File,KaxSegment Segment) { - // add position info - GetChild<EbmlUInteger,KaxClusterPosition>(cluster) = + // add position info + GetChild<EbmlUInteger,KaxClusterPosition>(cluster) = cluster->GetElementPosition() - ( Segment->GetElementPosition() + Segment->HeadSize() ); GetChild<KaxClusterPosition>(cluster).Render(File); @@ -1238,7 +1129,7 @@ bool __cdecl MkvCreateFile(IMkvWriteTarget* Output,IMkvTrack Input,const char WritingApp,IMkvTitleInfo* TitleInfo,MkvFormatInfo* FormatInfo) throw() { CEbmlWrite wrt(Output); - try + try { MkvCreateFileInternal(wrt,Input,TitleInfo,FormatInfo,WritingApp); return true;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/src/version.cpp ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/libmakemkv/src/world.cpp ^
@@ -1,7 +1,7 @@ /* libMakeMKV - MKV multiplexer library - Copyright (C) 2009-2010 GuinpinSoft inc <libmkv@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makefile.common ^
@@ -56,17 +56,14 @@ makemkvgui/src/logic.cpp makemkvgui/src/logtext.cpp makemkvgui/src/main.cpp makemkvgui/src/nativefiledialog.cpp \ makemkvgui/src/mainwnd.cpp makemkvgui/src/marshall.cpp makemkvgui/src/progress.cpp makemkvgui/src/scsiinfo.cpp \ makemkvgui/src/settingdlg.cpp makemkvgui/src/uisync.cpp makemkvgui/src/viteminfo.cpp \ - makemkvgui/src/backupdlg.cpp makemkvgui/src/lstring.cpp makemkvgui/src/notify.cpp makemkvgui/src/str/en_utf16.cpp + makemkvgui/src/backupdlg.cpp makemkvgui/src/lstring.cpp makemkvgui/src/notify.cpp makemkvgui/src/str/en_utf16.cpp \ + makemkvgui/src/image.cpp makemkvgui/src/abutton.cpp -MAKEMKVGUI_GEN=tmp/qt_rsrc.cpp \ +MAKEMKVGUI_GEN=\ tmp/moc_mainwnd.cpp tmp/moc_logtext.cpp tmp/moc_dirselectbox.cpp tmp/moc_aboutbox.cpp tmp/moc_settingdlg.cpp tmp/moc_backupdlg.cpp -MAKEMKVGUI_SRC_WIN=makemkvgui/src/api_win.cpp makemkvgui/src/logic_win.cpp makemkvgui/src/notify_win.cpp - -MAKEMKVGUI_SRC_DARWIN=makemkvgui/src/api_posix.cpp makemkvgui/src/api_darwin.cpp makemkvgui/src/logic_posix.cpp \ - makemkvgui/src/notify_none.cpp makemkvgui/src/sem_darwin.cpp makemkvgui/src/macutil.mm makemkvgui/src/spawn_posix.cpp - MAKEMKVGUI_SRC_LINUX=makemkvgui/src/api_posix.cpp makemkvgui/src/api_linux.cpp makemkvgui/src/sem_posix.cpp \ makemkvgui/src/spawn_posix.cpp makemkvgui/src/logic_posix.cpp \ - makemkvgui/src/notify_linux.cpp + makemkvgui/src/notify_linux.cpp makemkvgui/src/image_linux.cpp \ + tmp/image_data.o
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makefile.linux ^
@@ -2,7 +2,6 @@ include makefile.common GCC=gcc -RCC=rcc MOC=$(strip $(shell which moc-qt4)) ifeq ($(MOC),) MOC=moc @@ -31,11 +30,11 @@ endif install -D -m 755 out/makemkv $(DESTDIR)$(PREFIX)/bin/makemkv install -D -m 644 makemkvgui/share/makemkv.desktop $(DESTDIR)$(PREFIX)/share/applications/makemkv.desktop - install -D -m 644 makemkvgui/src/img/16/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/makemkv.png - install -D -m 644 makemkvgui/src/img/22/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/makemkv.png - install -D -m 644 makemkvgui/src/img/32/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/makemkv.png - install -D -m 644 makemkvgui/src/img/64/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/makemkv.png - install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png + install -D -m 644 makemkvgui/share/icons/16x16/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/makemkv.png + install -D -m 644 makemkvgui/share/icons/22x22/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/makemkv.png + install -D -m 644 makemkvgui/share/icons/32x32/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/makemkv.png + install -D -m 644 makemkvgui/share/icons/64x64/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/makemkv.png + install -D -m 644 makemkvgui/share/icons/128x128/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png out/%: out/%.full objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ @@ -56,7 +55,7 @@ -fPIC -Xlinker -dy -Xlinker --version-script=libmakemkv/src/libmakemkv.vers \ -Xlinker -soname=libmakemkv.so.1 -lc -lstdc++ -lcrypto -lz -lexpat -out/makemkv.full: $(MAKEMKVGUI_GEN) tmp/gen_buildinfo.h +out/makemkv.full: $(MAKEMKVGUI_GEN) $(MAKEMKVGUI_SRC_LINUX) tmp/gen_buildinfo.h mkdir -p out $(GCC) $(CXXOPTS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \ $(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) $(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \ @@ -73,7 +72,8 @@ mkdir -p tmp $(MOC) -o $@ $< -tmp/qt_rsrc.cpp : makemkvgui/src/qt_rsrc.qrc +tmp/image_data.o : makemkvgui/bin/image_data.bin mkdir -p tmp - $(RCC) -name rsrc -o $@ $< + ld -r -b binary -o $@.rw $< + objcopy --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/bin ^
+(directory)
	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/bin/image_data.bin ^
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/inc/QtExt/NativeFileDialog.h ^
@@ -1,17 +1,21 @@ /* - MakeMKV GUI - Graphics user interface application for MakeMKV + Qt extension library - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libqtext@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + 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. - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef QEXT_NATIVEFILEDIALOG_H
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/inc/lgpl/apdefs.h ^
@@ -42,6 +42,7 @@ static const unsigned int AP_vastr_OutputFolderName=14; static const unsigned int AP_vastr_OutputBaseName=15; static const unsigned int AP_vastr_CurrentProfile=16; +static const unsigned int AP_vastr_OpenFileFilter=17; // typedef enum _AP_ItemAttributeId { @@ -81,6 +82,8 @@ ap_iaOrderWeight=33, ap_iaOutputFormat=34, ap_iaOutputFormatDescription=35, + ap_iaSeamlessInfo=36, + ap_iaPanelText=37, ap_iaMaxValue } AP_ItemAttributeId; @@ -89,8 +92,14 @@ static const unsigned int AP_DskFsFlagBlurayFilesPresent=4; static const unsigned int AP_DskFsFlagAacsFilesPresent=8; static const unsigned int AP_DskFsFlagBdsvmFilesPresent=16; -static const unsigned int AP_DskFsFlagDiskIsLoading=256; -static const unsigned int AP_DskFsFlagDiskIsAbsent=512; + + +static const unsigned int AP_DriveStateNoDrive=256; +static const unsigned int AP_DriveStateUnmounting=257; +static const unsigned int AP_DriveStateEmptyClosed=0; +static const unsigned int AP_DriveStateEmptyOpen=1; +static const unsigned int AP_DriveStateInserted=2; +static const unsigned int AP_DriveStateLoading=3; static const unsigned int AP_Notify_UpdateLayoutFlag_NoTime=1; @@ -129,7 +138,8 @@ static const unsigned long APP_IFACE_OPENFILE_TITLE=6003; static const unsigned long APP_SETTINGDLG_TITLE=6135; static const unsigned long APP_BACKUPDLG_TITLE=6136; -static const unsigned long APP_IFACE_OPENFILE_FILTER=6004; +static const unsigned long APP_IFACE_OPENFILE_FILTER_TEMPLATE1=6007; +static const unsigned long APP_IFACE_OPENFILE_FILTER_TEMPLATE2=6008; static const unsigned long APP_IFACE_OPENFOLDER_TITLE=6005; static const unsigned long APP_IFACE_OPENFOLDER_INFO_TITLE=6006; static const unsigned long APP_IFACE_PROGRESS_TITLE=6038; @@ -163,6 +173,8 @@ static const unsigned long APP_IFACE_ACT_REGISTER_STIP=6048; static const unsigned long APP_IFACE_ACT_PURCHASE_NAME=6145; static const unsigned long APP_IFACE_ACT_PURCHASE_STIP=6146; +static const unsigned long APP_IFACE_ACT_CLEARLOG_NAME=6110; +static const unsigned long APP_IFACE_ACT_CLEARLOG_STIP=6111; static const unsigned long APP_IFACE_ACT_EJECT_NAME=6052; static const unsigned long APP_IFACE_ACT_EJECT_STIP=6053; static const unsigned long APP_IFACE_ACT_REVERT_NAME=6105; @@ -173,6 +185,8 @@ static const unsigned long APP_IFACE_ACT_OPENDISC_HDDVD=6063; static const unsigned long APP_IFACE_ACT_OPENDISC_BRAY=6064; static const unsigned long APP_IFACE_ACT_OPENDISC_LOADING=6065; +static const unsigned long APP_IFACE_ACT_OPENDISC_UNKNOWN=6099; +static const unsigned long APP_IFACE_ACT_OPENDISC_NODISC=6109; static const unsigned long APP_IFACE_ACT_TTREE_TOGGLE=6066; static const unsigned long APP_IFACE_ACT_TTREE_SELECT_ALL=6067; static const unsigned long APP_IFACE_ACT_TTREE_UNSELECT_ALL=6068; @@ -256,6 +270,7 @@ static const unsigned long APP_IFACE_BACKUPDLG_OPTIONS=6147; static const unsigned long APP_IFACE_BACKUPDLG_DECRYPT=6148; static const unsigned long APP_IFACE_DRIVEINFO_LOADING=6100; +static const unsigned long APP_IFACE_DRIVEINFO_UNMOUNTING=6112; static const unsigned long APP_IFACE_DRIVEINFO_WAIT=6101; static const unsigned long APP_IFACE_DRIVEINFO_NODISC=6102; static const unsigned long APP_IFACE_DRIVEINFO_DATADISC=6103; @@ -270,11 +285,16 @@ static const unsigned long APP_IFACE_ITEMINFO_SOURCE=6119; static const unsigned long APP_IFACE_ITEMINFO_TITLE=6120; static const unsigned long APP_IFACE_ITEMINFO_TRACK=6121; +static const unsigned long APP_IFACE_ITEMINFO_ATTACHMENT=6122; +static const unsigned long APP_IFACE_ITEMINFO_CHAPTER=6123; +static const unsigned long APP_IFACE_ITEMINFO_CHAPTERS=6124; static const unsigned long APP_TTREE_TITLE=6200; static const unsigned long APP_TTREE_VIDEO=6201; static const unsigned long APP_TTREE_AUDIO=6202; static const unsigned long APP_TTREE_SUBPICTURE=6203; static const unsigned long APP_TTREE_ATTACHMENT=6214; +static const unsigned long APP_TTREE_CHAPTERS=6215; +static const unsigned long APP_TTREE_CHAPTER=6216; static const unsigned long APP_TTREE_FORCED_SUBTITLES=6211; static const unsigned long APP_TTREE_HDR_TYPE=6204; static const unsigned long APP_TTREE_HDR_DESC=6205; @@ -293,6 +313,7 @@ static const unsigned long APP_SI_FIRMWARE=6306; static const unsigned long APP_SI_FIRDATE=6307; static const unsigned long APP_SI_BECFLAGS=6308; +static const unsigned long APP_SI_HIGHEST_AACS=6309; static const unsigned long APP_SI_DISCINFO=6320; static const unsigned long APP_SI_NODISC=6321; static const unsigned long APP_SI_DISCLOAD=6322;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/inc/lgpl/aproxy.h ^
@@ -67,7 +67,7 @@ #endif #ifdef __GNUC__ -#define ALIGN_PACKED __attribute((packed)) +#define ALIGN_PACKED __attribute((packed)) #endif typedef struct _AP_SHMEM @@ -146,6 +146,7 @@ apBackSetTitleCollInfo, apBackSetTitleInfo, apBackSetTrackInfo, + apBackSetChapterInfo, apBackFatalCommError=250, apBackOutOfMem, @@ -153,10 +154,11 @@ apUnknown } AP_CMD; -#define AP_CRE_VER "C000E" -#define AP_GUI_VER "G000E" +#define AP_CRE_VER "C0010" +#define AP_GUI_VER "G0010" typedef uint32_t AP_DiskFsFlags; +typedef uint32_t AP_DriveState; #include <lgpl/apdefs.h> @@ -167,6 +169,7 @@ class AP_UiItem { + friend class CApClient; public: static const unsigned int AP_ItemMaxCount = 64; static const unsigned int BmpBitsPerItem = 32; @@ -209,25 +212,34 @@ AP_UiItem(const AP_UiItem&); }; -class AP_UiTrack : public AP_UiItem -{ - friend class CApClient; -}; - class AP_UiTitle : public AP_UiItem { friend class CApClient; private: - std::vector<AP_UiTrack> m_Tracks; + AP_UiItem m_ChaptersContainer; + std::vector<AP_UiItem> m_Tracks; + std::vector<AP_UiItem> m_Chapters; public: unsigned int GetTrackCount() { return (unsigned int) m_Tracks.size(); } - AP_UiTrack* GetTrack(unsigned int Index) + AP_UiItem* GetTrack(unsigned int Index) { return &m_Tracks[Index]; } + unsigned int GetChapterCount() + { + return (unsigned int) m_Chapters.size(); + } + AP_UiItem* GetChapter(unsigned int Index) + { + return &m_Chapters[Index]; + } + AP_UiItem* GetChapters() + { + return &m_ChaptersContainer; + } }; class AP_UiTitleCollection : public AP_UiItem @@ -262,10 +274,10 @@ virtual void UpdateTotalBar(unsigned int Value)=0; virtual void UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names)=0; virtual void UpdateCurrentInfo(unsigned int Index,const utf16_t* Value)=0; - virtual void EnterJobMode()=0; + virtual void EnterJobMode(unsigned int Flags)=0; virtual void LeaveJobMode()=0; virtual void ExitApp()=0; - virtual void UpdateDrive(unsigned int Index,const utf16_t DriveName,bool Visible,bool Enabled,const utf16_t DiskName,const utf16_t DeviceName,AP_DiskFsFlags DiskFlags,const void DiskData,unsigned int DiskDataSize)=0; + virtual void 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)=0; virtual int ReportUiMessage(unsigned long Code,unsigned long Flags,const utf16_t* Text)=0; }; private: @@ -316,8 +328,9 @@ int SetProfile(unsigned int Index); private: void SetTitleCollInfo(uint64_t handle,unsigned int Count); - void SetTitleInfo(unsigned int id,uint64_t handle,unsigned int Count); + void SetTitleInfo(unsigned int id,uint64_t handle,unsigned int TrackCount,unsigned int ChapterCount,uint64_t chap_handle); void SetTrackInfo(unsigned int id,unsigned int trkid,uint64_t handle); + void SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle); void DebugFailRoutine(uintptr_t arg0,const char* arg1,int line); void DebugOut(const char* string); }; @@ -338,7 +351,7 @@ void ApDebugOut(uintptr_t file,const char* string); // -// UI +// UI // extern const utf16_t* AppGetString(unsigned int code); extern bool AppGetInterfaceLanguageData(CApClient* app);
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/inc/ver_num.h ^
@@ -10,7 +10,7 @@ #ifndef VERNUM_H_INCLUDED #define VERNUM_H_INCLUDED -#define MAKEMKV_VERSION_NUMBER "v1.7.10" +#define MAKEMKV_VERSION_NUMBER "v1.8.1" #endif // VERNUM_H_INCLUDED
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons ^
+(directory)
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/128x128 ^
+(directory)
	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/128x128/makemkv.png ^
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/16x16 ^
+(directory)
	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/16x16/makemkv.png ^
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/22x22 ^
+(directory)
	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/22x22/makemkv.png ^
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/32x32 ^
+(directory)
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/32x32/makemkv.png ^
(renamed to makemkvgui/share/icons/32x32/makemkv.png)
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/32x32/makemkv.png ^
(renamed to makemkvgui/share/icons/32x32/makemkv.png)
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/64x64 ^
+(directory)
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/64x64/makemkv.png ^
(renamed to makemkvgui/share/icons/64x64/makemkv.png)
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/share/icons/64x64/makemkv.png ^
(renamed to makemkvgui/share/icons/64x64/makemkv.png)
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/aboutbox.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include "aboutbox.h" @@ -29,7 +27,7 @@ QString gui_verstr; bool show_gui_version=true; - + #if defined(APP_OFFICIAL_BUILD) \|\| defined(HAVE_BUILDINFO_H) #include <ver_num.h>
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/aboutbox.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #ifndef APP_ABOUTBOX_H
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/abutton.cpp ^
@@ -0,0 +1,85 @@ +/* + MakeMKV GUI - Graphics user interface application for MakeMKV + + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> + + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. + +/ +#include "abutton.h" +#include "qtapp.h" + +void QAnimToolButton::updateAnimation() +{ + if (currentSequenceId==SEQUENCE_ID_NONE) return; + + if (currentSequenceId==currentSequence.count) + { + if (currentSequence.loop && (nextSequenceSize==0) ) + { + currentSequenceId=0; + } else { + if (nextSequenceSize==0) + { + currentSequenceId=SEQUENCE_ID_NONE; + } else { + currentSequence = nextSequence[0]; + currentSequenceId = 0; + for (unsigned int i=1;i<nextSequenceSize;i++) + { + nextSequence[i-1]=nextSequence[i]; + } + --nextSequenceSize; + } + } + updateAnimation(); + return; + } + + const QIcon icon = getAnimIcon(currentSequence.start+currentSequenceId,currentSequence.subid); + this->setIcon(icon); + + ++currentSequenceId; +} + +void QAnimToolButton::addSequence(unsigned int id,unsigned int count,bool loop,bool replace) +{ + if(currentSequenceId!=SEQUENCE_ID_NONE) + { + if (replace) nextSequenceSize=0; + nextSequence[nextSequenceSize].start=id; + nextSequence[nextSequenceSize].subid=0; + nextSequence[nextSequenceSize].count=count; + nextSequence[nextSequenceSize].loop=loop; + ++nextSequenceSize; + } else { + currentSequence.start=id; + currentSequence.subid=0; + currentSequence.count=count; + currentSequence.loop=loop; + currentSequenceId = 0; + nextSequenceSize = 0; + this->setIcon(getAnimIcon(id,0)); + } +} + +void QAnimToolButton::setButtonIcon(unsigned int id) +{ + if(currentSequenceId!=SEQUENCE_ID_NONE) + { + nextSequence[0].start=id; + nextSequence[0].subid=1; + nextSequence[0].count=1; + nextSequence[0].loop=false; + nextSequenceSize=1; + } else { + this->setIcon(*getAnimIcon(id,1)); + } +} +
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/abutton.h ^
@@ -0,0 +1,50 @@ +/* + MakeMKV GUI - Graphics user interface application for MakeMKV + + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> + + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. + +*/ +#ifndef APP_ABUTTON_H +#define APP_ABUTTON_H + +#include <QtGui/QtGui> + +class QAnimToolButton : public QToolButton +{ + typedef struct _sequence_t + { + unsigned int start; + unsigned int count; + unsigned int subid; + bool loop; + } sequence_t; + static const unsigned int SEQUENCE_ID_NONE=0xffffffff; +private: + sequence_t currentSequence; + unsigned int currentSequenceId; + + sequence_t nextSequence[16]; + unsigned int nextSequenceSize; + + QTime atime; + +public: + QAnimToolButton() : QToolButton() + { + currentSequenceId = SEQUENCE_ID_NONE; + nextSequenceSize = 0; + } + void updateAnimation(); + void addSequence(unsigned int id,unsigned int count,bool loop,bool replace); + void setButtonIcon(unsigned int id); +}; + +#endif // APP_ABUTTON_H
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/api_linux.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include <stdint.h>
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/api_posix.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include <lgpl/aproxy.h>
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/backupdlg.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <QtGui/QtGui> @@ -19,7 +17,7 @@ #include "mainwnd.h" #include <lgpl/sstring.h> -CBackupDialog::CBackupDialog(CApClient ap_client,IIconPath* iconPath,QIcon* icon,QWidget parent) : QDialog(parent) +CBackupDialog::CBackupDialog(CApClient ap_client,QIcon* icon,QWidget parent) : QDialog(parent) { setWindowIcon(icon); setWindowTitle(UI_QSTRING(APP_BACKUPDLG_TITLE)); @@ -32,7 +30,7 @@ labelText->setWordWrap(true); labelText->setText(UI_QSTRING(APP_IFACE_BACKUPDLG_TEXT)); - backupDir = new CDirSelectBox(CDirSelectBox::DirBoxOutDir,UI_QSTRING(APP_IFACE_BACKUPDLG_FOLDER),iconPath); + backupDir = new CDirSelectBox(CDirSelectBox::DirBoxOutDir,UI_QSTRING(APP_IFACE_BACKUPDLG_FOLDER)); buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok \| QDialogButtonBox::Cancel , Qt::Horizontal); QGroupBox* box = new QGroupBox(UI_QSTRING(APP_IFACE_BACKUPDLG_TEXT_CAPTION));
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/backupdlg.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #ifndef APP_BACKUP_H @@ -25,7 +23,7 @@ { Q_OBJECT public: - CBackupDialog(CApClient ap_client,IIconPath* iconPath,QIcon* icon,QWidget parent = 0); + CBackupDialog(CApClient ap_client,QIcon* icon,QWidget parent = 0); private: CApClient client; QDialogButtonBox *buttonBox;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/client.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include <lgpl/aproxy.h> @@ -158,7 +156,7 @@ return FatalCommError(); } - if (m_mem->abort_nomem) + if (m_mem->abort_nomem) { DebugFail(cmd,NULL); return FatalCommError(); @@ -181,7 +179,7 @@ case apNop: break; case apBackEnterJobMode: - m_Ui->EnterJobMode(); + m_Ui->EnterJobMode((unsigned int) m_mem->args[0]); break; case apBackLeaveJobMode: m_Ui->LeaveJobMode(); @@ -229,8 +227,7 @@ m_Ui->UpdateDrive( (unsigned int) m_mem->args[0], drv_name, - (m_mem->args[2]!=0), - (m_mem->args[3]!=0), + (AP_DriveState)(m_mem->args[2]), dsk_name, dev_name, (AP_DiskFsFlags)(m_mem->args[5]), @@ -280,11 +277,14 @@ SetTitleCollInfo(m_mem->args[0],(unsigned int) m_mem->args[1]); break; case apBackSetTitleInfo: - SetTitleInfo((unsigned int) m_mem->args[0],m_mem->args[1],(unsigned int) m_mem->args[2]); + SetTitleInfo((unsigned int) m_mem->args[0],m_mem->args[1],(unsigned int) m_mem->args[2],(unsigned int) m_mem->args[3],m_mem->args[4]); break; case apBackSetTrackInfo: SetTrackInfo((unsigned int) m_mem->args[0],(unsigned int) m_mem->args[1],m_mem->args[2]); break; + case apBackSetChapterInfo: + SetChapterInfo((unsigned int) m_mem->args[0],(unsigned int) m_mem->args[1],m_mem->args[2]); + break; default: DebugFail(r,NULL); m_mem->args[0] = 0;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/dirselectbox.cpp ^
@@ -1,25 +1,24 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <QtGui/QtGui> #include "dirselectbox.h" #include "qtapp.h" #include <QtExt/NativeFileDialog.h> +#include "image_defs.h" -CDirSelectBox::CDirSelectBox(CDirSelectBox::Style BoxStyle,const QString &Name, IIconPath iconPath, QWidgetList widgets , QWidget parent) : QGroupBox(Name,parent) +CDirSelectBox::CDirSelectBox(CDirSelectBox::Style BoxStyle,const QString &Name, QWidgetList widgets , QWidget parent) : QGroupBox(Name,parent) { style = BoxStyle; lineEditDir = new QLineEdit(); @@ -42,39 +41,36 @@ lay->addWidget(lineEditDir,row,0); lay->setColumnStretch(0,2); - static QIcon set_folder_icon; - static QIcon set_file_icon; + static QIcon set_folder_icon; + static QIcon set_out_folder_icon; + static QIcon set_file_icon; static bool set_folder_icon_initialized=false; if (false==set_folder_icon_initialized) { - set_folder_icon.addFile(iconPath->IconPath(":/trolltech/styles/commonstyle/images/dirclosed-128.png"),QSize(128,128)); - set_folder_icon.addFile(iconPath->IconPath(":/trolltech/styles/commonstyle/images/dirclosed-32.png"),QSize(32,32)); - set_folder_icon.addFile(iconPath->IconPath(":/trolltech/styles/commonstyle/images/dirclosed-16.png"),QSize(16,16)); - - set_file_icon.addFile(iconPath->IconPath(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png"),QSize(128,128)); - set_file_icon.addFile(iconPath->IconPath(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png"),QSize(32,32)); - set_file_icon.addFile(iconPath->IconPath(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png"),QSize(16,16)); - + set_folder_icon = createIconPixmaps(AP_IMG_OPENFOLDER2,AP_IMG_OPENFOLDER2_COUNT); + set_out_folder_icon = createIconPixmaps(AP_IMG_OPENFOLDER,AP_IMG_OPENFOLDER_COUNT); + set_file_icon = createIconPixmaps(AP_IMG_OPENFILE2,AP_IMG_OPENFILE_COUNT); set_folder_icon_initialized=true; } switch(style) { case DirBoxDir: - toolButtonAction = new QAction(set_folder_icon, Name, this); + toolButtonAction = new QAction(set_folder_icon, Name, this); break; case DirBoxOutDir: - toolButtonAction = new QAction(set_folder_icon, UI_QSTRING(APP_IFACE_ACT_SETFOLDER_NAME), this); + toolButtonAction = new QAction(set_out_folder_icon, UI_QSTRING(APP_IFACE_ACT_SETFOLDER_NAME), this); toolButtonAction->setStatusTip(UI_QSTRING(APP_IFACE_ACT_SETFOLDER_STIP)); break; case DirBoxFile: - toolButtonAction = new QAction(set_file_icon, Name, this); + toolButtonAction = new QAction(set_file_icon, Name, this); break; } connect(toolButtonAction, SIGNAL(triggered()), this, SLOT(SlotButtonPressed())); toolButtonSelect = new QToolButton(); + toolButtonSelect->setIconSize(adjustIconSize(toolButtonSelect->iconSize(),16)); toolButtonSelect->setDefaultAction(toolButtonAction); lay->addWidget(toolButtonSelect,row,1);
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/dirselectbox.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #ifndef APP_DIRSELECTBOX_H @@ -45,7 +43,7 @@ QAbstractButton radioButtons[MaxRadioButtons]; public: - CDirSelectBox(CDirSelectBox::Style BoxStyle,const QString &Name, IIconPath* iconPath, QWidgetList widgets = QWidgetList(), QWidget parent = 0); + CDirSelectBox(CDirSelectBox::Style BoxStyle,const QString &Name, QWidgetList widgets = QWidgetList(), QWidget parent = 0); void setIndexValue(int Index); int getIndexValue(); bool IsDirValid();
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/image.cpp ^
@@ -0,0 +1,110 @@ +/* + MakeMKV GUI - Graphics user interface application for MakeMKV + + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> + + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. + +/ +#include "qtapp.h" +#include <QtGui/QImage> +#include <QtGui/QPixmap> +#include <QtGui/QIcon> +#include "image_defs.h" +#include "image_data.h" + +const uint32_t get_image_data(); +static const uint32_t* image_data = NULL; +static const QIcon* anim_icons[(AP_IMG_ANIMATION0102H-AP_IMG_ANIMATION0102)2]; + +QIcon createIconPixmaps(unsigned int firstId,unsigned int count) +{ + QIcon* icon = new QIcon(); + for (unsigned int i=0;i<count;i++) + { + QImage* image; + + image = getBuiltinImage(firstId+i); + + if (!image) continue; + + icon->addPixmap(QPixmap::fromImage(image)); + } + return icon; +} + +QImage getBuiltinImage(unsigned int id) +{ + if (id>=IMAGE_TABLE_SIZE) return NULL; + + if (!image_data) + { + image_data = get_image_data(); + } + + const uint32_t* data = image_data + image_table[id]; + + return new QImage((const uchar)(data+4),data[0],data[1],IMAGE_TABLE_FORMAT); +} + +void createAnimIcons() +{ + for (unsigned int i=AP_IMG_ANIMATION0102;i<AP_IMG_ANIMATION0102H;i++) + { + if (image_table[i]) + { + QImage image = getBuiltinImage(i); + QPixmap pixmap = QPixmap::fromImage(image); +#ifdef IMAGE_TABLE_BIG + QImage imageb = getBuiltinImage(i+(AP_IMG_ANIMATION0102H-AP_IMG_ANIMATION0102)); + QPixmap pixmapb = QPixmap::fromImage(imageb); +#endif + QIcon icon1 = new QIcon(); + icon1->addPixmap(pixmap,QIcon::Normal); + icon1->addPixmap(pixmap,QIcon::Disabled); +#ifdef IMAGE_TABLE_BIG + icon1->addPixmap(pixmapb,QIcon::Normal); + icon1->addPixmap(pixmapb,QIcon::Disabled); +#endif + + QIcon* icon2 = new QIcon(); + icon2->addPixmap(pixmap,QIcon::Normal); +#ifdef IMAGE_TABLE_BIG + icon2->addPixmap(pixmapb,QIcon::Normal); +#endif + anim_icons[(i-AP_IMG_ANIMATION0102)2+0] = icon1; + anim_icons[(i-AP_IMG_ANIMATION0102)2+1] = icon2; + } else { + anim_icons[(i-AP_IMG_ANIMATION0102)2+0] = NULL; + anim_icons[(i-AP_IMG_ANIMATION0102)2+1] = NULL; + } + } +} + +const QIcon* getAnimIcon(unsigned int id,unsigned int id2) +{ + if ( (id<AP_IMG_ANIMATION0102) \|\| (id>=AP_IMG_ANIMATION0102H) ) return NULL; + return anim_icons[(id-AP_IMG_ANIMATION0102)*2+id2]; +} + +QSize adjustIconSize(QSize size,unsigned int min) +{ + unsigned int s = size.height(); + + if ( (s>=14) && (s<18) ) s = 16; + if ( (s>=18) && (s<34) ) s = 32; + if ( (s>=34) && (s<66) ) s = 64; + if ( (s>=66) && (s<130) ) s = 128; + if ( (s>=130) && (s<260) ) s = 256; + if (s>=260) s = 512; + + if (s<min) s=min; + + return QSize(s,s); +}
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/image_data.h ^
@@ -0,0 +1,38 @@ +/* + MakeMKV GUI - Graphics user interface application for MakeMKV + + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> + + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. + +*/ + + +static const uint32_t image_table[250]={ +0,65540,81928,86028,87056,87544,87804,153344,169732,173832,174860,175348,175608,241148,257536,261636,262664,263152,263412, +328952,345340,349440,350468,350956,351216,416756,433144,437244,438272,438760,439020,504560,520948,525048,526076,526564,526824, +592364,608752,612852,613880,614368,614628,680168,696556,700656,701684,702172,702432,767972,784360,788460,789488,789976,790236, +855776,872164,876264,877292,877780,878040,943580,959968,964068,965096,965584,965844,969944,970972,971460,971720,1037260,1053648, +1057748,1058776,1059264,1059524,1125064,1141452,1145552,1146580,1147068,1147328,1212868,1229256,1233356,1234384,1234872,1235132, +1300672,1317060,1321160,1322188,1322676,1322936,1388476,1454016,1519556,1585096,1650636,1716176,1781716,1847256,1912796,1978336, +2043876,2109416,2109416,2174956,2240496,2306036,2371576,2437116,2502656,2568196,2633736,2699276,2764816,2830356,2895896,2961436, +3026976,3092516,3158056,3223596,3289136,3354676,3420216,3485756,3551296,3616836,3682376,3616836,3747916,3616836,3747916,3813456, +3878996,3944536,4010076,4075616,4141156,4206696,4272236,4337776,4403316,4468856,4534396,4599936,4665476,4731016,4796556,4862096, +4927636,4993176,5058716,5124256,5189796,5255336,5320876,5386416,5451956,5517496,5583036,5648576,5714116,5779656,5845196,5910736, +5976276,6041816,6107356,6172896,6435044,6697192,6959340,7221488,7483636,7745784,8007932,8270080,8532228,8794376,9056524,9318672, +9318672,9580820,9842968,10105116,10367264,10629412,10891560,11153708,11415856,11678004,11940152,12202300,12464448,12726596, +12988744,13250892,13513040,13775188,14037336,14299484,14561632,14823780,15085928,15348076,15610224,15348076,15872372,15348076, +15872372,16134520,16396668,16658816,16920964,17183112,17445260,17707408,17969556,18231704,18493852,18756000,19018148,19280296, +19542444,19804592,20066740,20328888,20591036,20853184,21115332,21377480,21639628,21901776,22163924,22426072,22688220,22950368, +23212516,23474664,23736812,23998960,24261108,24523256,24785404,25047552,25309700 }; + +#define IMAGE_TABLE_FORMAT QImage::Format_ARGB32_Premultiplied +#define IMAGE_TABLE_SIZE 250 + +
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/image_defs.h ^
@@ -0,0 +1,82 @@ +/* + MakeMKV GUI - Graphics user interface application for MakeMKV + + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> + + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. + +*/ + + +#define AP_IMG_ABOUT 0 +#define AP_IMG_ABOUT_COUNT 6 +#define AP_IMG_BACKUP 6 +#define AP_IMG_BACKUP_COUNT 6 +#define AP_IMG_CLEARLOG 12 +#define AP_IMG_CLEARLOG_COUNT 6 +#define AP_IMG_CONFIGURE 18 +#define AP_IMG_CONFIGURE_COUNT 6 +#define AP_IMG_SAVE 24 +#define AP_IMG_SAVE_COUNT 6 +#define AP_IMG_EJECT 30 +#define AP_IMG_EJECT_COUNT 6 +#define AP_IMG_OPENDISC 36 +#define AP_IMG_OPENDISC_COUNT 6 +#define AP_IMG_OPENFILE 42 +#define AP_IMG_OPENFILE_COUNT 6 +#define AP_IMG_OPENFILE2 48 +#define AP_IMG_OPENFILE2_COUNT 6 +#define AP_IMG_OPENFOLDER 54 +#define AP_IMG_OPENFOLDER_COUNT 6 +#define AP_IMG_OPENFOLDER2 60 +#define AP_IMG_OPENFOLDER2_COUNT 6 +#define AP_IMG_REVERT 66 +#define AP_IMG_REVERT_COUNT 4 +#define AP_IMG_STREAM 70 +#define AP_IMG_STREAM_COUNT 6 +#define AP_IMG_STOP 76 +#define AP_IMG_STOP_COUNT 6 +#define AP_IMG_PREVIEW 82 +#define AP_IMG_PREVIEW_COUNT 6 +#define AP_IMG_MKVICON 88 +#define AP_IMG_MKVICON_COUNT 6 +#define AP_IMG_ANIMATION0102 94 +#define AP_IMG_ANIMATION0102_COUNT 1 +#define AP_IMG_ANIMATION0205 95 +#define AP_IMG_ANIMATION0205_COUNT 50 +#define AP_IMG_ANIMATION0505 145 +#define AP_IMG_ANIMATION0505_COUNT 8 +#define AP_IMG_ANIMATION0506 153 +#define AP_IMG_ANIMATION0506_COUNT 8 +#define AP_IMG_ANIMATION0606 161 +#define AP_IMG_ANIMATION0606_COUNT 8 +#define AP_IMG_ANIMATION0621 169 +#define AP_IMG_ANIMATION0621_COUNT 1 +#define AP_IMG_ANIMATION0622 170 +#define AP_IMG_ANIMATION0622_COUNT 1 +#define AP_IMG_ANIMATION0623 171 +#define AP_IMG_ANIMATION0623_COUNT 1 +#define AP_IMG_ANIMATION0102H 172 +#define AP_IMG_ANIMATION0102H_COUNT 1 +#define AP_IMG_ANIMATION0205H 173 +#define AP_IMG_ANIMATION0205H_COUNT 50 +#define AP_IMG_ANIMATION0505H 223 +#define AP_IMG_ANIMATION0505H_COUNT 8 +#define AP_IMG_ANIMATION0506H 231 +#define AP_IMG_ANIMATION0506H_COUNT 8 +#define AP_IMG_ANIMATION0606H 239 +#define AP_IMG_ANIMATION0606H_COUNT 8 +#define AP_IMG_ANIMATION0621H 247 +#define AP_IMG_ANIMATION0621H_COUNT 1 +#define AP_IMG_ANIMATION0622H 248 +#define AP_IMG_ANIMATION0622H_COUNT 1 +#define AP_IMG_ANIMATION0623H 249 +#define AP_IMG_ANIMATION0623H_COUNT 1 + +
[-] [+]	Added	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/image_linux.cpp ^
@@ -0,0 +1,23 @@ +/* + MakeMKV GUI - Graphics user interface application for MakeMKV + + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> + + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. + +/ +#include "qtapp.h" + +extern "C" const uint32_t _binary_makemkvgui_bin_image_data_bin_start[]; + +const uint32_t get_image_data() +{ + return _binary_makemkvgui_bin_image_data_bin_start; +} +
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/logic.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include "mainwnd.h" @@ -44,6 +42,6 @@ sz >>= 8; QString str; - return str.sprintf("%u.%u %c",sz,dt,suf); + return str.sprintf("%u.%u %c",sz,dt,suf); }
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/logic_posix.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include "qtapp.h"
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/logtext.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include <QtGui/QtGui> @@ -29,8 +27,8 @@ setLineWrapMode(QTextEdit::NoWrap); setTextInteractionFlags( Qt::TextSelectableByMouse \| - Qt::TextSelectableByKeyboard \| - Qt::LinksAccessibleByMouse \| + Qt::TextSelectableByKeyboard \| + Qt::LinksAccessibleByMouse \| Qt::LinksAccessibleByKeyboard ); viewport()->setMouseTracking(true); setDocument(textDocument);
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/logtext.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #ifndef APP_LOGTEXT_H
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/lstring.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include <lgpl/aproxy.h>
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/main.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <QtGui/QApplication> @@ -58,6 +56,10 @@ app.setFont(menu_font,"QGroupBox"); #endif +#ifdef Q_WS_MAC + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif + if (false==apc.Init('G',"makemkvcon")) { QMessageBox::critical(NULL,UI_QSTRING(APP_CAPTION_MSG),UI_QSTRING(APP_INIT_FAILED)); @@ -66,8 +68,6 @@ AppGetInterfaceLanguageData(&apc); - Q_INIT_RESOURCE(rsrc); - const char appdir; char* appname = argv[0]; char *aend = strrchr(appname,'/');
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/mainwnd.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <QtGui/QtGui> @@ -22,24 +20,26 @@ #include "backupdlg.h" #include "aboutbox.h" #include "notify.h" +#include "abutton.h" +#include "image_defs.h" #define AP_KEY_STRING_LEN 68 MainWnd MainWnd::m_myself_static=NULL; -static const Qt::WindowFlags mainWindowFlags = +static const Qt::WindowFlags mainWindowFlags = #ifdef Q_WS_MAC - Qt::CustomizeWindowHint \| - Qt::WindowTitleHint \| + Qt::CustomizeWindowHint \| + Qt::WindowTitleHint \| Qt::MacWindowToolBarButtonHint \| Qt::WindowMinMaxButtonsHint ; #else 0; #endif -MainWnd::MainWnd(CApClient* App,const char* AppDir) - : QMainWindow(0,mainWindowFlags) - , m_app(App) +MainWnd::MainWnd(CApClient* App,const char* AppDir) + : QMainWindow(0,mainWindowFlags) + , m_app(App) , m_app_dir(AppDir) , logtext_cursor(&logtext_document) { @@ -70,6 +70,7 @@ logtext_buf.reserve(2048); logtext_document_count=0; logtext_buf_count=0; + timerCounter=0; memset(infoCodes,0,sizeof(infoCodes)); @@ -85,9 +86,9 @@ // idle timer QTimer timer = new QTimer(this); - timer->setInterval(100); + timer->setInterval(30); timer->setSingleShot(false); - connect(timer, SIGNAL(timeout()), this, SLOT(SlotOnIdle())); + connect(timer, SIGNAL(timeout()), this, SLOT(SlotTimer())); timer->start(); m_myself_static = this; @@ -172,6 +173,17 @@ m_app->SignalExit(); } +void MainWnd::SlotTimer() +{ + empty_big_btn->updateAnimation(); + + if ((++timerCounter)==3) + { + timerCounter=0; + SlotOnIdle(); + } +} + void MainWnd::SlotOnIdle() { if (m_disable_onidle) @@ -252,10 +264,17 @@ void MainWnd::SlotOpenFiles() { + static QString filter; + + if (filter.isEmpty()) + { + filter = QStringFromUtf16(m_app->GetAppString(AP_vastr_OpenFileFilter)); + } + QString fileName = QNativeFileDialog::getOpenFileName(this, UI_QSTRING(APP_IFACE_OPENFILE_TITLE), QString(), - UI_QSTRING(APP_IFACE_OPENFILE_FILTER)); + filter); if (fileName.isEmpty()) { @@ -339,7 +358,7 @@ void MainWnd::SlotBackup() { - CBackupDialog dlg(m_app,this,mainIcon,this); + CBackupDialog dlg(m_app,mainIcon,this); int ndx = GetEmptyBoxDriveId(); if (ndx<0) return; @@ -396,93 +415,22 @@ m_app->SaveAllSelectedTitlesToMkv(); } -QString MainWnd::IconPath(const char iconPath) -{ - QString path = QLatin1String(m_app_dir) + QLatin1String("/customicons"); - QDir dir(path); - if (dir.exists()) - { - path.append(QLatin1String(iconPath+1)); - return path; - } - return QLatin1String(iconPath); -} - void MainWnd::createIcons() { - mainIcon = new QIcon(); - mainIcon->addFile(IconPath(":/img/128/mkv_icon.png"),QSize(128,128)); - mainIcon->addFile(IconPath(":/img/64/mkv_icon.png"),QSize(64,64)); - mainIcon->addFile(IconPath(":/img/32/mkv_icon.png"),QSize(32,32)); - mainIcon->addFile(IconPath(":/img/22/mkv_icon.png"),QSize(22,22)); - mainIcon->addFile(IconPath(":/img/16/mkv_icon.png"),QSize(16,16)); - - openFileIcon = new QIcon(); - openFileIcon->addFile(IconPath(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png"),QSize(128,128)); - openFileIcon->addFile(IconPath(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png"),QSize(32,32)); - openFileIcon->addFile(IconPath(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png"),QSize(16,16)); - - infoIcon = new QIcon(); - infoIcon->addFile(IconPath(":/trolltech/styles/commonstyle/images/fileinfo-128.png"),QSize(128,128)); - infoIcon->addFile(IconPath(":/trolltech/styles/commonstyle/images/fileinfo-32.png"),QSize(32,32)); - infoIcon->addFile(IconPath(":/trolltech/styles/commonstyle/images/fileinfo-16.png"),QSize(16,16)); - - - saveAllIcon = new QIcon(); - saveAllIcon->addFile(IconPath(":/img/128/download_manager.png"),QSize(128,128)); - saveAllIcon->addFile(IconPath(":/img/32/download_manager.png"),QSize(32,32)); - saveAllIcon->addFile(IconPath(":/img/22/download_manager.png"),QSize(22,22)); - saveAllIcon->addFile(IconPath(":/img/16/download_manager.png"),QSize(16,16)); - - settingsIcon = new QIcon(); - settingsIcon->addFile(IconPath(":/img/32/configure.png"),QSize(32,32)); - settingsIcon->addFile(IconPath(":/img/22/configure.png"),QSize(22,22)); - settingsIcon->addFile(IconPath(":/img/16/configure.png"),QSize(16,16)); - - ejectIcon = new QIcon(); - ejectIcon->addFile(IconPath(":/img/128/eject.png"),QSize(128,128)); - ejectIcon->addFile(IconPath(":/img/64/eject.png"),QSize(64,64)); - ejectIcon->addFile(IconPath(":/img/32/eject.png"),QSize(32,32)); - ejectIcon->addFile(IconPath(":/img/22/eject.png"),QSize(22,22)); - ejectIcon->addFile(IconPath(":/img/16/eject.png"),QSize(16,16)); - - cancelIcon = new QIcon(); - cancelIcon->addFile(IconPath(":/img/32/stop.png"),QSize(32,32)); - cancelIcon->addFile(IconPath(":/img/22/stop.png"),QSize(22,22)); - cancelIcon->addFile(IconPath(":/img/16/stop.png"),QSize(16,16)); - - startStreamingIcon = new QIcon(); - startStreamingIcon->addFile(IconPath(":/img/128/stream.png"),QSize(128,128)); - startStreamingIcon->addFile(IconPath(":/img/64/stream.png"),QSize(64,64)); - startStreamingIcon->addFile(IconPath(":/img/32/stream.png"),QSize(32,32)); - startStreamingIcon->addFile(IconPath(":/img/22/stream.png"),QSize(22,22)); - startStreamingIcon->addFile(IconPath(":/img/16/stream.png"),QSize(16,16)); - - backupIcon = new QIcon(); - backupIcon->addFile(IconPath(":/img/128/backup.png"),QSize(128,128)); - backupIcon->addFile(IconPath(":/img/64/backup.png"),QSize(64,64)); - backupIcon->addFile(IconPath(":/img/32/backup.png"),QSize(32,32)); - backupIcon->addFile(IconPath(":/img/22/backup.png"),QSize(22,22)); - backupIcon->addFile(IconPath(":/img/16/backup.png"),QSize(16,16)); - - revertIcon = new QIcon(); - revertIcon->addFile(IconPath(":/img/128/revert.png"),QSize(128,128)); - revertIcon->addFile(IconPath(":/img/64/revert.png"),QSize(64,64)); - revertIcon->addFile(IconPath(":/img/32/revert.png"),QSize(32,32)); - revertIcon->addFile(IconPath(":/img/22/revert.png"),QSize(22,22)); - revertIcon->addFile(IconPath(":/img/16/revert.png"),QSize(16,16)); - - bigbtn_icon_dvd = new QIcon(); - bigbtn_icon_dvd->addFile(IconPath(":/img/64/dvd_to_hd.png"),QSize(160,64)); + mainIcon = createIconPixmaps(AP_IMG_MKVICON,AP_IMG_MKVICON_COUNT); + openFileIcon = createIconPixmaps(AP_IMG_OPENFILE,AP_IMG_OPENFILE_COUNT); + openDiscIcon = createIconPixmaps(AP_IMG_OPENDISC,AP_IMG_OPENDISC_COUNT); + infoIcon = createIconPixmaps(AP_IMG_ABOUT,AP_IMG_ABOUT_COUNT); + saveAllIcon = createIconPixmaps(AP_IMG_SAVE,AP_IMG_SAVE_COUNT); + 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); - bigbtn_icon_hddvd = new QIcon(); - bigbtn_icon_hddvd->addFile(IconPath(":/img/64/hddvd_to_hd.png"),QSize(160,64)); - - bigbtn_icon_bluray = new QIcon(); - bigbtn_icon_bluray->addFile(IconPath(":/img/64/bluray_to_hd.png"),QSize(160,64)); - - bigbtn_icon_loading = new QIcon(); - bigbtn_icon_loading->addFile(IconPath(":/img/64/cd_loading.png"),QSize(160,64)); + createAnimIcons(); } static void setPlainMenuRole(QAction* action) @@ -563,6 +511,11 @@ setPlainMenuRole(purchaseAct); connect(purchaseAct, SIGNAL(triggered()), this, SLOT(SlotPurchase())); + clearLogAct = new QAction(clearLogIcon,UI_QSTRING(APP_IFACE_ACT_CLEARLOG_NAME), this); + clearLogAct->setStatusTip(UI_QSTRING(APP_IFACE_ACT_CLEARLOG_STIP)); + setPlainMenuRole(clearLogAct); + connect(clearLogAct, SIGNAL(triggered()), this, SLOT(SlotClearLog())); + aboutAct = new QAction(infoIcon,UI_QSTRING(APP_IFACE_ACT_ABOUT_NAME), this); aboutAct->setStatusTip(UI_QSTRING(APP_IFACE_ACT_ABOUT_STIP)); aboutAct->setMenuRole(QAction::AboutRole); @@ -571,23 +524,25 @@ for (unsigned int i=0;i<AP_MaxCdromDevices;i++) { - OpenDriveAction[i]=new QAction(QLatin1String("_opendrive_"),this); + OpenDriveAction[i]=new QAction(openDiscIcon,QLatin1String("_opendrive_"),this); OpenDriveAction[i]->setVisible(false); OpenDriveAction[i]->setData(i); setPlainMenuRole(OpenDriveAction[i]); connect(OpenDriveAction[i], SIGNAL(triggered()),this,SLOT(SlotOpenDrive())); } - dvdToHdAct = new QAction(bigbtn_icon_dvd,UI_QSTRING(APP_IFACE_ACT_OPENDISC_DVD),this); + dvdToHdAct = new QAction(UI_QSTRING(APP_IFACE_ACT_OPENDISC_DVD),this); connect(dvdToHdAct, SIGNAL(triggered()), this, SLOT(SlotOpenDriveBigBtn())); - hddvdToHdAct = new QAction(bigbtn_icon_hddvd,UI_QSTRING(APP_IFACE_ACT_OPENDISC_HDDVD),this); + hddvdToHdAct = new QAction(UI_QSTRING(APP_IFACE_ACT_OPENDISC_HDDVD),this); connect(hddvdToHdAct, SIGNAL(triggered()), this, SLOT(SlotOpenDriveBigBtn())); - blurayToHdAct = new QAction(bigbtn_icon_bluray,UI_QSTRING(APP_IFACE_ACT_OPENDISC_BRAY),this); + blurayToHdAct = new QAction(UI_QSTRING(APP_IFACE_ACT_OPENDISC_BRAY),this); connect(blurayToHdAct, SIGNAL(triggered()), this, SLOT(SlotOpenDriveBigBtn())); - loadingDiskAct = new QAction(bigbtn_icon_loading,UI_QSTRING(APP_IFACE_ACT_OPENDISC_LOADING),this); + unknownToHdAct = new QAction(getAnimIcon(AP_IMG_ANIMATION0606,1),UI_QSTRING(APP_IFACE_ACT_OPENDISC_UNKNOWN),this); + noneToHdAct = new QAction(getAnimIcon(AP_IMG_ANIMATION0102,1),UI_QSTRING(APP_IFACE_ACT_OPENDISC_NODISC),this); + loadingToHdAct = new QAction(getAnimIcon(AP_IMG_ANIMATION0102,1),UI_QSTRING(APP_IFACE_ACT_OPENDISC_LOADING),this); itemInfoRevertAct = new QAction(revertIcon,UI_QSTRING(APP_IFACE_ACT_REVERT_NAME), this); itemInfoRevertAct->setStatusTip(UI_QSTRING(APP_IFACE_ACT_REVERT_STIP)); @@ -618,7 +573,7 @@ fileMenu->addAction(newInstanceAct); #endif fileMenu->addAction(openFilesAct); - drivesMenu = fileMenu->addMenu(UI_QSTRING(APP_IFACE_MENU_DRIVES)); + drivesMenu = fileMenu->addMenu(openDiscIcon,UI_QSTRING(APP_IFACE_MENU_DRIVES)); fileMenu->addAction(closeDiskAct); fileMenu->addAction(ejectAct); fileMenu->addAction(saveFolderBox->selectDialogAction()); @@ -631,6 +586,7 @@ viewMenu = menuBar()->addMenu(UI_QSTRING(APP_IFACE_MENU_VIEW)); viewMenu->addAction(mainToolBar->toggleViewAction()); viewMenu->addSeparator(); + viewMenu->addAction(clearLogAct); viewMenu->addAction(settingsAct); helpMenu = menuBar()->addMenu(UI_QSTRING(APP_IFACE_MENU_HELP)); @@ -652,6 +608,7 @@ void MainWnd::createToolBars() { mainToolBar = addToolBar(UI_QSTRING(APP_IFACE_MENU_TOOLBAR)); + mainToolBar->setIconSize(adjustIconSize(mainToolBar->iconSize(),32)); mainToolBar->setObjectName(QLatin1String("MainToolbar")); mainToolBar->addAction(openFilesAct); mainToolBar->addAction(backupAct); @@ -695,7 +652,7 @@ QFrame* r_frame = new QFrame(); - saveFolderBox = new CDirSelectBox(CDirSelectBox::DirBoxOutDir, UI_QSTRING(APP_IFACE_OPENFOLDER_INFO_TITLE) , this); + saveFolderBox = new CDirSelectBox(CDirSelectBox::DirBoxOutDir, UI_QSTRING(APP_IFACE_OPENFOLDER_INFO_TITLE) ); connect( saveFolderBox , SIGNAL(SignalDirValidChanged()) , this , SLOT(SlotOutputFolderEdited()) ); QGroupBox* info_box = new QGroupBox(UI_QSTRING(APP_IFACE_MAIN_FRAME_INFO)); @@ -707,7 +664,7 @@ QToolButton* pb = new QToolButton(); pb->setDefaultAction(saveAllMkvAct); - pb->setIconSize(QSize(32,32)); + pb->setIconSize(adjustIconSize(pb->iconSize(),32)); QGroupBox* pbx = new QGroupBox(UI_QSTRING(APP_IFACE_MAIN_FRAME_MAKE_MKV)); pbx->setAlignment(Qt::AlignHCenter); QBoxLayout* pbx_lay = new QHBoxLayout(); @@ -719,6 +676,7 @@ itemInfoCbox = new QComboBox(); itemInfoLine = new QLineEdit(); itemInfoButton = new QToolButton(); + itemInfoButton->setIconSize(adjustIconSize(itemInfoButton->iconSize(),16)); itemInfoButton->setDefaultAction(itemInfoRevertAct); QHBoxLayout item_lay = new QHBoxLayout(); item_lay->addWidget(itemInfoCbox,2); @@ -759,7 +717,7 @@ // source box QGroupBox src_box = new QGroupBox(UI_QSTRING(APP_IFACE_EMPTY_FRAME_SOURCE)); QGridLayout* src_lay = new QGridLayout(); - + emptyDriveBox = new QComboBox(); src_lay->addWidget(emptyDriveBox,0,0,1,2); connect(emptyDriveBox, SIGNAL(currentIndexChanged(const QString&)) , this, SLOT(SlotEmptyBoxChanged()) ); @@ -790,10 +748,10 @@ QGridLayout* btn_layout = new QGridLayout(); - empty_big_btn = new QToolButton(); + empty_big_btn = new QAnimToolButton(); empty_big_btn->setDefaultAction(dvdToHdAct); empty_big_btn->setAutoRaise(true); - empty_big_btn->setIconSize(QSize(160,64)); + empty_big_btn->setIconSize(QSize(256,256)); empty_big_btn->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding); btn_layout->addWidget(empty_big_btn,1,1,Qt::AlignCenter); @@ -842,7 +800,7 @@ setCentralWidget(mainStackedWidget); } -void MainWnd::EnterJobMode() +void MainWnd::EnterJobMode(unsigned int Flags) { m_job_active=true; @@ -867,7 +825,18 @@ settingsAct->setEnabled(false); registerAct->setEnabled(false); ejectAct->setEnabled(false); - mainStackedWidget->setCurrentIndex(1); + if ((Flags&0x80000000)==0) + { + mainStackedWidget->setCurrentIndex(1); + } else { + emptyDriveBox->setEnabled(false); + updateEmptyBox(Flags&0xffff,false); + mainStackedWidget->setCurrentIndex(0); + topStackedWidget->setCurrentIndex(1); + + empty_big_btn->addSequence(AP_IMG_ANIMATION0506,AP_IMG_ANIMATION0506_COUNT,false,false); + empty_big_btn->addSequence(AP_IMG_ANIMATION0606,AP_IMG_ANIMATION0606_COUNT,true,false); + } } void MainWnd::LeaveJobMode() @@ -923,25 +892,23 @@ } -void MainWnd::UpdateDrive(unsigned int Index,const utf16_t DriveName,bool Visible,bool Enabled,const utf16_t DiskName,const utf16_t DeviceName,AP_DiskFsFlags FsFlags,const void DiskData,unsigned int DiskDataSize) +void MainWnd::UpdateDrive(unsigned int Index,const utf16_t DriveName,AP_DriveState DriveState,const utf16_t DiskName,const utf16_t DeviceName,AP_DiskFsFlags FsFlags,const void DiskData,unsigned int DiskDataSize) { - if (false==Visible) + if (DriveState==AP_DriveStateNoDrive) { + DriveInfo[Index].state = AP_DriveStateNoDrive; OpenDriveAction[Index]->setVisible(false); - EmptyFrameRemoveDrive(Index); + RefreshEmptyFrame(); UpdateDrivesCount(); return; } OpenDriveAction[Index]->setVisible(true); + OpenDriveAction[Index]->setEnabled(false); OpenDriveAction[Index]->setText(QStringFromUtf16(DriveName)); UpdateDrivesCount(); - bool have_disk = (0==(AP_DskFsFlagDiskIsAbsent&FsFlags)); - - OpenDriveAction[Index]->setEnabled(have_disk && Enabled); - - if ( (false==have_disk) \|\| (false==Enabled) ) + if (DriveState!=AP_DriveStateInserted) { if (((int)Index)==m_CurrentlyOpenedDisk) { @@ -950,19 +917,15 @@ } } - if (false==Enabled) - { - EmptyFrameRemoveDrive(Index); - return; - } - QString disktext = QStringFromUtf16(DriveName); disktext += QLatin1String(" : "); disktext += QStringFromUtf16(DiskName); - OpenDriveAction[Index]->setText(disktext); - EmptyFrameAddDrive(Index,DriveName,DiskName,DeviceName,FsFlags,DiskData,DiskDataSize); + DriveInfo[Index].Update(DriveState,DriveName,DiskName,DeviceName,FsFlags,DiskData,DiskDataSize); + RefreshEmptyFrame(); + + OpenDriveAction[Index]->setEnabled(DriveInfo[Index].showOpen()); } void MainWnd::DoProcessLogMessage(QString Message,unsigned int Flags) @@ -1031,6 +994,18 @@ } } +void MainWnd::SlotClearLog() +{ + logtext_buf.resize(0); + logtext_buf_count=0; + + logtext_document.clear(); + logtext_document_count=0; + + logtext_cursor.movePosition(QTextCursor::Start); +} + + int MainWnd::ReportUiMessage( unsigned long Code, unsigned long Flags, @@ -1149,7 +1124,7 @@ void MainWnd::SlotSettings() { - CSettingDialog dlg(m_app,this,mainIcon); + CSettingDialog dlg(m_app,mainIcon); dlg.exec();
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/mainwnd.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #ifndef APP_MAINWND_H @@ -29,6 +27,7 @@ class CLogText; class CCheckTreeItem; class MainWnd; +class QAnimToolButton; class CProgressItem { @@ -56,28 +55,25 @@ dtDvd, dtHdvd, dtBluray, - dtLoading, dtMaxValue } DiskType; class CDriveInfo { public: - bool valid; - bool show_open; - QString name; + AP_DriveState state; AP_DiskFsFlags fs_flags; + QString name; DiskType disk_type; QString type; QString label; QString prot; QString right_info; + bool load; public: - void Update(const utf16_t DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize); - CDriveInfo() - { - valid=false; - } + CDriveInfo(); + void Update(AP_DriveState DriveState,const utf16_t* DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize); + bool showOpen(); }; class CounterThread : public QThread @@ -88,7 +84,7 @@ void run(); }; -class MainWnd : public QMainWindow , public CApClient::INotifier , public IIconPath +class MainWnd : public QMainWindow , public CApClient::INotifier { friend class CProgressItem; Q_OBJECT @@ -105,6 +101,7 @@ void SlotAbout(); void SlotOpenFiles(); void SlotOpenTestFile(); + void SlotTimer(); void SlotOnIdle(); void SlotExiting(); void SlotOutputFolderEdited(); @@ -132,14 +129,15 @@ void SlotInfoRevert(); void SlotProfileCboxIndexChanged(); void SlotNewInstance(); + void SlotClearLog(); private: void closeEvent(QCloseEvent event); private: // app actions - void EnterJobMode(); + void EnterJobMode(unsigned int Flags); void LeaveJobMode(); - void UpdateDrive(unsigned int Index,const utf16_t DriveName,bool Visible,bool Enabled,const utf16_t DiskName,const utf16_t DeviceName,AP_DiskFsFlags DiskFlags,const void* DiskData,unsigned int DiskDataSize); + void 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); void UpdateCurrentBar(unsigned int Value); void UpdateTotalBar(unsigned int Value); void UpdateLayout(unsigned long CurrentName,unsigned int NameSubindex,unsigned int Flags,unsigned int Size,const unsigned long* Names); @@ -152,8 +150,6 @@ void Refresh_TitleTree(); void Update_TitleInfo_from_app(); void refreshTreeItem(QTreeWidgetItem item); - void EmptyFrameAddDrive(unsigned int Index,const utf16_t DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize); - void EmptyFrameRemoveDrive(unsigned int Index); void RefreshEmptyFrame(); void ResetInfoPane(); void ExitApp(); @@ -162,10 +158,11 @@ int GetEmptyBoxDriveId(); void UpdateDrivesCount(); void AppExpired(); - QString IconPath(const char* iconPath); void RefreshItemInfo(AP_UiItem* item); + void UpdateItem(CCheckTreeItem* item,unsigned int type); void UpdateTitleCollection(bool setFolder); void Update_SaveFolderStatus(); + void updateEmptyBox(int cur_ndx,bool boxEnabled); public: void LaunchUrl(const QString url); @@ -228,7 +225,8 @@ QGroupBox* itemBox2; QComboBox* emptyDriveBox; - QToolButton* empty_big_btn; + QAnimToolButton* empty_big_btn; + unsigned int timerCounter; CProgressItem currProgress; @@ -261,6 +259,7 @@ QIcon* mainIcon; QIcon* openFileIcon; + QIcon* openDiscIcon; QIcon* saveAllIcon; QIcon* settingsIcon; QIcon* ejectIcon; @@ -269,10 +268,7 @@ QIcon* startStreamingIcon; QIcon* backupIcon; QIcon* revertIcon; - QIcon* bigbtn_icon_dvd; - QIcon* bigbtn_icon_hddvd; - QIcon* bigbtn_icon_bluray; - QIcon* bigbtn_icon_loading; + QIcon* clearLogIcon; QAction aboutAct; QAction aboutQtAct; @@ -290,6 +286,7 @@ QAction helppageAct; QAction itemInfoRevertAct; QAction newInstanceAct; + QAction clearLogAct; public: QAction registerAct; QAction purchaseAct; @@ -306,7 +303,9 @@ QAction* dvdToHdAct; QAction* hddvdToHdAct; QAction* blurayToHdAct; - QAction* loadingDiskAct; + QAction* unknownToHdAct; + QAction* noneToHdAct; + QAction* loadingToHdAct; CounterThread counterThread;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/marshall.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <lgpl/aproxy.h> @@ -191,7 +189,7 @@ { for (unsigned int i=0;i<ap_iaMaxValue;i++) { - if (isset(m_infos_alloc,i)) + if (isset(m_infos_alloc,i)) { delete[] m_infos[i]; } @@ -325,12 +323,21 @@ m_TitleCollection.m_Titles[id].m_Tracks[trkid].SetInfo(handle,this); } -void CApClient::SetTitleInfo(unsigned int id,uint64_t handle,unsigned int Count) +void CApClient::SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle) +{ + m_TitleCollection.m_Titles[id].m_Chapters[chid].SetInfo(handle,this); +} + +void CApClient::SetTitleInfo(unsigned int id,uint64_t handle,unsigned int TrackCount,unsigned int ChapterCount,uint64_t chap_handle) { m_TitleCollection.m_Titles[id].SetInfo(handle,this); - m_TitleCollection.m_Titles[id].m_Tracks.reserve(Count); + m_TitleCollection.m_Titles[id].m_Tracks.reserve(TrackCount); m_TitleCollection.m_Titles[id].m_Tracks.clear(); - m_TitleCollection.m_Titles[id].m_Tracks.resize(Count); + m_TitleCollection.m_Titles[id].m_Tracks.resize(TrackCount); + m_TitleCollection.m_Titles[id].m_Chapters.reserve(ChapterCount); + m_TitleCollection.m_Titles[id].m_Chapters.clear(); + m_TitleCollection.m_Titles[id].m_Chapters.resize(ChapterCount); + m_TitleCollection.m_Titles[id].m_ChaptersContainer.SetInfo(chap_handle,this); } void CApClient::SetTitleCollInfo(uint64_t handle,unsigned int Count) @@ -415,7 +422,7 @@ ExecCmd(apCallGetInterfaceLanguageData); if (m_mem->args[0]==0) { - return false; + return NULL; } Size1 = (unsigned int) m_mem->args[0]; *Size2 = (unsigned int) m_mem->args[1];
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/nativefiledialog.cpp ^
@@ -1,17 +1,21 @@ /* - MakeMKV GUI - Graphics user interface application for MakeMKV + Qt extension library - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <libqtext@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <QtExt/NativeFileDialog.h> @@ -105,7 +109,7 @@ args.mode = QFileDialog::ExistingFile; args.options = options; #endif - + #if defined(Q_WS_WIN) if (dir.isEmpty()) { args.options \|= QFileDialog::WinUseAutoLastFolder;
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/notify.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include "qtapp.h"
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/notify.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #ifndef APP_NOTIFY_H
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/notify_linux.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include "qtapp.h"
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/notify_none.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include "qtapp.h"
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/progress.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <QtGui/QtGui> @@ -53,9 +51,10 @@ btm_layout->addWidget(totalProgressBar,3,0,1,3); QToolButton progressCancelButton = new QToolButton(); + progressCancelButton->setIconSize(adjustIconSize(progressCancelButton->iconSize(),32)); progressCancelButton->setDefaultAction(cancelAct); progressCancelButton->setFocusPolicy(Qt::NoFocus); - + btm_layout->addWidget(progressCancelButton,2,3,2,1,Qt::AlignBottom \| Qt::AlignRight); // labels
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/qtapp.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #ifndef APP_QTAPP_H @@ -67,15 +65,17 @@ void AppendGrayBodyTag(QString &str,const QWidget widget); QString FormatDiskFreeSpace(const utf16_t* FolderName); -bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags); - -class IIconPath -{ -public: - virtual QString IconPath(const char* iconPath)=0; -}; +bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags,AP_DriveState DriveState); QString GetInfo(AP_UiItem* item,AP_ItemAttributeId Id); QString BuildItemInfo(AP_UiItem Item,bool expertMode); +QImage getBuiltinImage(unsigned int id); +QIcon* createIconPixmaps(unsigned int firstId,unsigned int count); +void createAnimIcons(); +const QIcon* getAnimIcon(unsigned int id,unsigned int id2); + +QSize adjustIconSize(QSize size,unsigned int min); + + #endif // APP_QTAPP_H
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/qtstr.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #ifndef APP_QTSTR_H @@ -57,32 +55,8 @@ QStringFromConstUtf16( AP_UI_STRING(msg) ) -static inline void append_const(QString &Qstr,const char Str,size_t Size) -{ - for (size_t i=0;i<Size;i++) - { - if (Str[i]==0) - { - Size=i; - break; - } - } - if (0==Size) return; - - unsigned int old_size = Qstr.size(); - unsigned int have = ( Qstr.capacity() - old_size ); - if (have >= ((unsigned int)(Size+1))) - { - Qstr.resize(old_size+Size); - utf16_t* buf = QStringAccessBufferRW(Qstr) + old_size; - for (size_t i=0;i<Size;i++) - { - buf[i] = Str[i]; - } - } else { - Qstr.append(QLatin1String(QByteArray::fromRawData(Str,Size))); - } -} +void append_const(QString &Qstr,const char Str,size_t Size); +void append_const_escaped(QString &Qstr,const utf16_t Str); static inline void append_const(QString &Qstr,const char *Str) {
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/scsiinfo.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include "qtapp.h" @@ -33,8 +31,6 @@ unsigned int aacs_ver = 0; unsigned int svm_year=0,svm_month=0; - if (0!=(FsFlags&AP_DskFsFlagDiskIsLoading)) return QString(); - if (NULL!=CopyrightInfo) { switch(CopyrightInfo[4]) @@ -151,12 +147,12 @@ } -bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t DeviceNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags) +bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags,AP_DriveState DriveState) { 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; + DriveInfoItem svm_small,aacs,ccert_small,aacs_high; } items; // extract all interesting items @@ -206,6 +202,9 @@ case 0x05102203: items.ccert_small=item; break; + case 0x05102204: + items.aacs_high=item; + break; default: break; } @@ -238,7 +237,7 @@ if (items.current_profile.Size>=2) { - unsigned int id = + unsigned int id = (((unsigned int)items.current_profile.Data[0])<<8) \| (((unsigned int)items.current_profile.Data[1])<<0); const char name = GetMMCProfileString(id); @@ -310,173 +309,191 @@ } } + if (items.aacs_high.Size==4) + { + char vstr[8]; + + uint32_t aacs_ver = + (((uint32_t)items.aacs_high.Data[0])<<(38)) \| + (((uint32_t)items.aacs_high.Data[1])<<(28)) \| + (((uint32_t)items.aacs_high.Data[2])<<(18)) \| + (((uint32_t)items.aacs_high.Data[3])<<(08)) ; + + sprintf(vstr,"%u",aacs_ver); + append_const(str,AP_UI_STRING(APP_SI_HIGHEST_AACS)); + append_const(str,vstr); + append_const(str,"<br>"); + } + // // Disk info // - if (0!=(FsFlags&AP_DskFsFlagDiskIsAbsent)) + switch(DriveState) { + case AP_DriveStateEmptyClosed: + case AP_DriveStateEmptyOpen: + default: append_const(str,AP_UI_STRING(APP_SI_NODISC)); - } else { + break; + case AP_DriveStateLoading: + append_const(str,AP_UI_STRING(APP_SI_DISCINFO)); + append_const(str,AP_UI_STRING(APP_SI_DISCLOAD)); + break; + case AP_DriveStateInserted: append_const(str,AP_UI_STRING(APP_SI_DISCINFO)); - if (0!=(FsFlags&AP_DskFsFlagDiskIsLoading)) + // capacity + if (items.capacity.Size>=8) { - // disk is loading - append_const(str,AP_UI_STRING(APP_SI_DISCLOAD)); - } else { - // capacity - if (items.capacity.Size>=8) + uint32_t size_sec = + (((uint32_t)items.capacity.Data[0])<<(38)) \| + (((uint32_t)items.capacity.Data[1])<<(28)) \| + (((uint32_t)items.capacity.Data[2])<<(18)) \| + (((uint32_t)items.capacity.Data[3])<<(08)) ; + + unsigned int size_mb=size_sec/(1024/2); + + char szstr[64]; + sprintf(szstr,"%u.%u",(size_mb/1024),((size_mb%1024)100)/1024); + append_const(str,AP_UI_STRING(APP_SI_CAPACITY)); + append_const(str,szstr); + append_const(str," Gb<br>"); + } + + if (items.dvd_physical_info.Size>=16) + { + const char* p; + switch(items.dvd_physical_info.Data[4+0]>>4) { - uint32_t size_sec = - (((uint32_t)items.capacity.Data[0])<<(38)) \| - (((uint32_t)items.capacity.Data[1])<<(28)) \| - (((uint32_t)items.capacity.Data[2])<<(18)) \| - (((uint32_t)items.capacity.Data[3])<<(08)) ; - - unsigned int size_mb=size_sec/(1024/2); - - char szstr[64]; - sprintf(szstr,"%u.%u",(size_mb/1024),((size_mb%1024)100)/1024); - append_const(str,AP_UI_STRING(APP_SI_CAPACITY)); - append_const(str,szstr); - append_const(str," Gb<br>"); + case 0x0: p="DVD-ROM"; break; + case 0x1: p="DVD-RAM"; break; + case 0x2: p="DVD-R"; break; + case 0x3: p="DVD-RW"; break; + case 0x4: p="HD DVD-ROM"; break; + case 0x5: p="HD DVD-RAM"; break; + case 0x6: p="HD DVD-R"; break; + case 0x9: p="DVD+RW"; break; + case 0xA: p="DVD+R"; break; + case 0xD: p="DVD+RW DL"; break; + case 0xE: p="DVD+R DL"; break; + default: p=NULL; + } + if (NULL!=p) + { + append_const(str,AP_UI_STRING(APP_SI_DISCTYPE)); + append_const(str,p); + append_const(str,"<br>"); } - if (items.dvd_physical_info.Size>=16) + switch(items.dvd_physical_info.Data[4+1]>>4) { - const char p; - switch(items.dvd_physical_info.Data[4+0]>>4) - { - case 0x0: p="DVD-ROM"; break; - case 0x1: p="DVD-RAM"; break; - case 0x2: p="DVD-R"; break; - case 0x3: p="DVD-RW"; break; - case 0x4: p="HD DVD-ROM"; break; - case 0x5: p="HD DVD-RAM"; break; - case 0x6: p="HD DVD-R"; break; - case 0x9: p="DVD+RW"; break; - case 0xA: p="DVD+R"; break; - case 0xD: p="DVD+RW DL"; break; - case 0xE: p="DVD+R DL"; break; - default: p=NULL; - } - if (NULL!=p) - { - append_const(str,AP_UI_STRING(APP_SI_DISCTYPE)); - append_const(str,p); - append_const(str,"<br>"); - } + case 0x0: p="120mm"; break; + case 0x1: p="80mm"; break; + default: p=NULL; + } + if (NULL!=p) + { + append_const(str,AP_UI_STRING(APP_SI_DISCSIZE)); + append_const(str,p); + append_const(str,"<br>"); + } - switch(items.dvd_physical_info.Data[4+1]>>4) - { - case 0x0: p="120mm"; break; - case 0x1: p="80mm"; break; - default: p=NULL; - } - if (NULL!=p) + switch(items.dvd_physical_info.Data[4+1]&0x0f) + { + case 0x0: p="2.52 Mbps [0.25x]"; break; + case 0x1: p="5.04 Mbps [0.5x]"; break; + case 0x2: p="10.08 Mbps [1x]"; break; + case 0x3: p="20.16 Mbps [2x]"; break; + case 0x4: p="30.24 Mbps [3x]"; break; + default: p=NULL; + } + if (NULL!=p) + { + append_const(str,AP_UI_STRING(APP_SI_DISCRATE)); + append_const(str,p); + append_const(str,"<br>"); + } + + switch((items.dvd_physical_info.Data[4+2]>>5)&3) + { + case 0x0: p="1"; break; + case 0x1: p="2"; break; + default: p=NULL; + } + if (NULL!=p) + { + append_const(str,AP_UI_STRING(APP_SI_DISCLAYERS)); + append_const(str,p); + if (0==(items.dvd_physical_info.Data[4+2]&0x10)) { - append_const(str,AP_UI_STRING(APP_SI_DISCSIZE)); - append_const(str,p); - append_const(str,"<br>"); + append_const(str," (PTP)"); + } else { + append_const(str," (OTP)"); } + append_const(str,"<br>"); + } + } - switch(items.dvd_physical_info.Data[4+1]&0x0f) + if (items.bd_disc_info.Size>=(4+16)) + { + // print only L0 DI descriptor + if ( (0==cmemcmp(items.bd_disc_info.Data+4,"DI\01",3)) && + ( + (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDO",3)) \|\| + (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDW",3)) \|\| + (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDR",3)) + ) && + true) + { + const char* p; + const utf16_t* pw; + switch(items.bd_disc_info.Data[4+12]&0x0f) { - case 0x0: p="2.52 Mbps [0.25x]"; break; - case 0x1: p="5.04 Mbps [0.5x]"; break; - case 0x2: p="10.08 Mbps [1x]"; break; - case 0x3: p="20.16 Mbps [2x]"; break; - case 0x4: p="30.24 Mbps [3x]"; break; - default: p=NULL; + case 1: p="BD-ROM"; break; + case 2: p="BD-R"; break; + case 4: p="BD-RE"; break; + default: p=NULL; break; } if (NULL!=p) { - append_const(str,AP_UI_STRING(APP_SI_DISCRATE)); + append_const(str,AP_UI_STRING(APP_SI_DISCTYPE)); append_const(str,p); append_const(str,"<br>"); } - switch((items.dvd_physical_info.Data[4+2]>>5)&3) - { - case 0x0: p="1"; break; - case 0x1: p="2"; break; - default: p=NULL; - } - if (NULL!=p) + char laystr[8]; + sprintf(laystr,"%u",(items.bd_disc_info.Data[4+12]>>4)); + append_const(str,AP_UI_STRING(APP_SI_DISCLAYERS)); + append_const(str,laystr); + append_const(str,"<br>"); + + switch(items.bd_disc_info.Data[4+13]&0x0f) { - append_const(str,AP_UI_STRING(APP_SI_DISCLAYERS)); - append_const(str,p); - if (0==(items.dvd_physical_info.Data[4+2]&0x10)) - { - append_const(str," (PTP)"); - } else { - append_const(str," (OTP)"); - } - append_const(str,"<br>"); + case 1: pw=AP_UI_STRING(APP_SI_DISCCBL25); break; + case 2: pw=AP_UI_STRING(APP_SI_DISCCBL27); break; + default: pw=NULL; break; } - } - - if (items.bd_disc_info.Size>=(4+16)) - { - // print only L0 DI descriptor - if ( (0==cmemcmp(items.bd_disc_info.Data+4,"DI\01",3)) && - ( - (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDO",3)) \|\| - (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDW",3)) \|\| - (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDR",3)) - ) && - true) + if (NULL!=pw) { - const char* p; - const utf16_t* pw; - switch(items.bd_disc_info.Data[4+12]&0x0f) - { - case 1: p="BD-ROM"; break; - case 2: p="BD-R"; break; - case 4: p="BD-RE"; break; - default: p=NULL; break; - } - if (NULL!=p) - { - append_const(str,"Disc type: "); - append_const(str,p); - append_const(str,"<br>"); - } - - char laystr[8]; - sprintf(laystr,"%u",(items.bd_disc_info.Data[4+12]>>4)); - append_const(str,AP_UI_STRING(APP_SI_DISCLAYERS)); - append_const(str,laystr); + append_const(str,AP_UI_STRING(APP_SI_DISCCBL)); + append_const(str,pw); append_const(str,"<br>"); - - switch(items.bd_disc_info.Data[4+13]&0x0f) - { - case 1: pw=AP_UI_STRING(APP_SI_DISCCBL25); break; - case 2: pw=AP_UI_STRING(APP_SI_DISCCBL27); break; - default: pw=NULL; break; - } - if (NULL!=pw) - { - append_const(str,AP_UI_STRING(APP_SI_DISCCBL)); - append_const(str,pw); - append_const(str,"<br>"); - } } } + } - if (items.ccert_small.Size>2) + if (items.ccert_small.Size>2) + { + if ((items.ccert_small.Data[1]&0x80)>0) { - if ((items.ccert_small.Data[1]&0x80)>0) - { - char szstr[8]; - sprintf(szstr,"%02X",items.ccert_small.Data[1]); - append_const(str,AP_UI_STRING(APP_SI_BECFLAGS)); - append_const(str,szstr); - append_const(str,"<br>"); - } + char szstr[8]; + sprintf(szstr,"%02X",items.ccert_small.Data[1]); + append_const(str,AP_UI_STRING(APP_SI_BECFLAGS)); + append_const(str,szstr); + append_const(str,"<br>"); } - } + break; } // finish
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/sem_posix.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include <lgpl/aproxy.h>
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/settingdlg.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <QtGui/QtGui> @@ -19,7 +17,7 @@ #include "mainwnd.h" #include <lgpl/sstring.h> -CSettingDialog::CSettingDialog(CApClient ap_client,IIconPath* iconPath,QIcon* icon,QWidget parent) : QDialog(parent) +CSettingDialog::CSettingDialog(CApClient ap_client,QIcon* icon,QWidget parent) : QDialog(parent) { client = ap_client; @@ -31,7 +29,7 @@ buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok \| QDialogButtonBox::Cancel \| QDialogButtonBox::Apply , Qt::Horizontal); // dvd - dvdTab = new CDVDTab(iconPath); + dvdTab = new CDVDTab(); tabWidget->addTab(dvdTab, UI_QSTRING(APP_TTREE_VIDEO)); // IO @@ -51,11 +49,11 @@ tabWidget->addTab(streamTab, UI_QSTRING(APP_IFACE_SETTINGS_TAB_STREAMING)); // general - generalTab = new CGeneralTab(iconPath); + 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(iconPath,ap_client); + advancedTab = new CAdvancedTab(ap_client); advancedTabVisible = false; QBoxLayout lay = new QVBoxLayout(); @@ -246,7 +244,7 @@ client->SetSettingInt(apset_dvd_MinimumTitleLength,dvdTab->spinBoxMinimumTitleLength->value()); - //prot + //prot client->SetSettingInt(apset_dvd_SPRemoveMethod,protTab->comboBoxSpRemoveMethod->currentIndex()); client->SetSettingInt( apset_bdplus_DumpAlways , (protTab->check_DumpAlways->checkState() == Qt::Checked) ? 1 : 0 ); @@ -328,7 +326,7 @@ this->setLayout(lay); } -CDVDTab::CDVDTab(IIconPath* iconPath,QWidget parent) : QWidget(parent) +CDVDTab::CDVDTab(QWidget parent) : QWidget(parent) { radio_None = new QRadioButton(UI_QSTRING(APP_IFACE_SETTINGS_DEST_TYPE_NONE)); radio_Auto = new QRadioButton(UI_QSTRING(APP_IFACE_SETTINGS_DEST_TYPE_AUTO)); @@ -341,7 +339,7 @@ lst.append(radio_SemiAuto); lst.append(radio_Custom); - destinationDir = new CDirSelectBox(CDirSelectBox::DirBoxOutDir,UI_QSTRING(APP_IFACE_SETTINGS_DESTDIR),iconPath,lst); + destinationDir = new CDirSelectBox(CDirSelectBox::DirBoxOutDir,UI_QSTRING(APP_IFACE_SETTINGS_DESTDIR),lst); connect(destinationDir, SIGNAL(SignalIndexChanged()) , this , SLOT(SlotIndexChanged()) ); @@ -429,9 +427,9 @@ this->setLayout(lay); } -CGeneralTab::CGeneralTab(IIconPath* iconPath,QWidget parent) : QWidget(parent) +CGeneralTab::CGeneralTab(QWidget parent) : QWidget(parent) { - dataDir = new CDirSelectBox(CDirSelectBox::DirBoxDir,UI_QSTRING(APP_IFACE_SETTINGS_DATA_DIR),iconPath); + dataDir = new CDirSelectBox(CDirSelectBox::DirBoxDir,UI_QSTRING(APP_IFACE_SETTINGS_DATA_DIR)); QGroupBox* miscBox = new QGroupBox(UI_QSTRING(APP_IFACE_SETTINGS_GENERAL_MISC)); QGridLayout m_lay = new QGridLayout(); @@ -598,7 +596,7 @@ toggleAdvanced(state==Qt::Checked); } -CAdvancedTab::CAdvancedTab(IIconPath iconPath,CApClient* ap_client,QWidget parent) : QWidget(parent) +CAdvancedTab::CAdvancedTab(CApClient ap_client,QWidget parent) : QWidget(parent) { QGroupBox box = new QGroupBox(UI_QSTRING(APP_IFACE_SETTINGS_IO_OPTIONS)); @@ -622,8 +620,8 @@ b_lay->addWidget(lineEditSelection,1,1); box->setLayout(b_lay); - ffmpegDir = new CDirSelectBox(CDirSelectBox::DirBoxFile,UI_QSTRING(APP_IFACE_SETTINGS_ADV_FFMPEG_PATH),iconPath); - dtshddecDir = new CDirSelectBox(CDirSelectBox::DirBoxFile,UI_QSTRING(APP_IFACE_SETTINGS_ADV_DTSHDDEC_PATH),iconPath); + ffmpegDir = new CDirSelectBox(CDirSelectBox::DirBoxFile,UI_QSTRING(APP_IFACE_SETTINGS_ADV_FFMPEG_PATH)); + dtshddecDir = new CDirSelectBox(CDirSelectBox::DirBoxFile,UI_QSTRING(APP_IFACE_SETTINGS_ADV_DTSHDDEC_PATH)); QBoxLayout *lay = new QVBoxLayout();
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/settingdlg.h ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #ifndef APP_SETTINGDLG_H @@ -34,8 +32,8 @@ QCheckBox check_ShowAV; public: - CGeneralTab(IIconPath* iconPath,QWidget parent = 0); -}; + CGeneralTab(QWidget parent = 0); +}; class CLanguageTab : public QWidget { @@ -49,7 +47,7 @@ CLanguageTab(CApClient* ap_client,QWidget parent = 0); static void setValue(QComboBox comboBox,const utf16_t value); static const utf16_t getValue(QComboBox* comboBox,QString &buffer); -}; +}; class CIOTab : public QWidget @@ -63,7 +61,7 @@ public: CIOTab(QWidget parent = 0); -}; +}; class CDVDTab : public QWidget { @@ -80,10 +78,10 @@ public: - CDVDTab(IIconPath iconPath,QWidget parent = 0); + CDVDTab(QWidget parent = 0); private slots: void SlotIndexChanged(); -}; +}; class CProtTab : public QWidget { @@ -95,7 +93,7 @@ public: CProtTab(QWidget parent = 0); -}; +}; class CStreamTab : public QWidget { @@ -108,7 +106,7 @@ public: CStreamTab(QWidget parent = 0); -}; +}; class CAdvancedTab : public QWidget { @@ -121,15 +119,15 @@ CDirSelectBox* dtshddecDir; public: - CAdvancedTab(IIconPath* iconPath,CApClient* ap_client,QWidget parent = 0); -}; + CAdvancedTab(CApClient ap_client,QWidget parent = 0); +}; class CSettingDialog : public QDialog { Q_OBJECT public: - CSettingDialog(CApClient ap_client,IIconPath* iconPath,QIcon* icon,QWidget parent = 0); + CSettingDialog(CApClient ap_client,QIcon* icon,QWidget *parent = 0); ~CSettingDialog(); private:
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/spawn_posix.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. */ #include <stdint.h>
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/str/en_utf16.cpp ^
@@ -1,21 +1,19 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / -static const unsigned short en_po_str[19258]={ +static const unsigned short en_po_str[20152]={ '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, @@ -45,6 +43,9 @@ 'C','u','r','r','e','n','t','l','y',' ','i','n','s','t','a','l','l','e','d',' ','D','A','S','P','I',' ','v','%','1','.','%','2',' ','k','e','r','n','e','l',' ','e','x','t','e','n','s','i','o','n',' ','i','s',' ','t','o','o',' ','o','l','d',' ','a','n','d',' ','c','a','n',0x27,'t',' ','b','e',' ','u','s','e','d','.',' ','P','l','e','a','s','e',' ','i','n','s','t','a','l','l',' ','t','h','e',' ','l','a','t','e','s','t',' ','v','e','r','s','i','o','n','.',0, 'E','r','r','o','r',' ',0x27,'%','1',0x27,' ','o','c','c','u','r','r','e','d',' ','w','h','i','l','e',' ','w','r','i','t','i','n','g',' ','d','a','t','a',' ','t','o',' ',0x27,'%','2',0x27,' ','a','t',' ','o','f','f','s','e','t',' ',0x27,'%','3',0x27,0, 'E','r','r','o','r',' ',0x27,'%','1',0x27,' ','o','c','c','u','r','r','e','d',' ','w','h','i','l','e',' ','c','r','e','a','t','i','n','g',' ',0x27,'%','2',0x27,0, +'D','e','v','i','c','e',' ',0x27,'%','1',0x27,' ','i','s',' ','p','a','r','t','i','a','l','l','y',' ','i','n','a','c','c','e','s','s','i','b','l','e',' ','d','u','e',' ','t','o',' ','a',' ','b','u','g',' ','i','n',' ','L','i','n','u','x',' ','k','e','r','n','e','l',' ','(','i','t',' ','r','e','p','o','r','t','s',' ','i','n','v','a','l','i','d',' ','b','l','o','c','k',' ','d','e','v','i','c','e',' ','s','i','z','e',')','.',' ','T','h','i','s',' ','c','a','n',' ','b','e',' ','w','o','r','k','e','d',' ','a','r','o','u','n','d',',',' ','b','u','t',' ','r','e','a','d',' ','s','p','e','e','d',' ','m','a','y',' ','b','e',' ','v','e','r','y',' ','s','l','o','w','.',0, +'U','n','a','b','l','e',' ','t','o',' ','o','p','e','n',' ','f','i','l','e',' ',0x27,'%','1',0x27,' ','i','n',' ','O','S',' ','m','o','d','e',' ','d','u','e',' ','t','o',' ','a',' ','b','u','g',' ','i','n',' ','O','S',' ','K','e','r','n','e','l','.',' ','T','h','i','s',' ','c','a','n',' ','b','e',' ','w','o','r','k','e','d',' ','a','r','o','u','n','d',',',' ','b','u','t',' ','r','e','a','d',' ','s','p','e','e','d',' ','m','a','y',' ','b','e',' ','v','e','r','y',' ','s','l','o','w','.',0, +'F','a','i','l','e','d',' ','t','o',' ','a','l','l','o','c','a','t','e',' ','m','e','m','o','r','y',' ','f','o','r',' ','w','r','i','t','e',' ','c','a','c','h','e',',',' ','c','a','n',0x27,'t',' ','c','o','n','t','i','n','u','e','.',' ','P','l','e','a','s','e',' ','c','h','a','n','g','e',' ','r','e','a','d',' ','b','u','f','f','e','r',' ','s','i','z','e',' ','i','n',' ','p','r','e','f','e','r','e','n','c','e','s',' ','o','r',' ','c','l','o','s','e',' ','o','t','h','e','r',' ','a','p','p','l','i','c','a','t','i','o','n','s','.',0, 'U','n','s','p','e','c','i','f','i','e','d',' ','e','r','r','o','r',0, 'O','p','e','r','a','t','i','o','n',' ','w','a','s',' ','c','a','n','c','e','l','l','e','d',0, 'I','n','p','u','t',' ','p','a','r','a','m','e','t','e','r',' ','i','s',' ','i','n','c','o','r','r','e','c','t',0, @@ -124,6 +125,7 @@ 'V','C','-','1',' ','v','i','d','e','o',' ','s','t','r','e','a','m',' ','w','i','t','h','o','u','t',' ','T','F','C','N','T','R',' ','i','n','f','o','r','m','a','t','i','o','n',' ','i','s',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d',',',' ','s','o','r','r','y','.',' ','F','e','w',' ','H','D','-','D','V','D','s',' ','u','s','e',' ','i','t',' ','a','n','y','w','a','y','.',0, 'O','p','e','n','i','n','g',' ','M','K','V',' ','f','i','l','e',0, 'T','r','a','c','k',' ','#','%','1',' ','o','f',' ','t','y','p','e',' ','%','2',' ','i','n',' ','M','K','V',' ','f','i','l','e',' ','i','s',' ','n','o','t',' ','r','e','c','o','g','n','i','z','e','d',' ','a','n','d',' ','w','a','s',' ','s','k','i','p','p','e','d','.',0, +'M','K','V',' ','f','i','l','e',' ','h','a','s',' ','n','o',' ','v','i','d','e','o',' ','t','r','a','c','k','s',' ','a','n','d',' ','c','a','n',0x27,'t',' ','b','e',' ','o','p','e','n','e','d','.',0, 'S','k','i','p','p','i','n','g',' ','A','V',' ','c','l','i','p',' ','%','1',' ','s','i','n','c','e',' ','i','t',' ','i','s',' ','n','o','t',' ','a',' ','v','i','d','e','o',' ','a','p','p','l','i','c','a','t','i','o','n',0, 'A','A','C','S','-','p','r','o','t','e','c','t','e','d',' ','d','i','s','c','s',' ','t','h','a','t',' ','u','s','e',' ','S','K','B',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d',0, 'S','t','r','e','a','m',' ','#','%','1',' ','o','f',' ','t','y','p','e',' ',0x27,'%','2',0x27,' ','i','n',' ','f','i','l','e',' ','%','3',' ','w','a','s',' ','s','k','i','p','p','e','d',0, @@ -165,6 +167,8 @@ 'D','o','w','n','l','o','a','d','i','n','g',' ','l','a','t','e','s','t',' ','S','V','Q','(','s',')',' ','t','o',' ','%','1',' ','.','.','.',0, 'A','u','t','o','m','a','t','i','c',' ','S','V','Q',' ','d','o','w','n','l','o','a','d','i','n','g',' ','i','s',' ','d','i','s','a','b','l','e','d',' ','o','r',' ','f','a','i','l','e','d','.',0, 'D','r','i','v','e',' ',0x27,'%','1',' ','%','2',' ','%','3',0x27,' ','r','e','q','u','i','r','e','s',' ','A','A','C','S',' ','b','u','s',' ','e','n','c','r','y','p','t','i','o','n',',',' ','d','i','s','c',' ','d','e','c','r','y','p','t','i','o','n',' ','m','a','y',' ','f','a','i','l','.',0, +'H','i','g','h','e','s','t',' ','A','A','C','S',' ','v','e','r','s','i','o','n',' ','i','s',' ','v','%','1',' ',',',' ','M','K','B',' ','s','a','v','e','d',' ','a','s',' ','%','2',0, +'I','t',' ','a','p','p','e','a','r','s',' ','t','h','a','t',' ','y','o','u',' ','a','r','e',' ','o','p','e','n','i','n','g',' ','t','h','e',' ','d','i','s','c',' ','p','r','o','c','e','s','s','e','d',' ','b','y',' ','D','v','d','F','a','b','/','M','a','c','T','h','e','R','i','p','p','e','r',' ','w','h','i','c','h',' ','i','s',' ','k','n','o','w','n',' ','t','o',' ','p','r','o','d','u','c','e',' ','d','a','m','a','g','e','d',' ','V','O','B',' ','f','i','l','e','s','.',' ','E','r','r','o','r','s',' ','m','a','y',' ','f','o','l','l','o','w',' ','-',' ','p','l','e','a','s','e',' ','u','s','e',' ','o','r','i','g','i','n','a','l',' ','d','i','s','c',' ','i','n','s','t','e','a','d','.',0, 'P','r','o','c','e','s','s','i','n','g',' ','A','V',' ','c','l','i','p','s',0, 'P','r','o','c','e','s','s','i','n','g',' ','m','o','v','i','e',' ','p','l','a','y','l','i','s','t','s',0, 'D','e','c','r','y','p','t','i','n','g',0, @@ -195,6 +199,12 @@ 'E','x','t','e','r','n','a','l',' ','D','L','L',' ',0x27,'%','1',0x27,' ','f','r','o','m',' ','l','o','c','a','t','i','o','n',' ',0x27,'%','2',0x27,' ','i','s',' ','u','n','k','n','o','w','n',' ','-',' ','e','i','t','h','e','r',' ','t','o','o',' ','o','l','d',',',' ','t','o','o',' ','n','e','w',' ','o','r',' ','b','e','i','n','g',' ','t','a','m','p','e','r','e','d',' ','w','i','t','h',0, 'E','x','t','e','r','n','a','l',' ','D','L','L',' ',0x27,'%','1',0x27,' ','(','%','3',')',' ','f','r','o','m',' ','l','o','c','a','t','i','o','n',' ',0x27,'%','2',0x27,' ','i','s',' ','t','o','o',' ','o','l','d',' ','a','n','d',' ','c','a','n',0x27,'t',' ','b','e',' ','u','s','e','d',0, 'F','a','i','l','e','d',' ','t','o',' ','l','o','a','d',' ','e','x','t','e','r','n','a','l',' ','D','L','L',' ',0x27,'%','1',0x27,' ','a','s',' ','i','t','s',' ','p','a','t','h',' ','i','s',' ','n','o','t',' ','s','e','t',' ','i','n',' ','p','r','e','f','e','r','e','n','c','e','s',',',' ','p','l','e','a','s','e',' ','s','e','e',' ','%','2',' ','f','o','r',' ','d','e','t','a','i','l','s',0, +'i','g','n','o','r','i','n','g',' ','D','R','C',' ','g','a','i','n',' ','c','h','a','n','g','e',' ','f','r','o','m',' ','%','1','d','B',' ','t','o',' ','%','2','d','B',0, +'A','V',' ','s','y','n','c',' ','i','s','s','u','e',' ','i','n',' ','s','t','r','e','a','m',' ','%','1',' ','a','t',' ','%','2',' ',':',' ','%','3',0, +'v','i','d','e','o',' ','f','r','a','m','e',' ','t','i','m','e','c','o','d','e',' ','d','i','f','f','e','r','s',' ','b','y',' ','%','1',0, +'s','e','c','o','n','d','a','r','y',' ','s','t','r','e','a','m',' ','v','i','d','e','o',' ','f','r','a','m','e',' ','t','i','m','e','c','o','d','e',' ','d','i','f','f','e','r','s',' ','b','y',' ','%','1',0, +'t','o','o',' ','m','a','n','y',' ','v','i','d','e','o',' ','f','r','a','m','e','s',' ','w','i','t','h',' ','i','n','v','a','l','i','d',' ','t','i','m','e','c','o','d','e','s',',',' ','f','u','t','u','r','e',' ','m','e','s','s','a','g','e','s',' ','w','i','l','l',' ','b','e',' ','s','u','p','p','r','e','s','s','e','d',0, +'v','i','d','e','o',' ','s','t','r','e','a','m',' ','h','a','s',' ','%','1',' ','f','r','a','m','e','s',' ','w','i','t','h',' ','i','n','v','a','l','i','d',' ','t','i','m','e','c','o','d','e','s',0, 'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','s','t','a','r','t','e','d',',',' ','w','e','b',' ','s','e','r','v','e','r',' ','a','d','d','r','e','s','s',' ','i','s',' ','h','t','t','p',':','/','/','%','1',' ','o','r',' ','h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','2',0, 'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','s','t','o','p','p','e','d',0, 'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','f','a','i','l','e','d',' ','t','o',' ','s','t','a','r','t',0, @@ -283,6 +293,7 @@ 'D','e','f','a','u','l','t',0, '(',' ','L','o','s','s','y',' ','c','o','n','v','e','r','s','i','o','n',' ',')',0, '(',' ','L','o','s','s','l','e','s','s',' ','c','o','n','v','e','r','s','i','o','n',' ',')',0, +'C','h','a','p','t','e','r',' ','%','1',0, 'T','y','p','e',0, 'N','a','m','e',0, 'L','a','n','g','u','a','g','e',0, @@ -318,9 +329,10 @@ 'M','a','k','e','M','K','V',' ','B','E','T','A',' ','p','o','p','u','p',0, 'A','b','o','u','t',' ','M','a','k','e','M','K','V',' ','B','E','T','A',0, 'S','e','l','e','c','t',' ','e','x','i','s','t','i','n','g',' ','v','i','d','e','o',' ','s','o','u','r','c','e',' ','f','i','l','e',0, -'A','l','l',' ','v','i','d','e','o',' ','f','i','l','e','s',' ','(','V','I','D','E','O','_','T','S','.','I','F','O',' ','D','I','S','C','I','D','.','D','A','T',' ','H','V','A','0','0','0','0','1','.','V','T','I',' ','M','K','B','R','O','M','.','A','A','C','S',' ','i','n','d','e','x','.','b','d','m','v',' ','I','N','D','E','X','.','B','D','M',' ','M','o','v','i','e','O','b','j','e','c','t','.','b','d','m','v',' ','M','O','V','I','E','O','B','J','.','B','D','M',' ','B','D','M','V',' ','M','K','B','_','R','O','.','i','n','f',' ','','.','i','s','o',' ','d','i','s','c','a','t','t','.','d','a','t',' ','','.','m','k','v',')',';',';','I','s','o',' ','F','i','l','e','s',' ','(','','.','i','s','o',')',';',';','D','v','d','-','v','i','d','e','o',' ','f','i','l','e','s',' ','(','V','I','D','E','O','_','T','S','.','I','F','O',')',';',';','B','l','u','-','r','a','y',' ','f','i','l','e','s',' ','(','i','n','d','e','x','.','b','d','m','v',' ','I','N','D','E','X','.','B','D','M',' ','M','o','v','i','e','O','b','j','e','c','t','.','b','d','m','v',' ','M','O','V','I','E','O','B','J','.','B','D','M',' ','B','D','M','V',' ','M','K','B','_','R','O','.','i','n','f',' ','d','i','s','c','a','t','t','.','d','a','t',')',';',';','H','d','-','d','v','d',' ','f','i','l','e','s',' ','(','D','I','S','C','I','D','.','D','A','T',' ','H','V','A','0','0','0','0','1','.','V','T','I',' ','M','K','B','R','O','M','.','A','A','C','S',' ','d','i','s','c','a','t','t','.','d','a','t',')',';',';','M','K','V',' ','f','i','l','e','s',' ','(','','.','m','k','v',')',0, 'S','e','l','e','c','t',' ','o','u','t','p','u','t',' ','f','o','l','d','e','r',0, 'O','u','t','p','u','t',' ','f','o','l','d','e','r',0, +'A','l','l',' ','v','i','d','e','o',' ','f','i','l','e','s',' ','(','%','1',')',';',';','D','v','d','-','v','i','d','e','o',' ','f','i','l','e','s',' ','(','%','2',')',';',';','B','l','u','-','r','a','y',' ','f','i','l','e','s',' ','(','%','3',')',';',';','H','d','-','d','v','d',' ','f','i','l','e','s',' ','(','%','4',')',0, +'%','1',' ','f','i','l','e','s',' ','(','%','2',')',0, '&','O','p','e','n',' ','f','i','l','e','s',0, 'C','t','r','l','+','O',0, 'O','p','e','n','s',' ','v','i','d','e','o',' ','f','i','l','e','s',' ','(','d','i','s','c',' ','i','m','a','g','e',' ','o','n',' ','h','a','r','d','d','r','i','v','e',')',0, @@ -401,6 +413,7 @@ 'G','e','n','e','r','a','l',0, 'F','a','i','l','e','d',' ','t','o',' ','s','a','v','e',' ','s','e','t','t','i','n','g','s',0, 'S','o','m','e',' ','s','e','t','t','i','n','g','s',' ','w','i','l','l',' ','a','p','p','l','y',' ','n','e','x','t',' ','t','i','m','e',' ','y','o','u',' ','s','t','a','r','t',' ','t','h','e',' ','a','p','p','l','i','c','a','t','i','o','n','.',0, +'D','i','s','c',' ','c','a','n',0x27,'t',' ','b','e',' ','o','p','e','n','e','d',0, 'L','o','a','d','i','n','g','.','.','.',0, 'P','l','e','a','s','e',' ','w','a','i','t',0, 'N','o',' ','d','i','s','c',0, @@ -410,10 +423,16 @@ 'R','e','v','e','r','t',' ','t','o',' ','o','r','i','g','i','n','a','l',' ','v','a','l','u','e',0, 'N','e','w',' ','M','a','k','e','M','K','V',' ','i','n','s','t','a','n','c','e',0, 'S','t','a','r','t',' ','s','e','c','o','n','d',' ','c','o','p','y',' ','o','f',' ','M','a','k','e','M','K','V',' ','a','p','p','l','i','c','a','t','i','o','n',0, +'N','o',' ','d','i','s','c',' ','i','n','s','e','r','t','e','d',0, +'&','C','l','e','a','r',' ','l','o','g',0, +'C','l','e','a','r',' ','l','o','g',' ','w','i','n','d','o','w',0, +'U','n','m','o','u','n','t','i','n','g','.','.','.',0, '<','b','>','S','o','u','r','c','e',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, '<','b','>','T','i','t','l','e',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, '<','b','>','T','r','a','c','k',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, '<','b','>','A','t','t','a','c','h','m','e','n','t',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, +'<','b','>','C','h','a','p','t','e','r',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, +'<','b','>','C','h','a','p','t','e','r','s',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, 'D','i','r','e','c','t','o','r',0x27,'s',' ','c','o','m','m','e','n','t','s',0, 'A','l','t','e','r','n','a','t','e',' ','d','i','r','e','c','t','o','r',0x27,'s',' ','c','o','m','m','e','n','t','s',0, 'S','e','c','o','n','d','a','r','y',' ','l','o','w','-','b','i','t','r','a','t','e',' ','a','u','d','i','o',0, @@ -476,6 +495,8 @@ 'H','D','-','D','V','D',' ','d','i','s','c',0, 'M','K','V',' ','f','i','l','e',0, 'A','t','t','a','c','h','m','e','n','t',0, +'C','h','a','p','t','e','r','s',0, +'C','h','a','p','t','e','r',0, '<','b','>','D','r','i','v','e',' ','I','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, 'C','u','r','r','e','n','t',' ','p','r','o','f','i','l','e',':',' ',0, 'M','a','n','u','f','a','c','t','u','r','e','r',':',' ',0, @@ -485,6 +506,7 @@ 'F','i','r','m','w','a','r','e',' ','d','e','t','a','i','l','s',':',' ',0, 'F','i','r','m','w','a','r','e',' ','d','a','t','e',':',' ',0, 'B','u','s',' ','e','n','c','r','y','p','t','i','o','n',' ','f','l','a','g','s',':',' ',0, +'H','i','g','h','e','s','t',' ','A','A','C','S',' ','v','e','r','s','i','o','n',':',' ',0, '<','b','r','>','<','b','>','D','i','s','c',' ','I','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0, '<','b','r','>','<','b','>','N','o',' ','d','i','s','c',' ','i','n','s','e','r','t','e','d','<','/','b','>','<','b','r','>',0, 'D','i','s','c',' ','i','s',' ','b','e','i','n','g',' ','l','o','a','d','e','d','<','b','r','>',0, @@ -499,51 +521,53 @@ 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0, 0}; -static const unsigned int en_po_off[963]={ +static const unsigned int en_po_off[1011]={ 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,2001,301, 2002,350,2003,436,2004,490,2005,558,2006,668,2007,785,2008,940,2009,1063,2010,1191,2011,1236,2012,1380, -2013,1491,2014,1604,2015,1652,2016,1734,2017,1897,2018,2012,2019,2074,2200,2114,2201,2132,2202,2156,2203,2185, -2204,2215,2205,2244,2206,2267,2207,2284,2208,2304,2209,2325,2210,2348,2300,2373,2301,2387,2302,2404,2303,2420, -2304,2439,3000,2464,3001,2486,3002,2577,3003,2645,3004,2678,3005,2726,3006,2752,3007,2785,3008,2815,3009,2873, -3010,2921,3011,2974,3012,3009,3013,3049,3014,3095,3015,3136,3016,3187,3017,3209,3018,3236,3019,3276,3020,3346, -3021,3422,3022,3483,3023,3517,3024,3591,3025,3731,3026,3846,3027,3928,3028,3984,3029,4021,3030,4081,3031,4144, -3032,4294,3033,4403,3034,4449,3035,4494,3036,4584,3037,4643,3038,4684,3039,4724,3040,4782,3041,4816,3042,4854, -3043,4962,3100,5045,3101,5062,3102,5095,3103,5117,3104,5135,3105,5151,3106,5158,3107,5171,3108,5180,3109,5193, -3110,5206,3111,5218,3200,5238,3201,5267,3202,5285,3203,5296,3204,5314,3210,5411,3220,5428,3300,5496,3301,5552, -3302,5604,3303,5651,3304,5718,3305,5739,3306,5793,3307,5892,3308,5923,3309,5965,3310,6011,3311,6129,3312,6196, -3313,6273,3314,6341,3315,6390,3316,6413,3317,6436,3318,6458,3319,6511,3320,6573,3321,6633,3322,6736,3323,6788, -3324,6847,3325,6893,3326,6946,3327,7019,3328,7083,3329,7132,3330,7245,3331,7302,3332,7336,3333,7362,3334,7427, -3335,7826,3336,8194,3337,8577,3338,8682,3339,8718,3340,8767,3400,8840,3401,8860,3402,8887,3403,8898,3404,8916, -3405,8937,3406,8945,3407,8965,4001,8978,4002,9061,4003,9127,4004,9192,4007,9275,4008,9337,4009,9395,4020,9506, -4021,9541,4022,9593,4023,9625,4024,9689,4025,9750,4026,9796,4027,9843,4028,9891,4040,9934,4041,10012,4042,10071, -4043,10123,4044,10220,4045,10291,4500,10389,4501,10470,4502,10495,4503,10528,4504,10562,5000,10614,5001,10639,5002,10691, -5003,10708,5004,10743,5005,10770,5006,10786,5007,10809,5008,10832,5009,10873,5010,10906,5011,10926,5012,10959,5013,10998, -5014,11053,5015,11088,5016,11157,5017,11181,5018,11200,5019,11224,5020,11249,5021,11404,5022,11570,5024,11653,5025,11684, -5026,11700,5027,11707,5028,11719,5029,11731,5030,11741,5031,11753,5033,11765,5036,11776,5037,11808,5038,11851,5039,12016, -5040,12197,5041,12423,5042,12570,5043,12620,5044,12716,5045,12729,5046,12743,5047,12756,5048,12774,5049,12789,5050,12796, -5051,12846,5052,13004,5053,13177,5054,13373,5055,13433,5056,13501,5057,13569,5060,13597,5061,13606,5062,13619,5063,13630, -5064,13642,5065,13648,5066,13656,5067,13671,5068,13677,5069,13743,5070,13757,5071,13769,5072,13946,5073,13979,5074,14059, -5075,14185,5076,14265,5077,14326,5078,14365,5079,14427,5080,14470,5081,14485,5082,14498,5083,14542,5084,14612,5085,14689, -5086,14753,5087,14761,5088,14782,5201,14806,5202,14811,5203,14816,5204,14825,5207,14834,5208,14840,5209,14855,5210,14864, -5214,14869,5215,14878,5216,14884,5217,14901,5218,14913,5219,14929,5220,14940,5221,14953,5222,14964,5223,14970,5224,14980, -5225,14996,5226,15010,5227,15022,5228,15032,5233,15050,5234,15063,5235,15077,5301,15096,5302,15107,5303,15161,5304,15225, -5305,15236,6000,15253,6001,15266,6002,15285,6003,15304,6004,15338,6005,15726,6006,15747,6010,15761,6011,15773,6012,15780, -6013,15824,6014,15831,6015,15856,6016,15874,6017,15921,6018,15942,6019,15963,6020,15969,6021,15976,6022,15993,6023,16000, -6030,16033,6031,16039,6032,16045,6034,16051,6035,16059,6036,16069,6037,16077,6038,16102,6039,16114,6040,16126,6041,16155, -6042,16210,6043,16223,6044,16251,6045,16264,6046,16277,6047,16299,6048,16309,6050,16333,6051,16378,6052,16471,6053,16483, -6054,16499,6055,16515,6056,16530,6057,16543,6058,16564,6059,16570,6060,16577,6061,16584,6062,16597,6063,16611,6064,16628, -6065,16646,6066,16662,6067,16675,6068,16687,6069,16701,6070,16706,6071,16715,6072,16722,6073,16729,6074,16737,6075,16750, -6076,16755,6077,16779,6078,16810,6079,16865,6080,16935,6081,16943,6082,16948,6083,16967,6085,16991,6086,16996,6087,17029, -6088,17071,6089,17091,6090,17096,6091,17101,6092,17110,6093,17117,6094,17137,6095,17151,6096,17172,6097,17180,6098,17204, -6100,17266,6101,17277,6102,17289,6103,17297,6104,17302,6105,17327,6106,17334,6107,17359,6108,17380,6119,17421,6120,17451, -6121,17480,6122,17509,6125,17543,6126,17563,6127,17593,6128,17621,6129,17643,6130,17657,6131,17683,6132,17691,6133,17714, -6134,17725,6135,17737,6136,17757,6137,17777,6138,17789,6139,18054,6142,18086,6143,18109,6144,18120,6145,18137,6146,18147, -6147,18172,6148,18180,6149,18200,6150,18242,6151,18266,6152,18306,6153,18315,6154,18336,6156,18357,6157,18362,6158,18367, -6161,18393,6162,18407,6163,18433,6164,18451,6165,18454,6166,18464,6167,18475,6169,18498,6170,18512,6171,18547,6172,18580, -6173,18589,6174,18607,6175,18632,6176,18648,6180,18670,6181,18678,6200,18689,6201,18695,6202,18701,6203,18707,6204,18717, -6205,18722,6206,18734,6207,18743,6209,18757,6210,18770,6211,18781,6212,18796,6213,18808,6214,18817,6300,18828,6301,18857, -6302,18875,6303,18890,6304,18900,6305,18911,6306,18927,6307,18946,6308,18962,6320,18985,6321,19017,6322,19049,6323,19074, -6324,19090,6325,19102,6326,19114,6327,19134,6329,19153,6330,19174,6331,19207,6332,19240,0}; +2013,1491,2014,1604,2015,1652,2016,1734,2017,1897,2018,2012,2019,2074,2020,2114,2021,2281,2022,2404,2200,2538, +2201,2556,2202,2580,2203,2609,2204,2639,2205,2668,2206,2691,2207,2708,2208,2728,2209,2749,2210,2772,2300,2797, +2301,2811,2302,2828,2303,2844,2304,2863,3000,2888,3001,2910,3002,3001,3003,3069,3004,3102,3005,3150,3006,3176, +3007,3209,3008,3239,3009,3297,3010,3345,3011,3398,3012,3433,3013,3473,3014,3519,3015,3560,3016,3611,3017,3633, +3018,3660,3019,3700,3020,3770,3021,3846,3022,3907,3023,3941,3024,4015,3025,4155,3026,4270,3027,4352,3028,4408, +3029,4445,3030,4505,3031,4568,3032,4718,3033,4827,3034,4873,3035,4918,3036,5008,3037,5067,3038,5108,3039,5148, +3040,5206,3041,5240,3042,5278,3043,5386,3100,5469,3101,5486,3102,5519,3103,5541,3104,5559,3105,5575,3106,5582, +3107,5595,3108,5604,3109,5617,3110,5630,3111,5642,3200,5662,3201,5691,3202,5709,3203,5720,3204,5738,3210,5835, +3220,5852,3221,5920,3300,5970,3301,6026,3302,6078,3303,6125,3304,6192,3305,6213,3306,6267,3307,6366,3308,6397, +3309,6439,3310,6485,3311,6603,3312,6670,3313,6747,3314,6815,3315,6864,3316,6887,3317,6910,3318,6932,3319,6985, +3320,7047,3321,7107,3322,7210,3323,7262,3324,7321,3325,7367,3326,7420,3327,7493,3328,7557,3329,7606,3330,7719, +3331,7776,3332,7810,3333,7836,3334,7901,3335,8300,3336,8668,3337,9051,3338,9156,3339,9192,3340,9241,3341,9314, +3342,9360,3400,9533,3401,9553,3402,9580,3403,9591,3404,9609,3405,9630,3406,9638,3407,9658,4001,9671,4002,9754, +4003,9820,4004,9885,4007,9968,4008,10030,4009,10088,4020,10199,4021,10234,4022,10286,4023,10318,4024,10382,4025,10443, +4026,10489,4027,10536,4028,10584,4040,10627,4041,10705,4042,10764,4043,10816,4044,10913,4045,10984,4046,11082,4047,11125, +4048,11163,4049,11198,4050,11250,4051,11331,4500,11381,4501,11462,4502,11487,4503,11520,4504,11554,5000,11606,5001,11631, +5002,11683,5003,11700,5004,11735,5005,11762,5006,11778,5007,11801,5008,11824,5009,11865,5010,11898,5011,11918,5012,11951, +5013,11990,5014,12045,5015,12080,5016,12149,5017,12173,5018,12192,5019,12216,5020,12241,5021,12396,5022,12562,5024,12645, +5025,12676,5026,12692,5027,12699,5028,12711,5029,12723,5030,12733,5031,12745,5033,12757,5036,12768,5037,12800,5038,12843, +5039,13008,5040,13189,5041,13415,5042,13562,5043,13612,5044,13708,5045,13721,5046,13735,5047,13748,5048,13766,5049,13781, +5050,13788,5051,13838,5052,13996,5053,14169,5054,14365,5055,14425,5056,14493,5057,14561,5060,14589,5061,14598,5062,14611, +5063,14622,5064,14634,5065,14640,5066,14648,5067,14663,5068,14669,5069,14735,5070,14749,5071,14761,5072,14938,5073,14971, +5074,15051,5075,15177,5076,15257,5077,15318,5078,15357,5079,15419,5080,15462,5081,15477,5082,15490,5083,15534,5084,15604, +5085,15681,5086,15745,5087,15753,5088,15774,5089,15798,5201,15809,5202,15814,5203,15819,5204,15828,5207,15837,5208,15843, +5209,15858,5210,15867,5214,15872,5215,15881,5216,15887,5217,15904,5218,15916,5219,15932,5220,15943,5221,15956,5222,15967, +5223,15973,5224,15983,5225,15999,5226,16013,5227,16025,5228,16035,5233,16053,5234,16066,5235,16080,5301,16099,5302,16110, +5303,16164,5304,16228,5305,16239,6000,16256,6001,16269,6002,16288,6003,16307,6005,16341,6006,16362,6007,16376,6008,16458, +6010,16472,6011,16484,6012,16491,6013,16535,6014,16542,6015,16567,6016,16585,6017,16632,6018,16653,6019,16674,6020,16680, +6021,16687,6022,16704,6023,16711,6030,16744,6031,16750,6032,16756,6034,16762,6035,16770,6036,16780,6037,16788,6038,16813, +6039,16825,6040,16837,6041,16866,6042,16921,6043,16934,6044,16962,6045,16975,6046,16988,6047,17010,6048,17020,6050,17044, +6051,17089,6052,17182,6053,17194,6054,17210,6055,17226,6056,17241,6057,17254,6058,17275,6059,17281,6060,17288,6061,17295, +6062,17308,6063,17322,6064,17339,6065,17357,6066,17373,6067,17386,6068,17398,6069,17412,6070,17417,6071,17426,6072,17433, +6073,17440,6074,17448,6075,17461,6076,17466,6077,17490,6078,17521,6079,17576,6080,17646,6081,17654,6082,17659,6083,17678, +6085,17702,6086,17707,6087,17740,6088,17782,6089,17802,6090,17807,6091,17812,6092,17821,6093,17828,6094,17848,6095,17862, +6096,17883,6097,17891,6098,17915,6099,17977,6100,17998,6101,18009,6102,18021,6103,18029,6104,18034,6105,18059,6106,18066, +6107,18091,6108,18112,6109,18153,6110,18170,6111,18181,6112,18198,6119,18212,6120,18242,6121,18271,6122,18300,6123,18334, +6124,18365,6125,18397,6126,18417,6127,18447,6128,18475,6129,18497,6130,18511,6131,18537,6132,18545,6133,18568,6134,18579, +6135,18591,6136,18611,6137,18631,6138,18643,6139,18908,6142,18940,6143,18963,6144,18974,6145,18991,6146,19001,6147,19026, +6148,19034,6149,19054,6150,19096,6151,19120,6152,19160,6153,19169,6154,19190,6156,19211,6157,19216,6158,19221,6161,19247, +6162,19261,6163,19287,6164,19305,6165,19308,6166,19318,6167,19329,6169,19352,6170,19366,6171,19401,6172,19434,6173,19443, +6174,19461,6175,19486,6176,19502,6180,19524,6181,19532,6200,19543,6201,19549,6202,19555,6203,19561,6204,19571,6205,19576, +6206,19588,6207,19597,6209,19611,6210,19624,6211,19635,6212,19650,6213,19662,6214,19671,6215,19682,6216,19691,6300,19699, +6301,19728,6302,19746,6303,19761,6304,19771,6305,19782,6306,19798,6307,19817,6308,19833,6309,19856,6320,19879,6321,19911, +6322,19943,6323,19968,6324,19984,6325,19996,6326,20008,6327,20028,6329,20047,6330,20068,6331,20101,6332,20134,0}; extern "C" const unsigned short en_po_getstr_utf16(unsigned int code) {
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/uisync.cpp ^
@@ -1,21 +1,21 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include <QtGui/QtGui> #include "mainwnd.h" +#include "abutton.h" +#include "image_defs.h" class CCheckTreeItem : public QTreeWidgetItem { @@ -28,7 +28,7 @@ private: QString m_Info; public: - CCheckTreeItem(AP_UiItem pItem,bool Checkable) + CCheckTreeItem(AP_UiItem* pItem,bool Checkable) : QTreeWidgetItem(MyType) , m_UiItem(pItem) { m_Checkable = Checkable; @@ -83,6 +83,7 @@ { m_UiItem->Forget(ap_iaTreeInfo); m_UiItem->Forget(ap_iaLangName); + m_UiItem->Forget(ap_iaName); m_UiItem->Forget(ap_iaMetadataLanguageName); m_UiItem->Forget(ap_iaOutputFileName); setText(1,GetInfo(m_UiItem,ap_iaTreeInfo)); @@ -179,18 +180,30 @@ static void SetSiblingsState(CCheckTreeItem* item,bool check) { CCheckTreeItem* parent,child; - + int level = 0; + if (NULL==item) return; parent = CCheckTreeItem::cast(item->parent()); if (NULL==parent) { parent=item; + } else { + child = parent; + do { + level++; + } while(NULL!=(child=CCheckTreeItem::cast(child->parent()))); } for (int i=0;i<parent->childCount();i++) { child = CCheckTreeItem::cast(parent->child(i)); if (NULL==child) continue; + + if ( (level>=2) && (child->childCount()!=0) ) + { + SetSiblingsState(CCheckTreeItem::cast(child->child(0)),check); + } + if (false==child->m_Checkable) continue; if (check!=child->Enabled()) { @@ -245,7 +258,7 @@ closeDiskAct->setEnabled(true); startStreamingAct->setEnabled(true); backupAct->setEnabled(false); - + Update_SaveFolderStatus(); } } @@ -260,18 +273,6 @@ } } -void MainWnd::EmptyFrameAddDrive(unsigned int Index,const utf16_t DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize) -{ - DriveInfo[Index].Update(DriveName,DiskName,DeviceName,FsFlags,DiskData,DiskDataSize); - RefreshEmptyFrame(); -} - -void MainWnd::EmptyFrameRemoveDrive(unsigned int Index) -{ - DriveInfo[Index].valid=false; - RefreshEmptyFrame(); -} - int MainWnd::GetEmptyBoxDriveId() { int cur_ndx=-1; @@ -280,7 +281,7 @@ if (cmb_ndx>=0) { cur_ndx = emptyDriveBox->itemData(cmb_ndx).toInt(); - if (DriveInfo[cur_ndx].valid==false) + if (DriveInfo[cur_ndx].state==AP_DriveStateNoDrive) { cur_ndx = -1; } @@ -355,6 +356,25 @@ } } +void MainWnd::UpdateItem(CCheckTreeItem* item,unsigned int type) +{ + switch(type) + { + case 3: + CCheckTreeItem* child; + for (int i=0;i<item->childCount();i++) + { + child = CCheckTreeItem::cast(item->child(i)); + if (child) + { + child->RebuildContents(); + } + } + case 1: item->RebuildContents(); break; + case 2: Refresh_TitleTree(); break; + } +} + void MainWnd::SlotInfoCboxIndexChanged() { CCheckTreeItem* item; @@ -373,11 +393,7 @@ QString textNew = itemInfoLine->text(); if (textOld != textNew) { - switch(item->m_UiItem->SetInfo(item_id,Utf16FromQString(textNew))) - { - case 1: item->RebuildContents(); break; - case 2: Refresh_TitleTree(); break; - } + UpdateItem(item,item->m_UiItem->SetInfo(item_id,Utf16FromQString(textNew))); infoChanged=true; } } @@ -416,11 +432,7 @@ CCheckTreeItem* item = m_item_item; AP_ItemAttributeId item_id = (AP_ItemAttributeId)m_item_id; m_item_item=NULL; - switch(item->m_UiItem->RevertInfo((AP_ItemAttributeId)m_item_id)) - { - case 1: item->RebuildContents(); break; - case 2: Refresh_TitleTree(); break; - } + UpdateItem(item,item->m_UiItem->RevertInfo((AP_ItemAttributeId)m_item_id)); if (item==GetSelectedItem(titleTreeView)) { itemInfoEdit->setHtmlBody(item->getInfo(iface_ExpertMode)); @@ -455,15 +467,15 @@ { int cur_ndx = GetEmptyBoxDriveId(); - if ( (cur_ndx>=0) && (DriveInfo[cur_ndx].show_open==false) ) + if ( (cur_ndx>=0) && (DriveInfo[cur_ndx].showOpen()==false)) { // check if we have a video disk in addition to this // cd-rom and select it int good_ndx=-1; for (unsigned int i=0;i<AP_MaxCdromDevices;i++) { - if (DriveInfo[i].valid==false) continue; - if (DriveInfo[i].show_open==false) continue; + if (DriveInfo[i].state!=AP_DriveStateInserted) continue; + if (DriveInfo[i].showOpen()==false) continue; good_ndx=i; break; } @@ -472,8 +484,7 @@ { for (unsigned int i=0;i<AP_MaxCdromDevices;i++) { - if (DriveInfo[i].valid==false) continue; - if (0==(DriveInfo[i].fs_flags&AP_DskFsFlagDiskIsLoading)) continue; + if (DriveInfo[i].state!=AP_DriveStateLoading) continue; good_ndx=i; break; } @@ -485,11 +496,12 @@ } // re-create + m_uisync_disabled++; int cmb_ndx=-1; emptyDriveBox->clear(); for (unsigned int i=0;i<AP_MaxCdromDevices;i++) { - if (DriveInfo[i].valid==false) continue; + if (DriveInfo[i].state==AP_DriveStateNoDrive) continue; emptyDriveBox->addItem(DriveInfo[i].name,QVariant(i)); if (((int)i)==cur_ndx) @@ -504,13 +516,21 @@ } emptyDriveBox->setCurrentIndex(cmb_ndx); + m_uisync_disabled--; SlotEmptyBoxChanged(); } void MainWnd::SlotEmptyBoxChanged() { + if (m_uisync_disabled) return; + int cur_ndx = GetEmptyBoxDriveId(); + updateEmptyBox(cur_ndx,true); +} + +void MainWnd::updateEmptyBox(int cur_ndx,bool boxEnabled) +{ if (cur_ndx==-1) { empty_type->setText(QString()); @@ -518,6 +538,8 @@ empty_prot->setText(QString()); empty_right_info->setHtmlBody(QString()); empty_right_info->setEnabled(false); + empty_big_btn->setDefaultAction(noneToHdAct); + empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0102); empty_big_btn->setEnabled(false); emptyDriveBox->setEnabled(false); backupAct->setEnabled(false); @@ -528,33 +550,65 @@ empty_prot->setText(info->prot); empty_right_info->setHtmlBody(info->right_info); empty_right_info->setEnabled(true); + backupAct->setEnabled(false); - QAction* btn_act; - - switch(info->disk_type) + switch(info->state) { - case dtBluray: - btn_act=blurayToHdAct; - backupAct->setEnabled(true); + case AP_DriveStateEmptyClosed: + empty_big_btn->setDefaultAction(noneToHdAct); + empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0102); + empty_big_btn->setEnabled(false); + break; + case AP_DriveStateEmptyOpen: + empty_big_btn->setDefaultAction(noneToHdAct); + empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0205); + empty_big_btn->setEnabled(false); + break; + case AP_DriveStateLoading: + empty_big_btn->setDefaultAction(loadingToHdAct); + if (info->load) + { + info->load = false; + empty_big_btn->addSequence(AP_IMG_ANIMATION0205,AP_IMG_ANIMATION0205_COUNT,false,true); + empty_big_btn->addSequence(AP_IMG_ANIMATION0505,AP_IMG_ANIMATION0505_COUNT,true,false); + } else { + empty_big_btn->addSequence(AP_IMG_ANIMATION0505,AP_IMG_ANIMATION0505_COUNT,true,true); + } + empty_big_btn->setEnabled(false); + break; + case AP_DriveStateUnmounting: + empty_big_btn->setDefaultAction(loadingToHdAct); + empty_big_btn->setEnabled(false); + break; + case AP_DriveStateInserted: + switch(info->disk_type) + { + case dtBluray: + empty_big_btn->setDefaultAction(blurayToHdAct); + empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0622+AP_IMG_ANIMATION0622_COUNT-1); + empty_big_btn->setEnabled(boxEnabled); + backupAct->setEnabled(boxEnabled); break; - case dtHdvd: - btn_act=hddvdToHdAct; - backupAct->setEnabled(false); + case dtHdvd: + empty_big_btn->setDefaultAction(hddvdToHdAct); + empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0623+AP_IMG_ANIMATION0623_COUNT-1); + empty_big_btn->setEnabled(boxEnabled); break; - case dtLoading: - btn_act=loadingDiskAct; - backupAct->setEnabled(false); + case dtDvd: + empty_big_btn->setDefaultAction(dvdToHdAct); + empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0621+AP_IMG_ANIMATION0621_COUNT-1); + empty_big_btn->setEnabled(boxEnabled); break; + case dtUnknown: default: - case dtDvd: - btn_act=dvdToHdAct; - backupAct->setEnabled(false); + empty_big_btn->setDefaultAction(unknownToHdAct); + empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0606); + empty_big_btn->setEnabled(false); break; + } + break; } - - empty_big_btn->setDefaultAction(btn_act); - emptyDriveBox->setEnabled(true); - empty_big_btn->setEnabled(info->show_open); + emptyDriveBox->setEnabled(boxEnabled); } } @@ -562,7 +616,7 @@ { QTreeWidget* tree = titleTreeView; AP_UiTitleCollection* coll = &m_app->m_TitleCollection; - + m_uisync_disabled++; tree->clear(); tree->setColumnCount(2); @@ -573,7 +627,7 @@ hdr_labels += UI_QSTRING(APP_TTREE_HDR_TYPE); hdr_labels += UI_QSTRING(APP_TTREE_HDR_DESC); tree->setHeaderLabels(hdr_labels); - + if (coll->GetCount()>0) { @@ -598,11 +652,28 @@ t_item->setText(0,UI_QSTRING(APP_TTREE_TITLE)); t_item->RebuildContents(); + // all chapters + if ( (title->GetChapterCount()>0) && iface_ExpertMode ) + { + last_item = new CCheckTreeItem(title->GetChapters(),false); + last_item->setText(0,UI_QSTRING(APP_TTREE_CHAPTERS)); + last_item->RebuildContents(); + t_item->addChild(last_item); + + for (unsigned int j=0;j<title->GetChapterCount();j++) + { + item = new CCheckTreeItem(title->GetChapter(j),false); + item->setText(0,UI_QSTRING(APP_TTREE_CHAPTER)); + item->RebuildContents(); + last_item->addChild(item); + } + } + // all tracks main_item = last_item = NULL; for (unsigned int j=0;j<title->GetTrackCount();j++) { - AP_UiTrack* track; + AP_UiItem* track; track = title->GetTrack(j); @@ -722,44 +793,53 @@ } } -void CDriveInfo::Update(const utf16_t* DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize) +CDriveInfo::CDriveInfo() +{ + state = AP_DriveStateNoDrive; +} + +bool CDriveInfo::showOpen() { - valid = true; + if (state!=AP_DriveStateInserted) return false; + return (disk_type!=dtUnknown); +} + +void CDriveInfo::Update(AP_DriveState DriveState,const utf16_t* DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize) +{ + AP_DriveState prevState = state; + + state = DriveState; name = QStringFromUtf16(DriveName); label = QStringFromUtf16(DiskName); fs_flags = FsFlags; + load = false; - bool need_prot; + prot.clear(); + bool need_prot = false; - if (0==(FsFlags&(AP_DskFsFlagDvdFilesPresent\|AP_DskFsFlagHdvdFilesPresent\|AP_DskFsFlagBlurayFilesPresent))) + switch(DriveState) { - show_open = false; - - if (0!=(FsFlags&AP_DskFsFlagDiskIsLoading)) - { - type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_LOADING)); - label=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_WAIT)); - disk_type=dtLoading; - } else { - if (0!=(FsFlags&AP_DskFsFlagDiskIsAbsent)) - { - type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_NODISC)); - label=QString(); - disk_type=dtUnknown; - } else { - type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_DATADISC)); - disk_type=dtUnknown; - } - } - prot.clear(); - need_prot=false; - } else { - show_open = true; - + case AP_DriveStateNoDrive: + case AP_DriveStateEmptyClosed: + case AP_DriveStateEmptyOpen: + type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_NODISC)); + label.clear(); + right_info.clear(); + break; + case AP_DriveStateLoading: + type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_LOADING)); + label=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_WAIT)); + right_info=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE); + if (prevState==AP_DriveStateEmptyOpen) load = true; + break; + case AP_DriveStateUnmounting: + type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_UNMOUNTING)); + label=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_WAIT)); + right_info=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE); + break; + case AP_DriveStateInserted: // type - type.clear(); - disk_type=dtUnknown; if (0!=(FsFlags&AP_DskFsFlagBlurayFilesPresent)) { type=QLatin1String("Blu-ray"); @@ -774,22 +854,28 @@ { type = QLatin1String("DVD"); disk_type=dtDvd; + } else { + disk_type=dtUnknown; + type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_DATADISC)); } } } // prot need_prot=true; + break; } - QString tprot; - // for all disks - if ( (0==DiskDataSize) \|\| (false==FormatDriveDiskInfo(tprot,right_info,DeviceName,DiskData,DiskDataSize,FsFlags)) ) + if (DriveState!=AP_DriveStateNoDrive) { - tprot.clear(); - right_info=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE); + QString tprot; + if ( (0==DiskDataSize) \|\| (false==FormatDriveDiskInfo(tprot,right_info,DeviceName,DiskData,DiskDataSize,FsFlags,DriveState)) ) + { + tprot.clear(); + right_info=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE); + } + if (need_prot) prot = tprot; } - if (need_prot) prot = tprot; } void QGrayTextViewer::setHtmlBody(const QString& str)
[-] [+]	Changed	makemkv-oss-1.8.1.tar.bz2/makemkvgui/src/viteminfo.cpp ^
@@ -1,17 +1,15 @@ /* MakeMKV GUI - Graphics user interface application for MakeMKV - Copyright (C) 2009-2010 GuinpinSoft inc <makemkvgui@makemkv.com> + Copyright (C) 2007-2013 GuinpinSoft inc <makemkvgui@makemkv.com> - The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. + You may use this file in accordance with the end user license + agreement provided with the Software. For licensing terms and + conditions see License.txt + + This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY + OF ANY KIND, either express or implied. See the License.txt for + the specific language governing rights and limitations. / #include "qtapp.h" @@ -40,7 +38,7 @@ { append_const(str,AppGetString( id + AP_UIMSG_VITEM_BASE)); append_const(str,": "); - append_const(str,p); + append_const_escaped(str,p); if (Meta && pi->GetInfo(ap_iaMetadataLanguageName)) { append_const(str," ("); @@ -134,3 +132,46 @@ return str; } +void append_const(QString &Qstr,const char Str,size_t Size) +{ + for (size_t i=0;i<Size;i++) + { + if (Str[i]==0) + { + Size=i; + break; + } + } + if (0==Size) return; + + unsigned int old_size = Qstr.size(); + unsigned int have = ( Qstr.capacity() - old_size ); + if (have >= ((unsigned int)(Size+1))) + { + Qstr.resize(old_size+Size); + utf16_t* buf = QStringAccessBufferRW(Qstr) + old_size; + for (size_t i=0;i<Size;i++) + { + buf[i] = Str[i]; + } + } else { + Qstr.append(QLatin1String(QByteArray::fromRawData(Str,Size))); + } +} + +void append_const_escaped(QString &Qstr,const utf16_t Str) +{ + while(Str!=0) + { + switch(Str) + { + case '<': append_const(Qstr,"<"); break; + case '>': append_const(Qstr,">"); break; + case '&': append_const(Qstr,"&"); break; + case '"': append_const(Qstr,"""); break; + default: Qstr.append(QChar(Str)); break; + } + Str++; + } +} +
	Deleted	makemkv_v1.6.15_bin.tar.bz2 ^
	Deleted	makemkv_v1.6.15_oss.tar.bz2 ^
	Deleted	makemkv_v1.6.16_bin.tar.bz2 ^
	Deleted	makemkv_v1.6.16_oss.tar.bz2 ^
	Deleted	makemkv_v1.7.0_bin.tar.bz2 ^
	Deleted	makemkv_v1.7.0_oss.tar.bz2 ^
	Deleted	makemkv_v1.7.1_bin.tar.bz2 ^
	Deleted	makemkv_v1.7.1_oss.tar.bz2 ^