Request 444 (accepted)

makemkv.spec Changed

makemkv-bin-1.8.0.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.8.1.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.8.0.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.8.1.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.8.0.tar.gz/bin/i386/mmdtsdec -> makemkv-bin-1.8.1.tar.gz/bin/i386/mmdtsdec Changed

makemkv-bin-1.8.0.tar.gz/makefile.linux -> makemkv-bin-1.8.1.tar.gz/makefile.linux Changed

makemkv-bin-1.8.1.tar.gz/src/share/makemkv_chi.mo.gz Added

makemkv-bin-1.8.0.tar.gz/src/share/makemkv_deu.mo.gz -> makemkv-bin-1.8.1.tar.gz/src/share/makemkv_deu.mo.gz Changed

makemkv-bin-1.8.0.tar.gz/src/share/makemkv_dut.mo.gz -> makemkv-bin-1.8.1.tar.gz/src/share/makemkv_dut.mo.gz Changed

makemkv-bin-1.8.0.tar.gz/src/share/makemkv_ita.mo.gz -> makemkv-bin-1.8.1.tar.gz/src/share/makemkv_ita.mo.gz Changed

makemkv-bin-1.8.0.tar.gz/src/share/makemkv_jpn.mo.gz -> makemkv-bin-1.8.1.tar.gz/src/share/makemkv_jpn.mo.gz Changed

makemkv-bin-1.8.1.tar.gz/src/share/makemkv_pol.mo.gz Added

makemkv-bin-1.8.0.tar.gz/src/share/makemkv_ptb.mo.gz -> makemkv-bin-1.8.1.tar.gz/src/share/makemkv_ptb.mo.gz Changed

makemkv-bin-1.8.0.tar.gz/src/share/makemkv_spa.mo.gz -> makemkv-bin-1.8.1.tar.gz/src/share/makemkv_spa.mo.gz Changed

makemkv-bin-1.8.0.tar.gz/src/share/makemkv_swe.mo.gz -> makemkv-bin-1.8.1.tar.gz/src/share/makemkv_swe.mo.gz Changed

makemkv-oss-1.8.0.tar.gz/libabi/inc/lgpl/osslabi.h -> makemkv-oss-1.8.1.tar.gz/libabi/inc/lgpl/osslabi.h Changed

makemkv-oss-1.8.0.tar.gz/libabi/src/httpmac.cpp -> makemkv-oss-1.8.1.tar.gz/libabi/src/httpmac.cpp Changed

makemkv-oss-1.8.0.tar.gz/libabi/src/ossl_aes.c -> makemkv-oss-1.8.1.tar.gz/libabi/src/ossl_aes.c Changed

makemkv-oss-1.8.0.tar.gz/libabi/src/ossl_ec.c -> makemkv-oss-1.8.1.tar.gz/libabi/src/ossl_ec.c Changed

makemkv-oss-1.8.0.tar.gz/libabi/src/zlib.c -> makemkv-oss-1.8.1.tar.gz/libabi/src/zlib.c Changed

makemkv-oss-1.8.0.tar.gz/libdriveio/inc/driveio/driveio.h -> makemkv-oss-1.8.1.tar.gz/libdriveio/inc/driveio/driveio.h Changed

makemkv-oss-1.8.0.tar.gz/libdriveio/inc/lgpl/tcpip.h -> makemkv-oss-1.8.1.tar.gz/libdriveio/inc/lgpl/tcpip.h Changed

makemkv-oss-1.8.0.tar.gz/libdriveio/src/infolist.cpp -> makemkv-oss-1.8.1.tar.gz/libdriveio/src/infolist.cpp Changed

makemkv-oss-1.8.0.tar.gz/libdriveio/src/scsihlp.cpp -> makemkv-oss-1.8.1.tar.gz/libdriveio/src/scsihlp.cpp Changed

makemkv-oss-1.8.0.tar.gz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.8.1.tar.gz/libdriveio/src/stdquery.cpp Changed

makemkv-oss-1.8.0.tar.gz/libdriveio/src/tipcommon.cpp -> makemkv-oss-1.8.1.tar.gz/libdriveio/src/tipcommon.cpp Changed

