Packman Build Service PMBS

makemkv.spec Changed

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

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

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

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

makemkv-bin-1.8.1.tar.gz/src/share/default.mmcp.xml -> makemkv-bin-1.8.2.tar.gz/src/share/default.mmcp.xml Changed

makemkv-bin-1.8.1.tar.gz/src/share/flac.mmcp.xml -> makemkv-bin-1.8.2.tar.gz/src/share/flac.mmcp.xml Changed

makemkv-bin-1.8.2.tar.gz/src/share/makemkv_dan.mo.gz Added

makemkv-bin-1.8.1.tar.gz/src/share/wdtv.mmcp.xml -> makemkv-bin-1.8.2.tar.gz/src/share/wdtv.mmcp.xml Changed

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

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

@@ -33,14 +33,16 @@
 static const unsigned int MKV_CHUNK_OLD_BLOCK=16;
 static const unsigned int MKV_CHUNK_AUTO_DURATION=32;
 
-static const unsigned int MKV_STREAM_FLAG_FORCED_SUBTITLE = 0x1000;
-
 static const unsigned int MKV_TRACK_COMPRESSION_ZLIB=0;
 static const unsigned int MKV_TRACK_COMPRESSION_BZ2=1;
 static const unsigned int MKV_TRACK_COMPRESSION_LZO=2;
 static const unsigned int MKV_TRACK_COMPRESSION_HEADERS=3;
 static const unsigned int MKV_TRACK_COMPRESSION_NONE=4;
 
+static const unsigned int MKV_TRACK_FLAG_DEFAULT=1;
+static const unsigned int MKV_TRACK_FLAG_FORCED=2;
+static const unsigned int MKV_TRACK_FLAG_LACING=128;
+
 class IMkvChunk
 {
 public:
@@ -91,7 +93,8 @@
     const unsigned char *header_comp_data;
     unsigned int        header_comp_size;
 
-    bool                use_lacing;
+    unsigned int        mkv_flags;
+
     int64_t             default_duration;
     int64_t             dts_adjust;
 
@@ -200,11 +203,7 @@
 typedef struct _MkvProfileInfo
 {
     int     version;
-    bool    ignoreForcedSubtitlesFlag;
     bool    useISO639Type2T;
-    bool    setFirstAudioTrackAsDefault;
-    bool    setFirstSubtitleTrackAsDefault;
-    bool    insertFirstChapter00IfMissing;
 } MkvProfileInfo;
 
 typedef struct _MkvFormatInfo

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

@@ -306,23 +306,6 @@
     return (Diff<3);
 }
 
