Ticket #6032: HDicons.codechanges.diff
File HDicons.codechanges.diff, 7.9 KB (added by , 15 years ago) |
---|
-
themes/blue/ui.xml
917 917 <filename>type/watched.png</filename> 918 918 <position>302,106</position> 919 919 </image> 920 <image name="720" draworder="6"> 921 <filename>720.png</filename> 922 <position>337,106</position> 923 </image> 924 <image name="1080" draworder="6"> 925 <filename>1080.png</filename> 926 <position>337,106</position> 927 </image> 920 928 <image name="processing" draworder="6"> 921 929 <filename>processing.png</filename> 922 930 <position>20,106</position> -
themes/G.A.N.T/ui.xml
1363 1363 <filename>watched.png</filename> 1364 1364 <position>300,195</position> 1365 1365 </image> 1366 <image name="1080" draworder="6"> 1367 <filename>1080.png</filename> 1368 <position>335,195</position> 1369 </image> 1370 <image name="720" draworder="6"> 1371 <filename>720.png</filename> 1372 <position>335,195</position> 1373 </image> 1366 1374 1367 1375 1368 1376 </container> -
libs/libmythtv/dbcheck.cpp
18 18 #define MINIMUM_DBMS_VERSION 5,0,15 19 19 20 20 /// This is the DB schema version expected by the running MythTV instance. 21 const QString currentDatabaseVersion = "122 7";21 const QString currentDatabaseVersion = "1228"; 22 22 23 23 static bool UpdateDBVersionNumber(const QString &newnumber); 24 24 static bool performActualUpdate( … … 4385 4385 return false; 4386 4386 } 4387 4387 4388 if (dbver == "1227") 4389 { 4390 const char *updates[] = { 4391 "ALTER TABLE recordedprogram CHANGE COLUMN videoprop videoprop " 4392 " SET('HDTV', 'WIDESCREEN', 'AVC', '720', '1080') NOT NULL; ", 4393 NULL 4394 }; 4395 4396 if (!performActualUpdate(updates, "1228", dbver)) 4397 return false; 4398 } 4399 4400 4388 4401 return true; 4389 4402 } 4390 4403 -
libs/libmythtv/programinfo.h
95 95 VID_HDTV = 0x01, 96 96 VID_WIDESCREEN = 0x02, 97 97 VID_AVC = 0x04, 98 VID_720 = 0x08, 99 VID_1080 = 0x10, 98 100 }; 99 101 100 102 // if SubtitleTypes changes, the audioprop column in program and … … 316 318 void SetAspectChange(MarkTypes type, long long frame, 317 319 uint customAspect); 318 320 319 // Resolution Set 321 // Resolution Set/Get 320 322 void SetResolution(uint width, uint height, long long frame); 323 int GetHeight(void); 324 void SetVidpropHeight(int height); 321 325 322 326 // GUI stuff 323 327 void showDetails(void) const; … … 354 358 QString chanstr; 355 359 QString chansign; 356 360 QString channame; 361 uint tall; 357 362 358 359 363 int recpriority; 360 364 QString recgroup; 361 365 QString playgroup; -
libs/libmythtv/tv_rec.cpp
1083 1083 int filelen = -1; 1084 1084 pauseNotify = false; 1085 1085 ispip = false; 1086 int recHeight; 1086 1087 1087 1088 if (recorder && HasFlags(kFlagRecorderRunning)) 1088 1089 { … … 1090 1091 // may not be constant if using a DTV based recorder. 1091 1092 filelen = (int)((float)GetFramesWritten() / GetFramerate()); 1092 1093 1094 // Get the height and set the videoprops 1095 recHeight = curRecording->GetHeight(); 1096 curRecording->SetVidpropHeight(recHeight); 1097 1093 1098 QString message = QString("DONE_RECORDING %1 %2") 1094 1099 .arg(cardid).arg(filelen); 1095 1100 MythEvent me(message); -
libs/libmythtv/programinfo.cpp
3025 3025 MythDB::DBError("Resolution insert", query); 3026 3026 } 3027 3027 3028 /** \fn ProgramInfo::GetHeight(void) 3029 * \brief Gets overall average height. 3030 */ 3031 int ProgramInfo::GetHeight(void) 3032 { 3033 MSqlQuery query(MSqlQuery::InitCon()); 3034 3035 query.prepare("SELECT data FROM recordedmarkup" 3036 " WHERE chanid = :CHANID" 3037 " AND starttime = :STARTTIME" 3038 " AND type = 31" 3039 " ORDER BY mark LIMIT 1;"); 3040 query.bindValue(":CHANID", chanid); 3041 query.bindValue(":STARTTIME", recstartts); 3042 3043 if (query.exec() && query.isActive() && query.size() > 0) 3044 { 3045 query.next(); 3046 tall = query.value(0).toInt(); 3047 } 3048 else 3049 tall = 0; 3050 3051 return tall; 3052 } 3053 3054 /** \fn ProgramInfo::SetVidpropHeight(int height) 3055 * \brief Sets overall average height flag in videoprops. 3056 */ 3057 void ProgramInfo::SetVidpropHeight(int height) 3058 { 3059 3060 MSqlQuery query(MSqlQuery::InitCon()); 3061 3062 query.prepare("UPDATE recordedprogram SET videoprop =" 3063 " CONCAT_WS(',', IF(videoprop = '', NULL, videoprop), :VALUE)" 3064 " WHERE chanid = :CHANID AND starttime = :STARTTIME;"); 3065 3066 if (height > 700 && height < 800) 3067 { 3068 VERBOSE(VB_IMPORTANT, QString("The 720 case matches because height was %1").arg(height)); 3069 videoproperties |= VID_720; 3070 3071 query.bindValue(":VALUE", "720"); 3072 query.bindValue(":CHANID", chanid); 3073 query.bindValue(":STARTTIME", startts); 3074 3075 query.exec(); 3076 if (!query.isActive()) 3077 MythDB::DBError("UpdateRes", query); 3078 3079 } 3080 else if (height > 1000 && height < 1100) 3081 { 3082 VERBOSE(VB_IMPORTANT, QString("The 1080 case matches because height was %1").arg(height)); 3083 videoproperties |= VID_1080; 3084 3085 query.bindValue(":VALUE", "1080"); 3086 query.bindValue(":CHANID", chanid); 3087 query.bindValue(":STARTTIME", startts); 3088 3089 query.exec(); 3090 if (!query.isActive()) 3091 MythDB::DBError("UpdateRes", query); 3092 } 3093 else 3094 { 3095 VERBOSE(VB_IMPORTANT, QString("The unknown case matches because height was %1").arg(height)); 3096 } 3097 } 3098 3028 3099 /** \fn ProgramInfo::ReactivateRecording(void) 3029 3100 * \brief Asks the scheduler to restart this recording if possible. 3030 3101 */ … … 3852 3923 attr += QObject::tr("Widescreen") + ", "; 3853 3924 if (videoprop & VID_AVC) 3854 3925 attr += QObject::tr("AVC/H.264") + ", "; 3926 if (videoprop & VID_720) 3927 attr += QObject::tr("720p Resolution") + ", "; 3928 if (videoprop & VID_1080) 3929 attr += QObject::tr("1080i/p Resolution") + ", "; 3855 3930 3856 3931 if (subtype & SUB_HARDHEAR) 3857 3932 attr += QObject::tr("CC","Closed Captioned") + ", "; -
programs/mythfrontend/playbackbox.cpp
943 943 944 944 iconMap["hdtv"] = VID_HDTV; 945 945 iconMap["widescreen"] = VID_WIDESCREEN; 946 iconMap["720"] = VID_720; 947 iconMap["1080"] = VID_1080; 946 948 947 949 bool havevidicon = false; 948 950 … … 957 959 { 958 960 itype->show(); 959 961 // We only want one icon displayed 960 havevidicon = true;962 //havevidicon = true; 961 963 } 962 964 } 963 965 } … … 4781 4783 iconMap["hdtv"] = tr("Recording is in High Definition"); 4782 4784 iconMap["widescreen"] = tr("Recording is in WideScreen"); 4783 4785 4786 iconMap["720"] = tr("Recording is 720p Resolution"); 4787 iconMap["1080"] = tr("Recording is 1080i/p Resolution"); 4788 4784 4789 iconMap["watched"] = tr("Recording has been watched"); 4785 4790 iconMap["preserved"] = tr("Recording is preserved"); 4786 4791