makemkv-oss-1.8.0.tar.gz/libdriveio/src/tipserver.cpp -> makemkv-oss-1.8.1.tar.gz/libdriveio/src/tipserver.cpp Changed

makemkv-oss-1.8.0.tar.gz/libffcodec/src/misc.h -> makemkv-oss-1.8.1.tar.gz/libffcodec/src/misc.h Changed

makemkv-oss-1.8.0.tar.gz/libmakemkv/inc/lgpl/world.h -> makemkv-oss-1.8.1.tar.gz/libmakemkv/inc/lgpl/world.h Changed

makemkv-oss-1.8.0.tar.gz/libmakemkv/inc/libmkv/ebmlwrite.h -> makemkv-oss-1.8.1.tar.gz/libmakemkv/inc/libmkv/ebmlwrite.h Changed

makemkv-oss-1.8.0.tar.gz/libmakemkv/inc/libmkv/libmkv.h -> makemkv-oss-1.8.1.tar.gz/libmakemkv/inc/libmkv/libmkv.h Changed

@@ -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;
@@ -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

makemkv-oss-1.8.0.tar.gz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.8.1.tar.gz/libmakemkv/src/libmkv.cpp Changed

@@ -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 ((MkvClockTimecode*25)/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,21 +184,15 @@
 {
 private:
     KaxChapters         m_Chapters;
-    std::vector<KaxChapterAtom*>    m_ChapterMarks;
-    std::vector<KaxChapterAtom*>    m_Atoms;
+    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();
 
@@ -240,113 +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?).");
-            }
-        }
 
-        m_Atoms.reserve(chap_count+1);
+            atom = & AddNewChild<KaxChapterAtom>(edit);
+            GetChild<EbmlUInteger,KaxChapterUID>( *atom ) = Rand64();
 
-        switch(ctype)
-        {
-        case mccChapterMark:
-            ReserveChapterMarks(1+chap_count);
-            SetEmptyChapterName(m_ChapterMarks[0],0);
-            for (unsigned int i=0;i<chap_count;i++)
+            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);
+
+            for (unsigned int j=0;j<ti.name_count;j++)
             {
-                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);
-                }
+                SetChapterName(atom,ti.name_lang[j],ti.name_text[j]);
             }