-static bool IsFirstTrackOfType(IMkvTrack *Input,MkvTrackType Type,unsigned int Id)
-{
-    MkvTrackInfo ti;
-
-    for (unsigned int i=0;i<Input->MkvGetStreamCount();i++)
-    {
-        memset(&ti,0,sizeof(ti));
-        if (false==Input->MkvGetStream(i)->UpdateTrackInfo(&ti))
-        {
-            throw mkv_error_exception("UpdateTrackInfo failed");
-        }
-        if (ti.type!=Type) continue;
-        return (Id==i);
-    }
-    return false;
-}
-
 class MyMkvTrackInfo
 {
 public:
@@ -478,7 +461,6 @@
     {
         MkvTrackInfo *ti;
         KaxTrackEntry *cur_track;
-        unsigned int    track_default;
 
         ti = & track_info[i].info;
         track_info[i].frame_count = 0;
@@ -515,27 +497,9 @@
 
         GetChild<EbmlUInteger,KaxTrackType>(cur_track) = ttype;
 
-        track_default = 0;
-
-        if ( (ttype==track_audio) &&
-            (FormatInfo->profile.setFirstAudioTrackAsDefault) &&
-            IsFirstTrackOfType(Input,mttAudio,i) )
-        {
-            track_default = 1;
-        }
-
-        if ( (ttype==track_subtitle) &&
-            (FormatInfo->profile.setFirstSubtitleTrackAsDefault) &&
-            IsFirstTrackOfType(Input,mttSubtitle,i) )
-        {
-            track_default = 1;
-        }
-
-        GetChild<EbmlUInteger,KaxTrackFlagDefault>(cur_track) = track_default;
+        GetChild<EbmlUInteger,KaxTrackFlagDefault>(cur_track) = (0!=(ti->mkv_flags&MKV_TRACK_FLAG_DEFAULT))?1:0;
 
-        if ( (!FormatInfo->profile.ignoreForcedSubtitlesFlag) &&
-            (ttype==track_subtitle) &&
-            ((ti->stream_flags&MKV_STREAM_FLAG_FORCED_SUBTITLE)>0) )
+        if (0!=(ti->mkv_flags&MKV_TRACK_FLAG_FORCED))
         {
             GetChild<EbmlUInteger,KaxTrackFlagForced>(cur_track) = 1;
         }
@@ -578,7 +542,7 @@
             GetChild<EbmlUnicodeString,KaxTrackName>(cur_track) = tmp;
         }
 
-        GetChild<EbmlUInteger,KaxTrackFlagLacing>(cur_track) = (ti->use_lacing)?1:0;
+        GetChild<EbmlUInteger,KaxTrackFlagLacing>(cur_track) = (0!=(ti->mkv_flags&MKV_TRACK_FLAG_LACING))?1:0;
 
         if (mttVideo==ti->type)
         {
@@ -890,7 +854,7 @@
         unsigned int lacing_frames,fetch_frames,frames_count,same_frame_size;
         bool frame_keyframe,all_same;
 
-        if (track_info[stream_id].info.use_lacing)
+        if (0!=(track_info[stream_id].info.mkv_flags&MKV_TRACK_FLAG_LACING))
         {
             if (FormatInfo->debug.compatFlags&1)
             {

makemkv-oss-1.8.1.tar.gz/makefile.common -> makemkv-oss-1.8.2.tar.gz/makefile.common Changed

makemkv-oss-1.8.1.tar.gz/makemkvgui/bin/image_data.bin -> makemkv-oss-1.8.2.tar.gz/makemkvgui/bin/image_data.bin Changed

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

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

@@ -154,8 +154,8 @@
     apUnknown
 } AP_CMD;
 
-#define AP_CRE_VER "C0010"
-#define AP_GUI_VER "G0010"
+#define AP_CRE_VER "C0011"
+#define AP_GUI_VER "G0011"
 
 typedef uint32_t AP_DiskFsFlags;
 typedef uint32_t AP_DriveState;
@@ -174,6 +174,13 @@
     static const unsigned int   AP_ItemMaxCount = 64;
     static const unsigned int   BmpBitsPerItem = 32;
     typedef uint32_t bmp_type_t;
+    typedef enum _item_type_t
+    {
+        uiOther,
+        uiTitle,
+        uiTrack,
+        uiMax
+    } item_type_t;
 private:
     CApClient*  m_client;
     uint64_t    m_handle;
@@ -183,6 +190,7 @@
     bmp_type_t  m_infos_alloc[AP_ItemMaxCount/BmpBitsPerItem];
     bmp_type_t  m_infos_write[AP_ItemMaxCount/BmpBitsPerItem];
     bmp_type_t  m_infos_change[AP_ItemMaxCount/BmpBitsPerItem];
+    item_type_t m_type;
 public:
     AP_UiItem();
     ~AP_UiItem();
@@ -201,15 +209,14 @@
     bool GetInfoConst(AP_ItemAttributeId Id);
     void Forget(AP_ItemAttributeId Id);
     int RevertInfo(AP_ItemAttributeId);
-    void SetInfo(uint64_t handle,CApClient* client);
+    void SetInfo(uint64_t handle,CApClient* client,AP_UiItem::item_type_t Type);
     static bool isset(bmp_type_t bmp[],unsigned int Index);
     static void setone(bmp_type_t bmp[],unsigned int Index);
     static void setzero(bmp_type_t bmp[],unsigned int Index);
 public:
-    void operator=(const AP_UiItem&)
-    {
-    }
+    void operator=(const AP_UiItem&) {}
     AP_UiItem(const AP_UiItem&);
+    AP_UiItem::item_type_t type() { return m_type; }
 };
 
 class AP_UiTitle : public AP_UiItem
@@ -311,7 +318,7 @@
     bool OpenFile(const utf16_t* FileName);
     bool OpenCdDisk(unsigned int Id);
     bool OpenTitleCollection(const utf16_t* Source);
-    bool CloseDisk();
+    bool CloseDisk(unsigned int EjectEd);
     bool EjectDisk(unsigned int Id);
     bool SaveAllSelectedTitlesToMkv();
     bool StartStreaming();

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

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

@@ -14,25 +14,25 @@
 */
 
 
-static const uint32_t image_table[250]={
+static const uint32_t image_table[252]={
 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,
+2043876,2109416,2174956,2174956,2240496,2306036,2371576,2437116,2502656,2568196,2633736,2699276,2764816,2830356,2895896,2961436,
+3026976,3092516,3158056,3223596,3289136,3354676,3420216,3485756,3551296,3616836,3682376,3747916,3682376,3813456,3682376,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 };
+5976276,6041816,6107356,6172896,6238436,6500584,6762732,7024880,7287028,7549176,7811324,8073472,8335620,8597768,8859916,9122064,
+9384212,9646360,9646360,9908508,10170656,10432804,10694952,10957100,11219248,11481396,11743544,12005692,12267840,12529988,
+12792136,13054284,13316432,13578580,13840728,14102876,14365024,14627172,14889320,15151468,15413616,15675764,15937912,15675764,
+16200060,15675764,16200060,16462208,16724356,16986504,17248652,17510800,17772948,18035096,18297244,18559392,18821540,19083688,
+19345836,19607984,19870132,20132280,20394428,20656576,20918724,21180872,21443020,21705168,21967316,22229464,22491612,22753760,
+23015908,23278056,23540204,23802352,24064500,24326648,24588796,24850944,25113092,25375240,25637388 };
 
 #define IMAGE_TABLE_FORMAT QImage::Format_ARGB32_Premultiplied
-#define IMAGE_TABLE_SIZE 250
+#define IMAGE_TABLE_SIZE 252

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

@@ -47,36 +47,36 @@
 #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_ANIMATION0102_COUNT 2
+#define AP_IMG_ANIMATION0205 96
 #define AP_IMG_ANIMATION0205_COUNT 50
-#define AP_IMG_ANIMATION0505 145
+#define AP_IMG_ANIMATION0505 146
 #define AP_IMG_ANIMATION0505_COUNT 8
-#define AP_IMG_ANIMATION0506 153
+#define AP_IMG_ANIMATION0506 154
 #define AP_IMG_ANIMATION0506_COUNT 8
-#define AP_IMG_ANIMATION0606 161
+#define AP_IMG_ANIMATION0606 162
 #define AP_IMG_ANIMATION0606_COUNT 8
-#define AP_IMG_ANIMATION0621 169
+#define AP_IMG_ANIMATION0621 170
 #define AP_IMG_ANIMATION0621_COUNT 1
-#define AP_IMG_ANIMATION0622 170
+#define AP_IMG_ANIMATION0622 171
 #define AP_IMG_ANIMATION0622_COUNT 1
-#define AP_IMG_ANIMATION0623 171
+#define AP_IMG_ANIMATION0623 172
 #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_ANIMATION0102H 173
+#define AP_IMG_ANIMATION0102H_COUNT 2
+#define AP_IMG_ANIMATION0205H 175
 #define AP_IMG_ANIMATION0205H_COUNT 50
-#define AP_IMG_ANIMATION0505H 223
+#define AP_IMG_ANIMATION0505H 225
 #define AP_IMG_ANIMATION0505H_COUNT 8
-#define AP_IMG_ANIMATION0506H 231
+#define AP_IMG_ANIMATION0506H 233
 #define AP_IMG_ANIMATION0506H_COUNT 8
-#define AP_IMG_ANIMATION0606H 239
+#define AP_IMG_ANIMATION0606H 241
 #define AP_IMG_ANIMATION0606H_COUNT 8
-#define AP_IMG_ANIMATION0621H 247
+#define AP_IMG_ANIMATION0621H 249
 #define AP_IMG_ANIMATION0621H_COUNT 1
-#define AP_IMG_ANIMATION0622H 248
+#define AP_IMG_ANIMATION0622H 250
 #define AP_IMG_ANIMATION0622H_COUNT 1
-#define AP_IMG_ANIMATION0623H 249
+#define AP_IMG_ANIMATION0623H 251
 #define AP_IMG_ANIMATION0623H_COUNT 1

makemkv-oss-1.8.2.tar.gz/makemkvgui/src/lineeditk.cpp Added

makemkv-oss-1.8.2.tar.gz/makemkvgui/src/lineeditk.h Added

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

@@ -21,6 +21,7 @@
 #include "aboutbox.h"
 #include "notify.h"
 #include "abutton.h"
+#include "lineeditk.h"
 #include "image_defs.h"
 
 #define AP_KEY_STRING_LEN 68
@@ -288,10 +289,15 @@
 
 void MainWnd::SlotCloseDisk()
 {
+    CloseDisk(AP_MaxCdromDevices);
+}
+
+void MainWnd::CloseDisk(unsigned int EjectIndex)
+{
     m_CurrentlyOpenedDisk=-1;
     m_uisync_disabled++;
     RefreshItemInfo(NULL);
-    m_app->CloseDisk();
+    m_app->CloseDisk(EjectIndex);
     m_uisync_disabled--;
     SlotOnIdle();
 }
@@ -302,15 +308,15 @@
     if (m_app->m_TitleCollection.GetCount()==0)
     {
         Index = GetEmptyBoxDriveId();
+        if (Index>=0)
+        {
+            m_app->EjectDisk(Index);
+        }
     } else {
         Index = m_CurrentlyOpenedDisk;
-        SlotCloseDisk();
-    }
-    if (Index>=0)
-    {
-        m_app->EjectDisk(Index);
-        SlotOnIdle();
+        CloseDisk((Index<0)?AP_MaxCdromDevices:Index);
     }
+    SlotOnIdle();
 }
 
 
@@ -636,6 +642,7 @@
     connect( titleTreeView , SIGNAL(itemSelectionChanged()) , this , SLOT(SlotTreeSelectionChanged()) );
     connect( titleTreeView , SIGNAL(itemExpanded(QTreeWidgetItem*)) , this , SLOT(SlotTreeItemExpanded(QTreeWidgetItem*)) );
     connect( titleTreeView , SIGNAL(itemCollapsed(QTreeWidgetItem*)) , this , SLOT(SlotTreeItemCollapsed(QTreeWidgetItem*)) );
+    connect( titleTreeView , SIGNAL(itemChanged(QTreeWidgetItem *,int)) , this , SLOT(SlotTreeItemChanged(QTreeWidgetItem *,int)) );
 
     m_tree_toggle = new QAction(UI_QSTRING(APP_IFACE_ACT_TTREE_TOGGLE),this);
     connect(m_tree_toggle, SIGNAL(triggered()), this, SLOT(SlotToggleTreeItem()));
@@ -674,7 +681,7 @@
     itemBox1 = new QGroupBox(UI_QSTRING(APP_IFACE_MAIN_FRAME_PROPERTIES));
     itemBox1->setVisible(false);
     itemInfoCbox = new QComboBox();
-    itemInfoLine = new QLineEdit();
+    itemInfoLine = new QLineEditK();
     itemInfoButton = new QToolButton();
     itemInfoButton->setIconSize(adjustIconSize(itemInfoButton->iconSize(),16));
     itemInfoButton->setDefaultAction(itemInfoRevertAct);
@@ -685,6 +692,7 @@
     itemBox1->setLayout(item_lay);
     connect( itemInfoCbox , SIGNAL(currentIndexChanged(int)) , this , SLOT(SlotInfoCboxIndexChanged()) );
     connect( itemInfoLine , SIGNAL(editingFinished()) , this , SLOT(SlotInfoCboxIndexChanged()) );
+    connect( itemInfoLine , SIGNAL(specialKeyPressed(int)) , this , SLOT(SlotInfoLineKeyPressed(int)) );
 
     itemBox2 = new QGroupBox(UI_QSTRING(APP_IFACE_MAIN_FRAME_PROFILE));
     itemBox2->setVisible(false);
@@ -825,10 +833,14 @@
     settingsAct->setEnabled(false);
     registerAct->setEnabled(false);
     ejectAct->setEnabled(false);
-    if ((Flags&0x80000000)==0)
+
+    switch(Flags>>24)
     {
+    case 0:
+    default:
         mainStackedWidget->setCurrentIndex(1);
-    } else {
+        break;
+    case 0x80:
         emptyDriveBox->setEnabled(false);
         updateEmptyBox(Flags&0xffff,false);
         mainStackedWidget->setCurrentIndex(0);
@@ -836,6 +848,13 @@
 
         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);
+        break;
+    case 0x40:
+        emptyDriveBox->setEnabled(false);
+        empty_big_btn->setEnabled(false);
+        mainStackedWidget->setCurrentIndex(0);
+        topStackedWidget->setCurrentIndex(1);
+        break;
     }
 }

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

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

