Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.14.2.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.14.3.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.14.2.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.14.3.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.14.2.tar.xz/src/share/blues.jar -> makemkv-bin-1.14.3.tar.xz/src/share/blues.jar Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.14.3.tar.xz/makemkvgui/inc/lgpl/apdefs.h Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.14.3.tar.xz/makemkvgui/inc/lgpl/aproxy.h Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.14.3.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.14.3.tar.xz/makemkvgui/src/mainwnd.cpp Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.14.3.tar.xz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/src/margui.cpp -> makemkv-oss-1.14.3.tar.xz/makemkvgui/src/margui.cpp Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/src/qtapp.h -> makemkv-oss-1.14.3.tar.xz/makemkvgui/src/qtapp.h Changed

makemkv-oss-1.14.2.tar.xz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.14.3.tar.xz/makemkvgui/src/scsiinfo.cpp Changed

@@ -13,6 +13,7 @@
 
 */
 #include "qtapp.h"
+#include "mainwnd.h"
 #include <driveio/driveio.h>
 #include <lgpl/smem.h>
 
@@ -211,7 +212,7 @@
     }
 }
 
-bool FormatDriveDiskInfo(QString& ProtectionString,QString& FullInfoString,const utf16_t* DeviceNameString,const utf16_t* DiscNameString,const void* DiskData,unsigned int DiskDataSize,AP_DiskFsFlags FsFlags,AP_DriveState DriveState)
+bool CDriveInfo::FormatDriveDiskInfo(const utf16_t* DeviceNameString,const void* DiskData,unsigned int DiskDataSize)
 {
     struct _items{
         DriveInfoItem   inquiry,drive_serial,firmware_date,firmware_string,current_profile;
@@ -283,7 +284,7 @@
     //
     // Firstly, protection info
     //
-    ProtectionString=FormatProtectionString(FsFlags,
+    this->strProt=FormatProtectionString(diskFsFlags,
         (items.copyright_info.Size>=8)?items.copyright_info.Data:NULL,
         (items.mkb_small.Size>=12)?items.mkb_small.Data:NULL,
         (items.ccert_small.Size>=4)?items.ccert_small.Data:NULL,
@@ -399,7 +400,7 @@
     //
     // Disk info
     //
-    switch(DriveState)
+    switch(driveState)
     {
     case AP_DriveStateEmptyClosed:
     case AP_DriveStateEmptyOpen:
@@ -413,23 +414,20 @@
     case AP_DriveStateInserted:
         append_const(str,AP_UI_STRING(APP_SI_DISCINFO));
 
-        if (DiscNameString!=NULL)
+        if (!strLabel.isEmpty())
         {
-            if (DiscNameString[0])
+            const utf16_t* label = AP_UI_STRING(APP_IFACE_EMPTY_FRAME_LABEL);
+            size_t label_size = utf16len(label);
+            if ((label_size>2) && (label[label_size-2]==' ') && (label[label_size-1]==':'))
             {
-                const utf16_t* label = AP_UI_STRING(APP_IFACE_EMPTY_FRAME_LABEL);
-                size_t label_size = utf16len(label);
-                if ( (label_size>2) && (label[label_size-2]==' ') && (label[label_size-1]==':') )
-                {
-                    append_const(str,label,label_size-2);
-                    append_const(str,":");
-                } else {
-                    append_const(str,label);
-                }
-                append_const(str," ");
-                append_const(str,DiscNameString);
-                append_const(str,"<br>");
+                append_const(str,label,label_size-2);
+                append_const(str,":");
+            } else {
+                append_const(str,label);
             }
+            append_const(str," ");
+            str.append(strLabel);
+            append_const(str,"<br>");
         }
 
         if (items.timestamp.Size==20)
@@ -602,7 +600,7 @@
     {
         qDebug("info string reallocated, size=%u",((unsigned int)str.size()));
     }
-    FullInfoString = str;
+    this->strInfo = str;
     return true;
 }

makemkv-oss-1.14.2.tar.xz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.14.3.tar.xz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[21935]={
+static const unsigned short en_po_str[22021]={
 '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,
@@ -181,6 +181,7 @@
 'B','o','t','h',' ','d','i','s','c',' ','a','n','d',' ','d','r','i','v','e',' ','r','e','q','u','i','r','e',' ','b','u','s',' ','e','n','c','r','y','p','t','i','o','n',',',' ','b','u','t',' ','t','h','e',' ','b','u','s',' ','k','e','y',' ','i','s',' ','n','o','t',' ','k','n','o','w','n','.',0,
 'U','s','i','n','g',' ','J','a','v','a',' ','r','u','n','t','i','m','e',' ','f','r','o','m',' ','%','1',0,
 'T','h','i','s',' ','d','i','s','c',' ','r','e','q','u','i','r','e','s',' ','J','a','v','a',' ','r','u','n','t','i','m','e',' ','(','J','R','E',')',',',' ','b','u','t',' ','n','o','n','e',' ','w','a','s',' ','f','o','u','n','d','.',' ','C','e','r','t','a','i','n',' ','f','u','n','c','t','i','o','n','s',' ','w','i','l','l',' ','f','a','i','l',',',' ','p','l','e','a','s','e',' ','i','n','s','t','a','l','l',' ','J','a','v','a','.',' ','S','e','e',' ','%','1',' ','f','o','r',' ','d','e','t','a','i','l','s','.',0,
+'L','i','b','r','e','D','r','i','v','e',' ','c','o','m','p','a','t','i','b','l','e',' ','d','r','i','v','e',' ','i','s',' ','r','e','q','u','i','r','e','d',' ','t','o',' ','o','p','e','n',' ','t','h','i','s',' ','d','i','s','c',' ','-',' ','v','i','d','e','o',' ','c','a','n',0x27,'t',' ','b','e',' ','d','e','c','r','y','p','t','e','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,
@@ -575,7 +576,7 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1119]={
+static const unsigned int en_po_off[1121]={
 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,1010,301,
 1011,320,1012,323,2001,329,2002,378,2003,464,2004,518,2006,586,2007,703,2008,858,2009,981,2010,1109,
 2011,1154,2012,1298,2013,1382,2014,1468,2015,1516,2016,1598,2017,1761,2018,1876,2019,1938,2020,1978,2021,2145,
@@ -591,42 +592,42 @@
 3311,6587,3312,6654,3313,6731,3314,6799,3315,6848,3316,6871,3317,6894,3318,6916,3319,6969,3320,7031,3321,7091,
 3322,7169,3323,7221,3324,7280,3325,7326,3326,7379,3327,7452,3328,7516,3329,7565,3330,7658,3331,7715,3332,7748,
 3333,7773,3334,7838,3335,8237,3336,8605,3337,8988,3338,9067,3339,9099,3340,9147,3341,9220,3342,9266,3343,9439,
-3344,9513,3345,9540,3400,9669,3401,9689,3402,9716,3403,9727,3404,9745,3405,9766,3406,9774,3407,9794,4001,9807,
-4002,9890,4003,9956,4004,10021,4007,10104,4008,10166,4009,10224,4020,10335,4021,10370,4022,10422,4023,10454,4024,10518,
-4025,10552,4026,10598,4027,10645,4028,10693,4040,10736,4041,10814,4042,10873,4043,10925,4044,11022,4045,11093,4046,11191,
-4047,11234,4048,11272,4049,11307,4050,11359,4051,11440,4052,11490,4053,11521,4054,11672,4055,11689,4060,11752,4061,11809,
-4062,11871,4500,11966,4501,12047,4502,12072,4503,12105,4504,12139,5000,12191,5001,12216,5002,12268,5003,12285,5004,12320,
-5005,12347,5006,12363,5007,12386,5008,12409,5009,12450,5010,12483,5011,12503,5012,12536,5013,12575,5014,12630,5015,12665,
-5016,12734,5017,12758,5018,12777,5019,12801,5020,12826,5021,12981,5022,13127,5024,13210,5025,13241,5026,13257,5027,13264,
-5028,13276,5029,13288,5030,13298,5031,13310,5033,13322,5036,13333,5037,13365,5038,13408,5039,13573,5040,13754,5041,13980,
-5042,14127,5043,14177,5044,14273,5045,14286,5046,14300,5047,14313,5048,14331,5049,14346,5050,14353,5051,14403,5052,14561,
-5053,14734,5054,14930,5055,14990,5056,15058,5057,15126,5058,15154,5060,15301,5061,15310,5062,15323,5063,15334,5064,15346,
-5065,15352,5066,15360,5067,15375,5068,15381,5069,15447,5070,15461,5071,15473,5072,15650,5073,15683,5074,15763,5075,15889,
-5076,15940,5077,16001,5078,16040,5079,16102,5080,16145,5081,16160,5082,16173,5083,16217,5084,16287,5085,16364,5086,16428,
-5087,16436,5088,16457,5089,16481,5090,16492,5091,16497,5092,16504,5093,16513,5094,16543,5100,16565,5101,16579,5201,16706,
-5202,16711,5203,16716,5204,16725,5207,16734,5208,16740,5209,16755,5210,16764,5214,16769,5215,16778,5216,16784,5217,16801,
-5218,16813,5219,16829,5220,16840,5221,16853,5222,16864,5223,16870,5224,16880,5225,16896,5226,16910,5227,16922,5228,16932,
-5233,16950,5234,16963,5235,16977,5238,16996,5239,17006,5240,17016,5248,17031,5249,17041,5250,17049,5301,17058,5302,17069,
-5303,17123,5304,17187,5305,17198,5306,17215,5307,17225,5308,17235,5380,17250,5381,17258,6000,17265,6001,17278,6002,17297,
-6003,17316,6005,17350,6006,17371,6007,17385,6008,17467,6010,17481,6011,17493,6012,17500,6013,17544,6014,17551,6015,17576,
-6016,17594,6017,17641,6018,17662,6019,17683,6020,17689,6021,17696,6022,17713,6023,17720,6024,17753,6026,17777,6030,17834,
-6031,17840,6032,17846,6034,17852,6035,17860,6036,17870,6037,17878,6038,17903,6039,17915,6040,17927,6041,17956,6042,18011,
-6043,18024,6044,18052,6045,18065,6046,18078,6047,18100,6048,18110,6050,18134,6051,18179,6052,18272,6053,18284,6054,18300,
-6055,18316,6056,18331,6057,18344,6058,18365,6059,18371,6060,18378,6061,18385,6062,18398,6063,18412,6064,18429,6065,18447,
-6066,18463,6067,18476,6068,18488,6069,18502,6070,18507,6071,18516,6072,18523,6073,18530,6074,18538,6075,18551,6076,18556,
-6077,18580,6078,18611,6079,18666,6080,18736,6081,18744,6082,18749,6083,18768,6084,18792,6085,18812,6086,18817,6087,18850,
-6088,18892,6089,18912,6090,18917,6091,18922,6092,18931,6093,18938,6094,18958,6095,18972,6096,18993,6097,19001,6098,19025,
-6099,19087,6100,19108,6101,19119,6102,19131,6103,19139,6104,19144,6105,19169,6106,19176,6107,19201,6108,19222,6109,19263,
-6110,19280,6111,19291,6112,19308,6119,19322,6120,19352,6121,19381,6122,19410,6123,19444,6124,19475,6125,19507,6126,19527,
-6127,19557,6128,19585,6129,19607,6130,19621,6131,19647,6132,19655,6133,19678,6134,19689,6135,19701,6136,19721,6137,19741,
-6138,19753,6139,20018,6142,20050,6143,20073,6144,20084,6145,20101,6146,20111,6147,20136,6148,20144,6149,20164,6150,20206,
-6151,20230,6152,20270,6153,20279,6154,20300,6156,20321,6157,20326,6158,20331,6159,20357,6161,20370,6162,20384,6163,20410,
-6164,20428,6165,20431,6166,20441,6167,20452,6168,20475,6169,20503,6170,20517,6171,20552,6172,20585,6173,20594,6174,20612,
-6175,20637,6177,20660,6178,20692,6180,20720,6181,20728,6200,20739,6201,20745,6202,20751,6203,20757,6204,20767,6205,20772,
-6206,20784,6207,20793,6209,20807,6210,20820,6211,20831,6212,20846,6213,20858,6214,20867,6215,20878,6216,20887,6220,20895,
-6221,20919,6222,20932,6223,20943,6224,20953,6225,20966,6226,21335,6227,21353,6228,21454,6229,21465,6300,21482,6301,21511,
-6302,21529,6303,21544,6304,21554,6305,21565,6306,21581,6307,21600,6308,21616,6309,21639,6320,21662,6321,21694,6322,21726,
-6323,21751,6324,21767,6325,21779,6326,21791,6327,21811,6329,21830,6330,21851,6331,21884,6332,21917,0};
+3344,9513,3345,9540,3346,9669,3400,9755,3401,9775,3402,9802,3403,9813,3404,9831,3405,9852,3406,9860,3407,9880,
+4001,9893,4002,9976,4003,10042,4004,10107,4007,10190,4008,10252,4009,10310,4020,10421,4021,10456,4022,10508,4023,10540,
+4024,10604,4025,10638,4026,10684,4027,10731,4028,10779,4040,10822,4041,10900,4042,10959,4043,11011,4044,11108,4045,11179,
+4046,11277,4047,11320,4048,11358,4049,11393,4050,11445,4051,11526,4052,11576,4053,11607,4054,11758,4055,11775,4060,11838,
+4061,11895,4062,11957,4500,12052,4501,12133,4502,12158,4503,12191,4504,12225,5000,12277,5001,12302,5002,12354,5003,12371,
+5004,12406,5005,12433,5006,12449,5007,12472,5008,12495,5009,12536,5010,12569,5011,12589,5012,12622,5013,12661,5014,12716,
+5015,12751,5016,12820,5017,12844,5018,12863,5019,12887,5020,12912,5021,13067,5022,13213,5024,13296,5025,13327,5026,13343,
+5027,13350,5028,13362,5029,13374,5030,13384,5031,13396,5033,13408,5036,13419,5037,13451,5038,13494,5039,13659,5040,13840,
+5041,14066,5042,14213,5043,14263,5044,14359,5045,14372,5046,14386,5047,14399,5048,14417,5049,14432,5050,14439,5051,14489,
+5052,14647,5053,14820,5054,15016,5055,15076,5056,15144,5057,15212,5058,15240,5060,15387,5061,15396,5062,15409,5063,15420,
+5064,15432,5065,15438,5066,15446,5067,15461,5068,15467,5069,15533,5070,15547,5071,15559,5072,15736,5073,15769,5074,15849,
+5075,15975,5076,16026,5077,16087,5078,16126,5079,16188,5080,16231,5081,16246,5082,16259,5083,16303,5084,16373,5085,16450,
+5086,16514,5087,16522,5088,16543,5089,16567,5090,16578,5091,16583,5092,16590,5093,16599,5094,16629,5100,16651,5101,16665,
+5201,16792,5202,16797,5203,16802,5204,16811,5207,16820,5208,16826,5209,16841,5210,16850,5214,16855,5215,16864,5216,16870,
+5217,16887,5218,16899,5219,16915,5220,16926,5221,16939,5222,16950,5223,16956,5224,16966,5225,16982,5226,16996,5227,17008,
+5228,17018,5233,17036,5234,17049,5235,17063,5238,17082,5239,17092,5240,17102,5248,17117,5249,17127,5250,17135,5301,17144,
+5302,17155,5303,17209,5304,17273,5305,17284,5306,17301,5307,17311,5308,17321,5380,17336,5381,17344,6000,17351,6001,17364,
+6002,17383,6003,17402,6005,17436,6006,17457,6007,17471,6008,17553,6010,17567,6011,17579,6012,17586,6013,17630,6014,17637,
+6015,17662,6016,17680,6017,17727,6018,17748,6019,17769,6020,17775,6021,17782,6022,17799,6023,17806,6024,17839,6026,17863,
+6030,17920,6031,17926,6032,17932,6034,17938,6035,17946,6036,17956,6037,17964,6038,17989,6039,18001,6040,18013,6041,18042,
+6042,18097,6043,18110,6044,18138,6045,18151,6046,18164,6047,18186,6048,18196,6050,18220,6051,18265,6052,18358,6053,18370,
+6054,18386,6055,18402,6056,18417,6057,18430,6058,18451,6059,18457,6060,18464,6061,18471,6062,18484,6063,18498,6064,18515,
+6065,18533,6066,18549,6067,18562,6068,18574,6069,18588,6070,18593,6071,18602,6072,18609,6073,18616,6074,18624,6075,18637,
+6076,18642,6077,18666,6078,18697,6079,18752,6080,18822,6081,18830,6082,18835,6083,18854,6084,18878,6085,18898,6086,18903,
+6087,18936,6088,18978,6089,18998,6090,19003,6091,19008,6092,19017,6093,19024,6094,19044,6095,19058,6096,19079,6097,19087,
+6098,19111,6099,19173,6100,19194,6101,19205,6102,19217,6103,19225,6104,19230,6105,19255,6106,19262,6107,19287,6108,19308,
+6109,19349,6110,19366,6111,19377,6112,19394,6119,19408,6120,19438,6121,19467,6122,19496,6123,19530,6124,19561,6125,19593,
+6126,19613,6127,19643,6128,19671,6129,19693,6130,19707,6131,19733,6132,19741,6133,19764,6134,19775,6135,19787,6136,19807,
+6137,19827,6138,19839,6139,20104,6142,20136,6143,20159,6144,20170,6145,20187,6146,20197,6147,20222,6148,20230,6149,20250,
+6150,20292,6151,20316,6152,20356,6153,20365,6154,20386,6156,20407,6157,20412,6158,20417,6159,20443,6161,20456,6162,20470,
+6163,20496,6164,20514,6165,20517,6166,20527,6167,20538,6168,20561,6169,20589,6170,20603,6171,20638,6172,20671,6173,20680,
+6174,20698,6175,20723,6177,20746,6178,20778,6180,20806,6181,20814,6200,20825,6201,20831,6202,20837,6203,20843,6204,20853,
+6205,20858,6206,20870,6207,20879,6209,20893,6210,20906,6211,20917,6212,20932,6213,20944,6214,20953,6215,20964,6216,20973,
+6220,20981,6221,21005,6222,21018,6223,21029,6224,21039,6225,21052,6226,21421,6227,21439,6228,21540,6229,21551,6300,21568,
+6301,21597,6302,21615,6303,21630,6304,21640,6305,21651,6306,21667,6307,21686,6308,21702,6309,21725,6320,21748,6321,21780,
+6322,21812,6323,21837,6324,21853,6325,21865,6326,21877,6327,21897,6329,21916,6330,21937,6331,21970,6332,22003,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

makemkv-oss-1.14.2.tar.xz/makemkvgui/src/uisync.cpp -> makemkv-oss-1.14.3.tar.xz/makemkvgui/src/uisync.cpp Changed

@@ -351,7 +351,7 @@
     if (cmb_ndx>=0)
     {
         cur_ndx = emptyDriveBox->itemData(cmb_ndx).toInt();
-        if (DriveInfo[cur_ndx].state==AP_DriveStateNoDrive)
+        if (DriveInfo[cur_ndx].driveState==AP_DriveStateNoDrive)
         {
             cur_ndx = -1;
         }
@@ -566,7 +566,7 @@
         int good_ndx=-1;
         for (unsigned int i=0;i<AP_MaxCdromDevices;i++)
         {
-            if (DriveInfo[i].state!=AP_DriveStateInserted) continue;
+            if (DriveInfo[i].driveState!=AP_DriveStateInserted) continue;
             if (DriveInfo[i].showOpen()==false) continue;
             good_ndx=i;
             break;
@@ -576,7 +576,7 @@
         {
             for (unsigned int i=0;i<AP_MaxCdromDevices;i++)
             {
-                if (DriveInfo[i].state!=AP_DriveStateLoading) continue;
+                if (DriveInfo[i].driveState!=AP_DriveStateLoading) continue;
                 good_ndx=i;
                 break;
             }
@@ -593,9 +593,9 @@
     emptyDriveBox->clear();
     for (unsigned int i=0;i<AP_MaxCdromDevices;i++)
     {
-        if (DriveInfo[i].state==AP_DriveStateNoDrive) continue;
+        if (DriveInfo[i].driveState==AP_DriveStateNoDrive) continue;
 
-        emptyDriveBox->addItem(DriveInfo[i].name,QVariant(i));
+        emptyDriveBox->addItem(DriveInfo[i].driveName,QVariant(i));
         if (((int)i)==cur_ndx)
         {
             cmb_ndx = emptyDriveBox->count()-1;
@@ -639,10 +639,10 @@
         empty_dvd_box->setVisible(false);
     } else {
         CDriveInfo* info = &DriveInfo[cur_ndx];
-        empty_type->setText(info->type);
-        empty_label->setText(info->label);
-        empty_prot->setText(info->prot);
-        empty_right_info->setHtmlBody(info->right_info);
+        empty_type->setText(info->strType);
+        empty_label->setText(info->strLabel);
+        empty_prot->setText(info->strProt);
+        empty_right_info->setHtmlBody(info->strInfo);
         empty_right_info->setEnabled(true);
         backupAct->setEnabled(false);
         empty_dvd->setVisible(false);
@@ -650,7 +650,7 @@
         empty_dvd_box->setChecked(false);
         empty_dvd_box->setEnabled(false);
 
-        switch(info->state)
+        switch(info->driveState)
         {
         case AP_DriveStateEmptyClosed:
             empty_big_btn->setDefaultAction(noneToHdAct);
@@ -679,7 +679,7 @@
             empty_big_btn->setEnabled(false);
             break;
         case AP_DriveStateInserted:
-            switch(info->disk_type)
+            switch(info->diskType)
             {
             case dtBluray:
                 empty_big_btn->setDefaultAction(blurayToHdAct);
@@ -898,27 +898,27 @@
 
 CDriveInfo::CDriveInfo()
 {
-    state = AP_DriveStateNoDrive;
+    driveState = AP_DriveStateNoDrive;
 }
 
 bool CDriveInfo::showOpen()
 {
-    if (state!=AP_DriveStateInserted) return false;
-    return (disk_type!=dtUnknown);
+    if (driveState!=AP_DriveStateInserted) return false;
+    return (diskType!=dtUnknown);
 }
 
 void CDriveInfo::Update(AP_DriveState DriveState,const utf16_t* DriveName,const utf16_t* DiskName,const utf16_t* DeviceName,AP_DiskFsFlags FsFlags,const void* DiskData,unsigned int DiskDataSize)
 {
-    AP_DriveState   prevState = state;
+    AP_DriveState   prevState = driveState;
 
-    state = DriveState;
-    name = QStringFromUtf16(DriveName);
-    label = QStringFromUtf16(DiskName);
+    driveState = DriveState;
+    driveName = QStringFromUtf16(DriveName);
+    strLabel = QStringFromUtf16(DiskName);
 
-    fs_flags = FsFlags;
+    diskFsFlags = FsFlags;
     load = false;
 
-    prot.clear();
+    strProt.clear();
     bool need_prot = false;
 
     switch(DriveState)
@@ -926,40 +926,40 @@
     case AP_DriveStateNoDrive:
     case AP_DriveStateEmptyClosed:
     case AP_DriveStateEmptyOpen:
-        type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_NODISC));
-        label.clear();
-        right_info.clear();
+        strType=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_NODISC));
+        strLabel.clear();
+        strInfo.clear();
         break;
     case AP_DriveStateLoading:
-        type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_LOADING));
-        label=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_WAIT));
-        right_info=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE);
+        strType=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_LOADING));
+        strLabel=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_WAIT));
+        strInfo=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);
+        strType=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_UNMOUNTING));
+        strLabel=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_WAIT));
+        strInfo=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE);
         break;
     case AP_DriveStateInserted:
         // type
         if (0!=(FsFlags&AP_DskFsFlagBlurayFilesPresent))
         {
-            type=QLatin1String("Blu-ray");
-            disk_type=dtBluray;
+            strType=QLatin1String("Blu-ray");
+            diskType=dtBluray;
         } else {
             if (0!=(FsFlags&AP_DskFsFlagHdvdFilesPresent))
             {
-                type = QLatin1String("HD-DVD");
-                disk_type=dtHdvd;
+                strType = QLatin1String("HD-DVD");
+                diskType=dtHdvd;
             } else {
                 if (0!=(FsFlags&AP_DskFsFlagDvdFilesPresent))
                 {
-                    type = QLatin1String("DVD");
-                    disk_type=dtDvd;
+                    strType = QLatin1String("DVD");
+                    diskType=dtDvd;
                 } else {
-                    disk_type=dtUnknown;
-                    type=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_DATADISC));
+                    diskType=dtUnknown;
+                    strType=QString(UI_QSTRING(APP_IFACE_DRIVEINFO_DATADISC));
                 }
             }
         }
@@ -971,13 +971,15 @@
 
     if (DriveState!=AP_DriveStateNoDrive)
     {
-        QString tprot;
-        if ( (0==DiskDataSize) || (false==FormatDriveDiskInfo(tprot,right_info,DeviceName,DiskName,DiskData,DiskDataSize,FsFlags,DriveState)) )
+        if ( (0==DiskDataSize) || (false==FormatDriveDiskInfo(DeviceName,DiskData,DiskDataSize)) )
         {
-            tprot.clear();
-            right_info=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE);
+            strProt.clear();
+            strInfo=UI_QSTRING(APP_IFACE_DRIVEINFO_NONE);
+        }
+        if (!need_prot)
+        {
+            strProt.clear();
         }
-        if (need_prot) prot = tprot;
     }
 }

makemkv-oss-1.14.2.tar.xz/msvc/inc/unistd.h -> makemkv-oss-1.14.3.tar.xz/msvc/inc/unistd.h Changed

Changes of Revision 54