-            m_DoRender = (chap_count>0);
-            break;
-        case mccTimecode:
-            {
-                unsigned int nameIndex = 1;
-                KaxEditionEntry &edit = CreateEdition();
-                uint64_t nextTimecode;
 
-                for (unsigned int i=0;i<chap_count;i++)
-                {
-                    memset(&ti,0,sizeof(ti));
-                    m_TitleInfo->GetChapterInfo(&ti,i);
-
-                    if ((i+1)==chap_count)
-                    {
-                        nextTimecode = 0;
-                    } else {
-                        MkvChapterInfo  nc;
-                        memset(&nc,0,sizeof(nc));
-                        m_TitleInfo->GetChapterInfo(&nc,i+1);
-                        nextTimecode = nc.position.time_c;
-                    }
-
-                    if (i==0)
-                    {
-                        if (IsVerySmallTimecode(ti.position.time_c))
-                        {
-                            ti.position.time_c=0;
-                        } else {
-                            if (m_FormatInfo->profile.insertFirstChapter00IfMissing)
-                            {
-                                KaxChapterAtom& first_atom = AddNewChild<KaxChapterAtom>(edit);
-                                GetChild<EbmlUInteger,KaxChapterUID>( first_atom ) = Rand64();
-                                GetChild<EbmlUInteger,KaxChapterTimeStart>( first_atom ) = 0;
-                                GetChild<EbmlUInteger,KaxChapterTimeEnd>( first_atom ) = TimecodeFromClock(ti.position.time_c);;
-                                SetEmptyChapterName(&first_atom,0);
-                                m_RealCount++;
-                                m_Atoms.push_back(&first_atom);
-                            }
-                        }
-                    }
-
-                    KaxChapterAtom& atom = AddNewChild<KaxChapterAtom>(edit);
-                    GetChild<EbmlUInteger,KaxChapterUID>( atom ) = Rand64();
-                    GetChild<EbmlUInteger,KaxChapterTimeStart>( atom ) = TimecodeFromClock(ti.position.time_c);
-                    GetChild<EbmlUInteger,KaxChapterTimeEnd>( atom ) = TimecodeFromClock(nextTimecode);
-                    if (0==nextTimecode)
-                    {
-                        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,nameIndex);
-                    }
-                    nameIndex++;
-                    m_RealCount++;
-                    m_Atoms.push_back(&atom);
-                }
-            }
-            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)
     {
@@ -362,39 +240,15 @@
     {
         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 (m_FormatInfo->profile.insertFirstChapter00IfMissing)
-            {
-                if (IsVerySmallTimecode(Timecode))
-                {
-                    m_ChapterMarks[0]->VoidMe(File);
-                    Timecode = 0;
-                } else {
-                    GetChild<EbmlUInteger,KaxChapterTimeStart>( *(m_ChapterMarks[0]) ) = 0;
-                    GetChild<EbmlUInteger,KaxChapterTimeEnd>( *(m_ChapterMarks[0]) ) = TimecodeFromClock(Timecode);
-                    CNZ(m_ChapterMarks[0]->OverwriteData(File,true));
-                    m_Atoms.push_back(m_ChapterMarks[0]);
-                }
-            } else {
-                m_ChapterMarks[0]->VoidMe(File);
-            }
-            m_RealCount=1;
+            GetChild<EbmlUInteger,KaxChapterTimeEnd>( *(m_Atoms[m_RealCount-1]) ) = TimecodeFromClock(Timecode);
+            CNZ(m_Atoms[m_RealCount-1]->OverwriteData(File,true));
         }
-
-        if (m_RealCount>1)
-        {
-            GetChild<EbmlUInteger,KaxChapterTimeEnd>( *(m_ChapterMarks[m_RealCount-1]) ) = TimecodeFromClock(Timecode);
-            CNZ(m_ChapterMarks[m_RealCount-1]->OverwriteData(File,true));
-        }
-        GetChild<EbmlUInteger,KaxChapterTimeStart>( *(m_ChapterMarks[m_RealCount]) ) = TimecodeFromClock(Timecode);
-        CNZ(m_ChapterMarks[m_RealCount]->OverwriteData(File,true));
-        m_Atoms.push_back(m_ChapterMarks[m_RealCount]);
+        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,uint64_t Duration)
@@ -403,43 +257,18 @@
 
         if (m_RealCount<2)
         {
-            CNZ(m_Chapters.VoidMe(File));
+            VoidElement(&m_Chapters,File);
             VoidElement(Seek,File);
             return;
         }
 
-        if (!m_ChapterMarks.empty())
-        {
-            for (unsigned int i=m_RealCount;i<m_ChapterMarks.size();i++)
-            {
-                CNZ(m_ChapterMarks[i]->VoidMe(File));
-            }
-        }
+        GetChild<EbmlUInteger,KaxChapterTimeEnd>( *m_Atoms[m_RealCount-1] ) = TimecodeFromClock(Duration);
+        CNZ(m_Atoms[m_RealCount-1]->OverwriteData(File,true));
 
-        unsigned int lastChapterId = (unsigned int)(m_Atoms.size()-1);
-        while(lastChapterId!=0)
+        for (unsigned int i=m_RealCount;i<m_Atoms.size();i++)
         {
-            uint64_t chapterTime;
-
-            chapterTime = GetChild<EbmlUInteger,KaxChapterTimeStart>( *m_Atoms[lastChapterId] );
-
-            if (chapterTime<Duration) break;
-
-            lastChapterId--;
+            VoidElement(m_Atoms[i],File);
         }