@@ -64,8 +64,9 @@
     return (m_mem->args[0]!=0);
 }
 
-bool CApClient::CloseDisk()
+bool CApClient::CloseDisk(unsigned int EjectId)
 {
+    m_mem->args[0]=EjectId;
     ExecCmd(apCallCloseDisk);
     return (m_mem->args[0]!=0);
 }
@@ -311,38 +312,39 @@
     return v;
 }
 
-void AP_UiItem::SetInfo(uint64_t handle,CApClient* client)
+void AP_UiItem::SetInfo(uint64_t handle,CApClient* client,AP_UiItem::item_type_t type)
 {
     m_client = client;
     m_handle = handle;
+    m_type = type;
     Clear();
 }
 
 void CApClient::SetTrackInfo(unsigned int id,unsigned int trkid,uint64_t handle)
 {
-    m_TitleCollection.m_Titles[id].m_Tracks[trkid].SetInfo(handle,this);
+    m_TitleCollection.m_Titles[id].m_Tracks[trkid].SetInfo(handle,this,AP_UiItem::uiTrack);
 }
 
 void CApClient::SetChapterInfo(unsigned int id,unsigned int chid,uint64_t handle)
 {
-    m_TitleCollection.m_Titles[id].m_Chapters[chid].SetInfo(handle,this);
+    m_TitleCollection.m_Titles[id].m_Chapters[chid].SetInfo(handle,this,AP_UiItem::uiOther);
 }
 
 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].SetInfo(handle,this,AP_UiItem::uiTitle);
     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(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);
+    m_TitleCollection.m_Titles[id].m_ChaptersContainer.SetInfo(chap_handle,this,AP_UiItem::uiOther);
 }
 
 void CApClient::SetTitleCollInfo(uint64_t handle,unsigned int Count)
 {
-    m_TitleCollection.SetInfo(handle,this);
+    m_TitleCollection.SetInfo(handle,this,AP_UiItem::uiOther);
     m_TitleCollection.m_Titles.reserve(Count);
     m_TitleCollection.m_Titles.clear();
     m_TitleCollection.m_Titles.resize(Count);

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

@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[20152]={
+static const unsigned short en_po_str[20187]={
 '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,
@@ -320,11 +320,15 @@
 'O','r','d','e','r',' ','w','e','i','g','h','t',0,
 'O','u','t','p','u','t',' ','f','o','r','m','a','t',0,
 'O','u','t','p','u','t',' ','d','e','s','c','r','i','p','t','i','o','n',0,
+'M','K','V',' ','F','l','a','g','s',0,
+'M','K','V',' ','F','l','a','g','s',0,
 'C','o','p','y',' ','a','s',' ','i','s',0,
 'R','a','w',' ','L','P','C','M',' ','a','u','d','i','o',' ','w','i','t','h','o','u','t',' ','c','h','a','n','n','e','l',' ','c','o','n','f','i','g','u','r','a','t','i','o','n',' ','m','e','t','a','d','a','t','a',0,
 'L','P','C','M',' ','a','u','d','i','o',' ','i','n',' ','W','A','V',' ','c','o','n','t','a','i','n','e','r',' ','w','i','t','h',' ','c','h','a','n','n','e','l',' ','c','o','n','f','i','g','u','r','a','t','i','o','n',' ','m','e','t','a','d','a','t','a',0,
 'F','L','A','C',' ','a','u','d','i','o',0,
 'V','O','B','S','U','B',' ','s','u','b','t','i','t','l','e','s',0,
+'D','e','f','a','u','l','t',0,
+'F','o','r','c','e','d',0,
 'M','a','k','e','M','K','V',' ','B','E','T','A',0,
 '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,
@@ -521,7 +525,7 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1011]={
+static const unsigned int en_po_off[1019]={
 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,2022,2404,2200,2538,
@@ -549,25 +553,26 @@
 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};
+5223,15973,5224,15983,5225,15999,5226,16013,5227,16025,5228,16035,5233,16053,5234,16066,5235,16080,5238,16099,5239,16109,
+5301,16119,5302,16130,5303,16184,5304,16248,5305,16259,5380,16276,5381,16284,6000,16291,6001,16304,6002,16323,6003,16342,
+6005,16376,6006,16397,6007,16411,6008,16493,6010,16507,6011,16519,6012,16526,6013,16570,6014,16577,6015,16602,6016,16620,
+6017,16667,6018,16688,6019,16709,6020,16715,6021,16722,6022,16739,6023,16746,6030,16779,6031,16785,6032,16791,6034,16797,
+6035,16805,6036,16815,6037,16823,6038,16848,6039,16860,6040,16872,6041,16901,6042,16956,6043,16969,6044,16997,6045,17010,
+6046,17023,6047,17045,6048,17055,6050,17079,6051,17124,6052,17217,6053,17229,6054,17245,6055,17261,6056,17276,6057,17289,
+6058,17310,6059,17316,6060,17323,6061,17330,6062,17343,6063,17357,6064,17374,6065,17392,6066,17408,6067,17421,6068,17433,
+6069,17447,6070,17452,6071,17461,6072,17468,6073,17475,6074,17483,6075,17496,6076,17501,6077,17525,6078,17556,6079,17611,
+6080,17681,6081,17689,6082,17694,6083,17713,6085,17737,6086,17742,6087,17775,6088,17817,6089,17837,6090,17842,6091,17847,
+6092,17856,6093,17863,6094,17883,6095,17897,6096,17918,6097,17926,6098,17950,6099,18012,6100,18033,6101,18044,6102,18056,
+6103,18064,6104,18069,6105,18094,6106,18101,6107,18126,6108,18147,6109,18188,6110,18205,6111,18216,6112,18233,6119,18247,
+6120,18277,6121,18306,6122,18335,6123,18369,6124,18400,6125,18432,6126,18452,6127,18482,6128,18510,6129,18532,6130,18546,
+6131,18572,6132,18580,6133,18603,6134,18614,6135,18626,6136,18646,6137,18666,6138,18678,6139,18943,6142,18975,6143,18998,
+6144,19009,6145,19026,6146,19036,6147,19061,6148,19069,6149,19089,6150,19131,6151,19155,6152,19195,6153,19204,6154,19225,
+6156,19246,6157,19251,6158,19256,6161,19282,6162,19296,6163,19322,6164,19340,6165,19343,6166,19353,6167,19364,6169,19387,
+6170,19401,6171,19436,6172,19469,6173,19478,6174,19496,6175,19521,6176,19537,6180,19559,6181,19567,6200,19578,6201,19584,
+6202,19590,6203,19596,6204,19606,6205,19611,6206,19623,6207,19632,6209,19646,6210,19659,6211,19670,6212,19685,6213,19697,
+6214,19706,6215,19717,6216,19726,6300,19734,6301,19763,6302,19781,6303,19796,6304,19806,6305,19817,6306,19833,6307,19852,
+6308,19868,6309,19891,6320,19914,6321,19946,6322,19978,6323,20003,6324,20019,6325,20031,6326,20043,6327,20063,6329,20082,
+6330,20103,6331,20136,6332,20169,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

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

@@ -25,6 +25,7 @@
     AP_UiItem*        m_UiItem;
     bool            m_Checkable;
     bool            m_AlwaysExpanded;
+    bool            m_NoSync;
 private:
     QString         m_Info;
 public:
@@ -33,6 +34,7 @@
     {
         m_Checkable = Checkable;
         m_AlwaysExpanded = false;
+        m_NoSync = true;
         if (false==Checkable)
         {
             setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled);
@@ -45,6 +47,7 @@
                 setCheckState(0,Qt::Unchecked);
             }
         }
+        m_NoSync = false;
     }
 public:
     void setData(int column, int role, const QVariant &value);
@@ -63,20 +66,28 @@
         return m_UiItem->get_Enabled();
     }
     void RebuildContents();