-
-        GetChild<EbmlUInteger,KaxChapterTimeEnd>( *m_Atoms[lastChapterId] ) = TimecodeFromClock(Duration);
-        CNZ(m_Atoms[lastChapterId]->OverwriteData(File,true));
-
-        for (unsigned int i=(lastChapterId+1);i<m_Atoms.size();i++)
-        {
-            CNZ(m_Atoms[i]->VoidMe(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)
@@ -451,35 +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);
-            GetChild<EbmlUInteger,KaxChapterTimeEnd>( *(m_ChapterMarks[i]) ) = 0;
-            GetChild<EbmlUInteger,KaxChapterTimeEnd>( *(m_ChapterMarks[i]) ).SetDefaultSize(MAX_TIMECODE_SIZE_BYTES);
-        }
-    }
     KaxEditionEntry& CreateEdition()
     {
         KaxEditionEntry &edit = GetChild<KaxEditionEntry>(m_Chapters);
@@ -720,7 +524,7 @@
             track_default = 1;
         }
 
-        if ( (ttype==track_subtitle) && 
+        if ( (ttype==track_subtitle) &&
             (FormatInfo->profile.setFirstSubtitleTrackAsDefault) &&
             IsFirstTrackOfType(Input,mttSubtitle,i) )
         {
@@ -804,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);
@@ -856,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);
@@ -878,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;
@@ -898,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))
             {
@@ -931,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)
@@ -958,10 +778,46 @@
                 }
             }
         }
-        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
@@ -972,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 > (12*1024*1024))
-            {
-                if (AtClusterStart(Input)) 
-                {
-                    new_cluster=true;
-                }
-            }
-        }
-
         if (new_cluster)
         {
             if (NULL!=curr_cluster)
@@ -1023,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);
@@ -1049,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
@@ -1083,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");
         }
@@ -1107,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;
@@ -1242,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;
@@ -1289,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);
 
@@ -1303,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;

makemkv-oss-1.8.0.tar.gz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/inc/lgpl/apdefs.h Changed

@@ -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;
 
@@ -92,6 +95,7 @@
 
 
 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;
@@ -134,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;
@@ -265,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;
@@ -280,11 +286,15 @@
 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;

makemkv-oss-1.8.0.tar.gz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/inc/lgpl/aproxy.h Changed

@@ -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,8 +154,8 @@
     apUnknown
 } AP_CMD;
 
-#define AP_CRE_VER "C000F"
-#define AP_GUI_VER "G000F"
+#define AP_CRE_VER "C0010"
+#define AP_GUI_VER "G0010"
 
 typedef uint32_t AP_DiskFsFlags;
 typedef uint32_t AP_DriveState;
@@ -168,6 +169,7 @@
 
 class AP_UiItem
 {
+    friend class CApClient;
 public:
     static const unsigned int   AP_ItemMaxCount = 64;
     static const unsigned int   BmpBitsPerItem = 32;
@@ -210,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
@@ -317,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);
 };
@@ -339,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);

makemkv-oss-1.8.0.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/aboutbox.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/aboutbox.cpp Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/client.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/client.cpp Changed

@@ -156,7 +156,7 @@
         return FatalCommError();
     }
 
-    if (m_mem->abort_nomem) 
+    if (m_mem->abort_nomem)
     {
         DebugFail(cmd,NULL);
         return FatalCommError();
@@ -277,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;

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/image.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/image.cpp Changed

@@ -21,7 +21,7 @@
 
 const uint32_t* get_image_data();
 static const uint32_t* image_data = NULL;
-static const QIcon* anim_icons[(IMAGE_TABLE_SIZE-AP_IMG_ANIMATION0102)*2];
+static const QIcon* anim_icons[(AP_IMG_ANIMATION0102H-AP_IMG_ANIMATION0102)*2];
 
 QIcon* createIconPixmaps(unsigned int firstId,unsigned int count)
 {
@@ -55,20 +55,29 @@
 
 void createAnimIcons()
 {
-    for (unsigned int i=AP_IMG_ANIMATION0102;i<IMAGE_TABLE_SIZE;i++)
+    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 {
@@ -80,7 +89,7 @@
 
 const QIcon* getAnimIcon(unsigned int id,unsigned int id2)
 {
-    if ( (id<AP_IMG_ANIMATION0102) || (id>=IMAGE_TABLE_SIZE) ) return NULL;
+    if ( (id<AP_IMG_ANIMATION0102) || (id>=AP_IMG_ANIMATION0102H) ) return NULL;
     return anim_icons[(id-AP_IMG_ANIMATION0102)*2+id2];
 }

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/image_data.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/image_data.h Changed

@@ -13,7 +13,8 @@
 
 */
 
-static const uint32_t image_table[172]={
+
+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,
@@ -24,9 +25,14 @@
 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 };
+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 172
+#define IMAGE_TABLE_SIZE 250

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/image_defs.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/image_defs.h Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/logic.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/logic.cpp Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/logtext.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/logtext.cpp Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/main.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/main.cpp Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/mainwnd.cpp Changed

@@ -27,19 +27,19 @@
 
 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)
 {
@@ -264,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())
     {
@@ -710,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()) );

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/marshall.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/marshall.cpp Changed

@@ -189,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];
         }
@@ -323,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)
@@ -413,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];

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/nativefiledialog.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/nativefiledialog.cpp Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/progress.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/progress.cpp Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/qtstr.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/qtstr.h Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/scsiinfo.cpp Changed

@@ -237,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);
@@ -438,10 +438,10 @@
         {
             // 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)) 
+                (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDR",3))
                 ) &&
                 true)
             {
@@ -456,7 +456,7 @@
                 }
                 if (NULL!=p)
                 {
-                    append_const(str,"Disc type: ");
+                    append_const(str,AP_UI_STRING(APP_SI_DISCTYPE));
                     append_const(str,p);
                     append_const(str,"<br>");
                 }

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/settingdlg.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/settingdlg.cpp Changed

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/settingdlg.h -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/settingdlg.h Changed

@@ -33,7 +33,7 @@
 
 public:
     CGeneralTab(QWidget *parent = 0);
-}; 
+};
 
 class CLanguageTab : public QWidget
 {
@@ -47,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
@@ -61,7 +61,7 @@
 
 public:
     CIOTab(QWidget *parent = 0);
-}; 
+};
 
 class CDVDTab : public QWidget
 {
@@ -81,7 +81,7 @@
     CDVDTab(QWidget *parent = 0);
 private slots:
     void SlotIndexChanged();
-}; 
+};
 
 class CProtTab : public QWidget
 {
@@ -93,7 +93,7 @@
 
 public:
     CProtTab(QWidget *parent = 0);
-}; 
+};
 
 class CStreamTab : public QWidget
 {
@@ -106,7 +106,7 @@
 
 public:
     CStreamTab(QWidget *parent = 0);
-}; 
+};
 
 class CAdvancedTab : public QWidget
 {
@@ -120,7 +120,7 @@
 
 public:
     CAdvancedTab(CApClient* ap_client,QWidget *parent = 0);
-}; 
+};
 
 class CSettingDialog : public QDialog
 {

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[20032]={
+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 +45,7 @@
 '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,
@@ -167,6 +168,7 @@
 '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,
@@ -291,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,
@@ -326,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,
@@ -422,10 +426,13 @@
 '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,
@@ -488,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,
@@ -512,53 +521,53 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[993]={
+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,2020,2114,2021,2281,2200,2404,2201,2422,
-2202,2446,2203,2475,2204,2505,2205,2534,2206,2557,2207,2574,2208,2594,2209,2615,2210,2638,2300,2663,2301,2677,
-2302,2694,2303,2710,2304,2729,3000,2754,3001,2776,3002,2867,3003,2935,3004,2968,3005,3016,3006,3042,3007,3075,
-3008,3105,3009,3163,3010,3211,3011,3264,3012,3299,3013,3339,3014,3385,3015,3426,3016,3477,3017,3499,3018,3526,
-3019,3566,3020,3636,3021,3712,3022,3773,3023,3807,3024,3881,3025,4021,3026,4136,3027,4218,3028,4274,3029,4311,
-3030,4371,3031,4434,3032,4584,3033,4693,3034,4739,3035,4784,3036,4874,3037,4933,3038,4974,3039,5014,3040,5072,
-3041,5106,3042,5144,3043,5252,3100,5335,3101,5352,3102,5385,3103,5407,3104,5425,3105,5441,3106,5448,3107,5461,
-3108,5470,3109,5483,3110,5496,3111,5508,3200,5528,3201,5557,3202,5575,3203,5586,3204,5604,3210,5701,3220,5718,
-3221,5786,3300,5836,3301,5892,3302,5944,3303,5991,3304,6058,3305,6079,3306,6133,3307,6232,3308,6263,3309,6305,
-3310,6351,3311,6469,3312,6536,3313,6613,3314,6681,3315,6730,3316,6753,3317,6776,3318,6798,3319,6851,3320,6913,
-3321,6973,3322,7076,3323,7128,3324,7187,3325,7233,3326,7286,3327,7359,3328,7423,3329,7472,3330,7585,3331,7642,
-3332,7676,3333,7702,3334,7767,3335,8166,3336,8534,3337,8917,3338,9022,3339,9058,3340,9107,3341,9180,3400,9226,
-3401,9246,3402,9273,3403,9284,3404,9302,3405,9323,3406,9331,3407,9351,4001,9364,4002,9447,4003,9513,4004,9578,
-4007,9661,4008,9723,4009,9781,4020,9892,4021,9927,4022,9979,4023,10011,4024,10075,4025,10136,4026,10182,4027,10229,
-4028,10277,4040,10320,4041,10398,4042,10457,4043,10509,4044,10606,4045,10677,4046,10775,4047,10818,4048,10856,4049,10891,
-4050,10943,4051,11024,4500,11074,4501,11155,4502,11180,4503,11213,4504,11247,5000,11299,5001,11324,5002,11376,5003,11393,
-5004,11428,5005,11455,5006,11471,5007,11494,5008,11517,5009,11558,5010,11591,5011,11611,5012,11644,5013,11683,5014,11738,
-5015,11773,5016,11842,5017,11866,5018,11885,5019,11909,5020,11934,5021,12089,5022,12255,5024,12338,5025,12369,5026,12385,
-5027,12392,5028,12404,5029,12416,5030,12426,5031,12438,5033,12450,5036,12461,5037,12493,5038,12536,5039,12701,5040,12882,
-5041,13108,5042,13255,5043,13305,5044,13401,5045,13414,5046,13428,5047,13441,5048,13459,5049,13474,5050,13481,5051,13531,
-5052,13689,5053,13862,5054,14058,5055,14118,5056,14186,5057,14254,5060,14282,5061,14291,5062,14304,5063,14315,5064,14327,
-5065,14333,5066,14341,5067,14356,5068,14362,5069,14428,5070,14442,5071,14454,5072,14631,5073,14664,5074,14744,5075,14870,
-5076,14950,5077,15011,5078,15050,5079,15112,5080,15155,5081,15170,5082,15183,5083,15227,5084,15297,5085,15374,5086,15438,
-5087,15446,5088,15467,5201,15491,5202,15496,5203,15501,5204,15510,5207,15519,5208,15525,5209,15540,5210,15549,5214,15554,
-5215,15563,5216,15569,5217,15586,5218,15598,5219,15614,5220,15625,5221,15638,5222,15649,5223,15655,5224,15665,5225,15681,
-5226,15695,5227,15707,5228,15717,5233,15735,5234,15748,5235,15762,5301,15781,5302,15792,5303,15846,5304,15910,5305,15921,
-6000,15938,6001,15951,6002,15970,6003,15989,6004,16023,6005,16411,6006,16432,6010,16446,6011,16458,6012,16465,6013,16509,
-6014,16516,6015,16541,6016,16559,6017,16606,6018,16627,6019,16648,6020,16654,6021,16661,6022,16678,6023,16685,6030,16718,
-6031,16724,6032,16730,6034,16736,6035,16744,6036,16754,6037,16762,6038,16787,6039,16799,6040,16811,6041,16840,6042,16895,
-6043,16908,6044,16936,6045,16949,6046,16962,6047,16984,6048,16994,6050,17018,6051,17063,6052,17156,6053,17168,6054,17184,
-6055,17200,6056,17215,6057,17228,6058,17249,6059,17255,6060,17262,6061,17269,6062,17282,6063,17296,6064,17313,6065,17331,
-6066,17347,6067,17360,6068,17372,6069,17386,6070,17391,6071,17400,6072,17407,6073,17414,6074,17422,6075,17435,6076,17440,
-6077,17464,6078,17495,6079,17550,6080,17620,6081,17628,6082,17633,6083,17652,6085,17676,6086,17681,6087,17714,6088,17756,
-6089,17776,6090,17781,6091,17786,6092,17795,6093,17802,6094,17822,6095,17836,6096,17857,6097,17865,6098,17889,6099,17951,
-6100,17972,6101,17983,6102,17995,6103,18003,6104,18008,6105,18033,6106,18040,6107,18065,6108,18086,6109,18127,6110,18144,
-6111,18155,6119,18172,6120,18202,6121,18231,6122,18260,6125,18294,6126,18314,6127,18344,6128,18372,6129,18394,6130,18408,
-6131,18434,6132,18442,6133,18465,6134,18476,6135,18488,6136,18508,6137,18528,6138,18540,6139,18805,6142,18837,6143,18860,
-6144,18871,6145,18888,6146,18898,6147,18923,6148,18931,6149,18951,6150,18993,6151,19017,6152,19057,6153,19066,6154,19087,
-6156,19108,6157,19113,6158,19118,6161,19144,6162,19158,6163,19184,6164,19202,6165,19205,6166,19215,6167,19226,6169,19249,
-6170,19263,6171,19298,6172,19331,6173,19340,6174,19358,6175,19383,6176,19399,6180,19421,6181,19429,6200,19440,6201,19446,
-6202,19452,6203,19458,6204,19468,6205,19473,6206,19485,6207,19494,6209,19508,6210,19521,6211,19532,6212,19547,6213,19559,
-6214,19568,6300,19579,6301,19608,6302,19626,6303,19641,6304,19651,6305,19662,6306,19678,6307,19697,6308,19713,6309,19736,
-6320,19759,6321,19791,6322,19823,6323,19848,6324,19864,6325,19876,6326,19888,6327,19908,6329,19927,6330,19948,6331,19981,
-6332,20014,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)
 {

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/uisync.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/uisync.cpp Changed

@@ -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));
@@ -180,7 +181,7 @@
 {
     CCheckTreeItem* parent,*child;
     int level = 0;
-    
+
     if (NULL==item) return;
     parent = CCheckTreeItem::cast(item->parent());
 
@@ -257,7 +258,7 @@
         closeDiskAct->setEnabled(true);
         startStreamingAct->setEnabled(true);
         backupAct->setEnabled(false);
-        
+
         Update_SaveFolderStatus();
     }
 }