+    void RebuildContentsMF();
+    void UpdateItemMF();
+    static void UpdateItemMF1(CCheckTreeItem* item);
     QString getInfo(bool expertMode);
+    bool isEmptyInfo();
 };
 
 void CCheckTreeItem::setData(int column, int role, const QVariant &value)
 {
-    QTreeWidgetItem::setData(column,role,value);
-
     if ( (column==0) && (role==Qt::CheckStateRole) )
     {
         int state = value.toInt();
         bool val = (state==Qt::Checked);
 
         m_UiItem->set_Enabled(val);
+        if ( (m_UiItem->type()==AP_UiItem::uiTrack) &&
+            (!m_NoSync) )
+        {
+            UpdateItemMF();
+        }
     }
+    QTreeWidgetItem::setData(column,role,value);
 }
 
 void CCheckTreeItem::RebuildContents()
@@ -87,12 +98,56 @@
     m_UiItem->Forget(ap_iaMetadataLanguageName);
     m_UiItem->Forget(ap_iaOutputFileName);
     setText(1,GetInfo(m_UiItem,ap_iaTreeInfo));
+    RebuildContentsMF();
+}
+
+void CCheckTreeItem::RebuildContentsMF()
+{
+    m_UiItem->Forget(ap_iaMkvFlags);
+    m_UiItem->Forget(ap_iaMkvFlagsText);
     m_Info=QString();
 }
 