@@ -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));
@@ -564,21 +576,25 @@
             }
             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: 
+            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: 
+            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 dtDvd: 
+            case dtDvd:
                 empty_big_btn->setDefaultAction(dvdToHdAct);
                 empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0621+AP_IMG_ANIMATION0621_COUNT-1);
                 empty_big_btn->setEnabled(boxEnabled);
@@ -600,7 +616,7 @@
 {
     QTreeWidget*        tree = titleTreeView;
     AP_UiTitleCollection* coll = &m_app->m_TitleCollection;
-    
+
     m_uisync_disabled++;
     tree->clear();
     tree->setColumnCount(2);
@@ -611,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)
     {
@@ -636,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);
 
@@ -800,6 +833,11 @@
         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
         if (0!=(FsFlags&AP_DskFsFlagBlurayFilesPresent))

makemkv-oss-1.8.0.tar.gz/makemkvgui/src/viteminfo.cpp -> makemkv-oss-1.8.1.tar.gz/makemkvgui/src/viteminfo.cpp Changed

@@ -38,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," (");
@@ -132,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,"&lt;"); break;
+        case '>':   append_const(Qstr,"&gt;"); break;
+        case '&':   append_const(Qstr,"&amp;"); break;
+        case '"':   append_const(Qstr,"&quot;"); break;
+        default:    Qstr.append(QChar(*Str)); break;
+        }
+        Str++;
+    }
+}
+

Overview

Request 444 (accepted)

Request History