+void CCheckTreeItem::UpdateItemMF()
+{
+    CCheckTreeItem* parent = this;
+    while(parent->m_UiItem->type()!=AP_UiItem::uiTitle)
+    {
+        parent = CCheckTreeItem::cast(parent->parent());
+        if (!parent) break;
+    }
+    UpdateItemMF1(parent);
+}
+
+void CCheckTreeItem::UpdateItemMF1(CCheckTreeItem* item)
+{
+    if (!item) return;
+
+    if ( (item->m_UiItem->type()!=AP_UiItem::uiTrack) &&
+        (item->m_UiItem->type()!=AP_UiItem::uiTitle) )
+        return;
+
+    for (int i=0;i<item->childCount();i++)
+    {
+        CCheckTreeItem* child;
+
+        child = CCheckTreeItem::cast(item->child(i));
+        UpdateItemMF1(child);
+    }
+
+    if (item->m_UiItem->type()!=AP_UiItem::uiTrack) return;
+
+    item->RebuildContentsMF();
+}
+
+bool CCheckTreeItem::isEmptyInfo()
+{
+    return m_Info.isEmpty();
+}
+
 QString CCheckTreeItem::getInfo(bool expertMode)
 {
-    if (m_Info.isEmpty())
+    if (isEmptyInfo())
     {
         m_Info=BuildItemInfo(m_UiItem,expertMode);
     }
@@ -142,6 +197,23 @@
     }
 }
 
+void MainWnd::SlotTreeItemChanged(QTreeWidgetItem *, int)
+{
+    if (m_uisync_disabled) return;
+
+    CCheckTreeItem* item = GetSelectedItem(titleTreeView);
+
+    if (NULL!=item)
+    {
+        if (item->isEmptyInfo())
+        {
+            itemInfoEdit->setHtmlBody(item->getInfo(iface_ExpertMode));
+            m_item_item = NULL;
+            SlotInfoCboxIndexChanged();
+        }
+    }
+}
+
 void MainWnd::SlotTreeItemCollapsed(QTreeWidgetItem *item)
 {
     if (m_uisync_disabled) return;
@@ -372,6 +444,10 @@
         }
     case 1: item->RebuildContents(); break;
     case 2: Refresh_TitleTree(); break;
+    case 4:
+        item->RebuildContents();
+        item->UpdateItemMF();
+        break;
     }
 }
 
@@ -441,6 +517,24 @@
     SlotInfoCboxIndexChanged();
 }
 
+void MainWnd::SlotInfoLineKeyPressed(int key)
+{
+    QTreeWidgetItem* newItem = NULL;
+    switch(key)
+    {
+    case Qt::Key_Up:
+        newItem = titleTreeView->itemAbove(titleTreeView->currentItem());
+        break;
+    case Qt::Key_Down:
+        newItem = titleTreeView->itemBelow(titleTreeView->currentItem());
+        break;
+    }
+    if (newItem)
+    {
+        titleTreeView->setCurrentItem(newItem);
+    }
+}
+
 void MainWnd::SlotProfileCboxIndexChanged()
 {
     int oldIndex,newIndex;
@@ -561,7 +655,7 @@
             break;
         case AP_DriveStateEmptyOpen:
             empty_big_btn->setDefaultAction(noneToHdAct);
-            empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0205);
+            empty_big_btn->setButtonIcon(AP_IMG_ANIMATION0102+AP_IMG_ANIMATION0102_COUNT-1);
             empty_big_btn->setEnabled(false);
             break;
         case AP_DriveStateLoading:

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

Changes of Revision 20