Ticket #8535: season_r24995.patch
File season_r24995.patch, 75.5 KB (added by , 14 years ago) |
---|
-
mythplugins/mythweb/modules/tv/detail.php
222 222 $schedule->inactive = $_POST['inactive'] ? 1 : 0; 223 223 $schedule->dupin = _or($_POST['dupin'] + $_POST['dupin2'], dupsin_all); 224 224 $schedule->dupmethod = _or($_POST['dupmethod'], 6); 225 $schedule->seasonlimit = intval($_POST['seasonlimit']); 225 226 $schedule->recpriority = intval($_POST['recpriority']); 226 227 $schedule->maxepisodes = intval($_POST['maxepisodes']); 227 228 $schedule->startoffset = intval($_POST['startoffset']); -
mythplugins/mythweb/modules/tv/schedules_custom.php
85 85 $schedule->maxnewest = $_POST['maxnewest'] ? 1 : 0; 86 86 $schedule->dupin = _or($_POST['dupin'] + $_POST['dupin2'], dupsin_all); 87 87 $schedule->dupmethod = _or($_POST['dupmethod'], 6); 88 $schedule->seasonlimit = intval($_POST['seasonlimit']); 88 89 $schedule->recpriority = intval($_POST['recpriority']); 89 90 $schedule->maxepisodes = intval($_POST['maxepisodes']); 90 91 $schedule->startoffset = intval($_POST['startoffset']); -
mythplugins/mythweb/modules/tv/schedules_manual.php
70 70 $schedule->maxnewest = $_POST['maxnewest'] ? 1 : 0; 71 71 $schedule->dupin = _or($_POST['dupin'] + $_POST['dupin2'], dupsin_all); 72 72 $schedule->dupmethod = _or($_POST['dupmethod'], 6); 73 $schedule->seasonlimit = intval($_POST['seasonlimit']); 73 74 $schedule->recpriority = intval($_POST['recpriority']); 74 75 $schedule->maxepisodes = intval($_POST['maxepisodes']); 75 76 $schedule->startoffset = intval($_POST['startoffset']); -
mythplugins/mythweb/modules/tv/classes/Schedule.php
35 35 var $storagegroup; 36 36 var $dupmethod; 37 37 var $dupin; 38 var $seasonlimit; 38 39 var $station; 39 40 var $seriesid; 40 41 var $programid; … … 204 205 $sh = $db->query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search, 205 206 title,subtitle,description,profile,recpriority,category, 206 207 maxnewest,inactive,maxepisodes,autoexpire,startoffset,endoffset, 207 recgroup,dupmethod,dupin,s tation,seriesid,programid,autocommflag,208 recgroup,dupmethod,dupin,seasonlimit,station,seriesid,programid,autocommflag, 208 209 findday,findtime,findid,autotranscode,parentid,transcoder, 209 210 autouserjob1,autouserjob2,autouserjob3,autouserjob4, 210 211 playgroup,storagegroup,prefinput, 211 212 next_record,last_record,last_delete) 212 213 VALUES (?,?,?, 213 214 FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?), 214 ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? )',215 ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', 215 216 _or($this->recordid, 0, true), 216 217 _or($this->type, 0, true), 217 218 $this->chanid, … … 235 236 _or($this->recgroup, 'Default' ), 236 237 _or($this->dupmethod, 0, true), 237 238 _or($this->dupin, 15, true), 239 _or($this->seasonlimit, 0, true), 238 240 _or($this->station, '' ), // callsign! 239 241 _or($this->seriesid, '' ), 240 242 _or($this->programid, '' ), -
mythplugins/mythweb/modules/tv/classes/Program.php
47 47 public $rectype; 48 48 public $dupin; 49 49 public $dupmethod; 50 public $seasonlimit; 50 51 public $recstartts; 51 52 public $recendts; 52 53 public $progflags; … … 152 153 $this->rectype = $data[20]; 153 154 $this->dupin = $data[21]; 154 155 $this->dupmethod = $data[22]; 155 $this->recstartts = $data[23]; # ACTUAL start time (also maps to recorded.starttime) 156 $this->recendts = $data[24]; # ACTUAL end time 157 $this->progflags = $data[25]; 158 $this->recgroup = $data[26]; 159 $this->outputfilters = $data[27]; 160 $this->seriesid = $data[28]; 161 $this->programid = $data[29]; 156 $this->seasonlimit = $data[23]; 157 $this->recstartts = $data[24]; # ACTUAL start time (also maps to recorded.starttime) 158 $this->recendts = $data[25]; # ACTUAL end time 159 $this->progflags = $data[26]; 160 $this->recgroup = $data[27]; 161 $this->outputfilters = $data[28]; 162 $this->seriesid = $data[29]; 163 $this->programid = $data[30]; 162 164 163 $this->lastmodified = $data[3 0];164 $this->stars = $data[3 1];165 $this->airdate = $data[3 2];166 $this->playgroup = $data[3 3];167 $this->recpriority2 = $data[3 4];168 $this->parentid = $data[3 5];169 $this->storagegroup = $data[3 6];170 $this->audioproperties = $data[3 7];171 $this->videoproperties = $data[3 8];172 $this->subtitletype = $data[ 39];173 $this->year = $data[4 0];165 $this->lastmodified = $data[31]; 166 $this->stars = $data[32]; 167 $this->airdate = $data[33]; 168 $this->playgroup = $data[34]; 169 $this->recpriority2 = $data[35]; 170 $this->parentid = $data[36]; 171 $this->storagegroup = $data[37]; 172 $this->audioproperties = $data[38]; 173 $this->videoproperties = $data[39]; 174 $this->subtitletype = $data[40]; 175 $this->year = $data[41]; 174 176 // Is this a previously-recorded program? 175 177 if (!empty($this->filename)) { 176 178 $this->url = video_url($this); // get download info … … 418 420 $this->rectype , // 20 rectype 419 421 $this->dupin , // 21 dupin 420 422 $this->dupmethod , // 22 dupmethod 421 $this->recstartts , // 23 recstartts 422 $this->recendts , // 24 recendts 423 $this->progflags , // 25 programflags 424 $this->recgroup , // 26 recgroup 425 $this->outputfilters , // 27 chanOutputFilters 426 $this->seriesid , // 28 seriesid 427 $this->programid , // 29 programid 423 $this->seasonlimit , // 23 seasonlimit 424 $this->recstartts , // 24 recstartts 425 $this->recendts , // 25 recendts 426 $this->progflags , // 26 programflags 427 $this->recgroup , // 27 recgroup 428 $this->outputfilters , // 28 chanOutputFilters 429 $this->seriesid , // 29 seriesid 430 $this->programid , // 30 programid 428 431 429 $this->lastmodified , // 3 0lastmodified430 $this->stars , // 3 1stars431 $this->airdate , // 3 2originalAirDate432 $this->playgroup , // 3 3playgroup433 $this->recpriority2 , // 3 4recpriority2434 $this->parentid , // 3 5parentid435 $this->storagegroup , // 3 6storagegroup436 $this->audioproperties, // 3 7audioprop437 $this->videoproperties, // 3 8videoprop438 $this->subtitletype, // 39subtitletype439 $this->year, // 4 0year432 $this->lastmodified , // 31 lastmodified 433 $this->stars , // 32 stars 434 $this->airdate , // 33 originalAirDate 435 $this->playgroup , // 34 playgroup 436 $this->recpriority2 , // 35 recpriority2 437 $this->parentid , // 36 parentid 438 $this->storagegroup , // 37 storagegroup 439 $this->audioproperties, // 38 audioprop 440 $this->videoproperties, // 39 videoprop 441 $this->subtitletype, // 40 subtitletype 442 $this->year, // 41 year 440 443 ) 441 444 ); 442 445 } -
mythplugins/mythweb/modules/tv/tmpl/default/_advanced_options.php
130 130 echo ' SELECTED'; 131 131 echo '>' . t('Exclude Repeat and Generic Episodes') . '</option>'; 132 132 ?></select></dd> 133 <dt><?php echo t('Season Limit'); ?>:</dt> 134 <dd><select name="seasonlimit"> 135 <?php 136 echo '<option value="0"'; 137 if ($schedule->seasonlimit == 0) echo ' selected'; 138 echo '>' . t('Any Season') . '</option>'; 139 for ($i = 1; $i <= 25; $i++) { 140 echo '<option value="' . $i . '"'; 141 if ($schedule->seasonlimit == $i) echo ' selected'; 142 echo '>' . t('Season') . ' ' . $i . '</option>'; 143 } 144 ?> 145 </select> 146 </dd> 133 147 <dt><?php echo t('Preferred Input') ?>:</dt> 134 148 <dd><?php input_select($schedule->prefinput, 'prefinput') ?></dd> 135 149 <dt><label for="autocommflag"><?php echo t('Auto-flag commercials') ?>:</label></dt> -
mythplugins/mythweb/modules/tv/tmpl/lite/detail.php
418 418 echo ' SELECTED'; 419 419 echo '>'.t('Subtitle then Description').'</option>'; 420 420 ?></select></dd> 421 <dt><?php echo t('Season Limit'); ?>:</dt> 422 <dd><select name="seasonlimit"> 423 <?php 424 echo '<option value="0"'; 425 if ($schedule->seasonlimit == 0) echo ' selected'; 426 echo '>' . t('Any Season') . '</option>'; 427 for ($i = 1; $i <= 25; $i++) { 428 echo '<option value="' . $i . '"'; 429 if ($schedule->seasonlimit == $i) echo ' selected'; 430 echo '>' . t('Season') . ' ' . $i . '</option>'; 431 } 432 ?> 433 </select> 434 </dd> 421 435 <dt><?php echo t('Preferred Input') ?>:</dt> 422 436 <dd><?php input_select($schedule->prefinput, 'prefinput') ?></dd> 423 437 <dt><label for="autocommflag"><?php echo t('Auto-flag commercials') ?>:</label></dt> -
mythplugins/mythweb/modules/tv/tmpl/lite/schedules_custom.php
200 200 echo ' SELECTED'; 201 201 echo '>'.t('Subtitle then Description').'</option>'; 202 202 ?></select></dd> 203 <dt><?php echo t('Season Limit'); ?>:</dt> 204 <dd><select name="seasonlimit"> 205 <?php 206 echo '<option value="0"'; 207 if ($schedule->seasonlimit == 0) echo ' selected'; 208 echo '>' . t('Any Season') . '</option>'; 209 for ($i = 1; $i <= 25; $i++) { 210 echo '<option value="' . $i . '"'; 211 if ($schedule->seasonlimit == $i) echo ' selected'; 212 echo '>' . t('Season') . ' ' . $i . '</option>'; 213 } 214 ?> 215 </select> 216 </dd> 203 217 <dt><?php echo t('Auto-flag commercials') ?>:</dt> 204 218 <dd><input type="checkbox" class="radio" name="autocommflag"<?php if ($schedule->autocommflag) echo ' CHECKED' ?> value="1" /></dd> 205 219 <dt><?php echo t('Auto-transcode') ?>:</dt> -
mythplugins/mythweb/modules/tv/tmpl/lite/schedules_manual.php
157 157 echo ' SELECTED'; 158 158 echo '>'.t('Subtitle then Description').'</option>'; 159 159 ?></select></dd> 160 <dt><?php echo t('Season Limit'); ?>:</dt> 161 <dd><select name="seasonlimit"> 162 <?php 163 echo '<option value="0"'; 164 if ($schedule->seasonlimit == 0) echo ' selected'; 165 echo '>' . t('Any Season') . '</option>'; 166 for ($i = 1; $i <= 25; $i++) { 167 echo '<option value="' . $i . '"'; 168 if ($schedule->seasonlimit == $i) echo ' selected'; 169 echo '>' . t('Season') . ' ' . $i . '</option>'; 170 } 171 ?> 172 </select> 173 </dd> 160 174 <dt><?php echo t('Auto-flag commercials') ?>:</dt> 161 175 <dd><input type="checkbox" class="radio" name="autocommflag"<?php if ($schedule->autocommflag) echo ' CHECKED' ?> value="1" /></dd> 162 176 <dt><?php echo t('Auto-transcode') ?>:</dt> -
mythplugins/mythweb/modules/_shared/lang/English_GB.lang
84 84 "Any Channel" 85 85 "Any Program Type" 86 86 Any Programme Type 87 "Any Season" 87 88 "Append" 88 89 "Append to Current Playlist" 89 90 "Are you sure you want to delete the following show?" … … 747 748 "Searches" 748 749 "Searches will be performed against the title of all TV shows" 749 750 "Season" 751 "Season Limit" 750 752 "Series ID" 751 753 "Server Statistics" 752 754 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/Spanish.lang
149 149 Cualquier Canal 150 150 "Any Program Type" 151 151 Cualquier Tipo de Programa 152 "Any Season" 152 153 "Append" 153 154 Agregar 154 155 "Append to Current Playlist" … … 1028 1029 Búsquedas 1029 1030 "Searches will be performed against the title of all TV shows" 1030 1031 "Season" 1032 "Season Limit" 1031 1033 "Series ID" 1032 1034 "Server Statistics" 1033 1035 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/Swedish.lang
153 153 Alla kanaler 154 154 "Any Program Type" 155 155 Alla programtyper 156 "Any Season" 156 157 "Append" 157 158 LÀgg till slutet 158 159 "Append to Current Playlist" … … 1223 1224 Sökningar 1224 1225 "Searches will be performed against the title of all TV shows" 1225 1226 "Season" 1227 "Season Limit" 1226 1228 "Series ID" 1227 1229 Serie ID 1228 1230 "Server Statistics" -
mythplugins/mythweb/modules/_shared/lang/Dutch.lang
112 112 Alle zenders 113 113 "Any Program Type" 114 114 Alle programmatypes 115 "Any Season" 115 116 "Append" 116 117 "Append to Current Playlist" 117 118 "Are you sure you want to delete the following show?" … … 919 920 Zoekopdrachten 920 921 "Searches will be performed against the title of all TV shows" 921 922 "Season" 923 "Season Limit" 922 924 "Series ID" 923 925 "Server Statistics" 924 926 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/French_CA.lang
162 162 Toute chaîne 163 163 "Any Program Type" 164 164 Tout type d'émission 165 "Any Season" 165 166 "Append" 166 167 Ajouter 167 168 "Append to Current Playlist" … … 1306 1307 Les recherches seront effectuées sur le titre de toutes les émissions TV 1307 1308 "Season" 1308 1309 Saison 1310 "Season Limit" 1309 1311 "Series ID" 1310 1312 Identifiant de la série 1311 1313 "Server Statistics" -
mythplugins/mythweb/modules/_shared/lang/Catalan.lang
119 119 Qualsevol canal 120 120 "Any Program Type" 121 121 Qualsevol tipus de programa 122 "Any Season" 122 123 "Append" 123 124 "Append to Current Playlist" 124 125 "Are you sure you want to delete the following show?" … … 957 958 Recerques 958 959 "Searches will be performed against the title of all TV shows" 959 960 "Season" 961 "Season Limit" 960 962 "Series ID" 961 963 "Server Statistics" 962 964 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/French.lang
162 162 Toute chaîne 163 163 "Any Program Type" 164 164 Tout type de programme 165 "Any Season" 165 166 "Append" 166 167 Ajouter 167 168 "Append to Current Playlist" … … 1306 1307 Les recherches seront effectuées sur le titre de tous les programmes TV 1307 1308 "Season" 1308 1309 Saison 1310 "Season Limit" 1309 1311 "Series ID" 1310 1312 Identifiant de la série 1311 1313 "Server Statistics" -
mythplugins/mythweb/modules/_shared/lang/Danish.lang
161 161 Alle kanaler 162 162 "Any Program Type" 163 163 Alle program typer 164 "Any Season" 164 165 "Append" 165 166 TilfÞj 166 167 "Append to Current Playlist" … … 1295 1296 SÞgningen vil gennemgÃ¥ alle titler pÃ¥ alle udsendelser 1296 1297 "Season" 1297 1298 SÊson 1299 "Season Limit" 1298 1300 "Series ID" 1299 1301 Serie ID 1300 1302 "Server Statistics" -
mythplugins/mythweb/modules/_shared/lang/German.lang
154 154 Jeder Sender 155 155 "Any Program Type" 156 156 Jeder Programmtyp 157 "Any Season" 157 158 "Append" 158 159 HinzufÃŒgen 159 160 "Append to Current Playlist" … … 1229 1230 "Searches will be performed against the title of all TV shows" 1230 1231 "Season" 1231 1232 Staffel 1233 "Season Limit" 1232 1234 "Series ID" 1233 1235 Serien-ID 1234 1236 "Server Statistics" -
mythplugins/mythweb/modules/_shared/lang/Hungarian.lang
153 153 Bármely csatorna 154 154 "Any Program Type" 155 155 Bármely program tipus 156 "Any Season" 156 157 "Append" 157 158 Hozzáfűz 158 159 "Append to Current Playlist" … … 1227 1228 KeresÅprofilok 1228 1229 "Searches will be performed against the title of all TV shows" 1229 1230 "Season" 1231 "Season Limit" 1230 1232 "Series ID" 1231 1233 Sorozat ID 1232 1234 "Server Statistics" -
mythplugins/mythweb/modules/_shared/lang/Japanese.lang
112 112 ããããã®ãã£ã³ãã« 113 113 "Any Program Type" 114 114 ããããã®ã¿ã€ã 115 "Any Season" 115 116 "Append" 116 117 "Append to Current Playlist" 117 118 "Are you sure you want to delete the following show?" … … 930 931 ãµãŒãã¡ãã¥ãŒ 931 932 "Searches will be performed against the title of all TV shows" 932 933 "Season" 934 "Season Limit" 933 935 "Series ID" 934 936 "Server Statistics" 935 937 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/English.lang
83 83 "Any Category" 84 84 "Any Channel" 85 85 "Any Program Type" 86 "Any Season" 86 87 "Append" 87 88 "Append to Current Playlist" 88 89 "Are you sure you want to delete the following show?" … … 742 743 "Searches" 743 744 "Searches will be performed against the title of all TV shows" 744 745 "Season" 746 "Season Limit" 745 747 "Series ID" 746 748 "Server Statistics" 747 749 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/Czech.lang
157 157 JakÃœkoli kanál 158 158 "Any Program Type" 159 159 JakÃœkoli typ programu 160 "Any Season" 160 161 "Append" 161 162 PÅipojit 162 163 "Append to Current Playlist" … … 1063 1064 Vyhledávánà 1064 1065 "Searches will be performed against the title of all TV shows" 1065 1066 "Season" 1067 "Season Limit" 1066 1068 "Series ID" 1067 1069 "Server Statistics" 1068 1070 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/Slovenian.lang
144 144 Katerikoli kanal 145 145 "Any Program Type" 146 146 Katerikoli tip programa 147 "Any Season" 147 148 "Append" 148 149 Dodaj 149 150 "Append to Current Playlist" … … 1170 1171 Iskanja 1171 1172 "Searches will be performed against the title of all TV shows" 1172 1173 "Season" 1174 "Season Limit" 1173 1175 "Series ID" 1174 1176 "Server Statistics" 1175 1177 Stratistike streÅŸnika -
mythplugins/mythweb/modules/_shared/lang/Polish.lang
106 106 Dowolny kanaÅ 107 107 "Any Program Type" 108 108 Dowolny typ programu 109 "Any Season" 109 110 "Append" 110 111 "Append to Current Playlist" 111 112 "Are you sure you want to delete the following show?" … … 839 840 Poszukiwania 840 841 "Searches will be performed against the title of all TV shows" 841 842 "Season" 843 "Season Limit" 842 844 "Series ID" 843 845 "Server Statistics" 844 846 "Set Host" -
mythplugins/mythweb/modules/_shared/lang/Finnish.lang
150 150 MikÀ tahansa kanava 151 151 "Any Program Type" 152 152 MikÀ tahansa ohjelmatyyppi 153 "Any Season" 153 154 "Append" 154 155 Kiinnitys 155 156 "Append to Current Playlist" … … 1207 1208 Haut 1208 1209 "Searches will be performed against the title of all TV shows" 1209 1210 "Season" 1211 "Season Limit" 1210 1212 "Series ID" 1211 1213 "Server Statistics" 1212 1214 Serverin statistiikkaa -
mythplugins/mythweb/classes/MythBackend.php
23 23 // NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is 24 24 // the number of items in a ProgramInfo QStringList group used by 25 25 // ProgramInfo::ToSringList and ProgramInfo::FromStringList. 26 static $program_line_number = 4 1;26 static $program_line_number = 42; 27 27 28 28 private $fp = null; 29 29 private $connected = false; -
mythplugins/mythweb/classes/MythTVProgram.php
28 28 public $rectype; 29 29 public $dupin; 30 30 public $dupmethod; 31 public $seasonlimit; 31 32 public $recstartts; 32 33 public $recendts; 33 34 public $progflags; -
myththemes/Childish/schedule-ui.xml
1655 1655 <helptext></helptext> 1656 1656 </buttonlist> 1657 1657 1658 <buttonlist name="season" from="basewideselector"> 1659 <position>215,495</position> 1660 <helptext></helptext> 1661 </buttonlist> 1662 1658 1663 <checkbox name="ruleactive" from="basecheckbox"> 1659 <position>215, 495</position>1664 <position>215,538</position> 1660 1665 </checkbox> 1661 1666 1662 1667 <textarea name="ruleactivelabel" from="basetextarea"> 1663 <area>260, 495,300,30</area>1668 <area>260,538,300,30</area> 1664 1669 <value>Recording Rule Active</value> 1665 1670 </textarea> 1666 1671 1667 1672 <button name="back" from="basesmallbutton"> 1668 <position> 320,520</position>1673 <position>470,524</position> 1669 1674 <value>Back</value> 1670 1675 </button> 1671 1676 -
myththemes/Arclight/schedule-ui.xml
1881 1881 <position>1396,684</position> 1882 1882 </spinbox> 1883 1883 1884 <textarea name="season_label" from="basetextarea"> 1885 <area>1140,752,250,30</area> 1886 <align>right,vcenter</align> 1887 <font>basesmall</font> 1888 <value>Season Limit:</value> 1889 </textarea> 1890 1891 <spinbox name="season" from="basewidespinbox"> 1892 <position>1396,744</position> 1893 </spinbox> 1894 1884 1895 <checkbox name="ruleactive" from="basecheckbox"> 1885 <position>1426, 794</position>1896 <position>1426,804</position> 1886 1897 </checkbox> 1887 1898 1888 1899 <textarea name="ruleactive_label" from="basetextarea"> 1889 <area>1473, 798,450,30</area>1900 <area>1473,808,450,30</area> 1890 1901 <align>left,vcenter</align> 1891 1902 <font>basesmall</font> 1892 1903 <value>Recording Rule is Active</value> -
myththemes/Mythbuntu/schedule-ui.xml
1809 1809 </textarea> 1810 1810 1811 1811 <spinbox name="priority" from="basewidespinbox"> 1812 <position>377, 310</position>1812 <position>377,290</position> 1813 1813 <template type="negative">Reduce priority by %n</template> 1814 1814 <template type="zero">Normal recording priority</template> 1815 1815 <template type="positive">Raise priority by %n</template> … … 1817 1817 </spinbox> 1818 1818 1819 1819 <buttonlist name="input" from="basewideselector"> 1820 <position>377,3 55</position>1820 <position>377,335</position> 1821 1821 <helptext></helptext> 1822 1822 </buttonlist> 1823 1823 1824 1824 <spinbox name="startoffset" from="basewidespinbox"> 1825 <position>377, 400</position>1825 <position>377,380</position> 1826 1826 <template type="negative">Start recording %n minute(s) late</template> 1827 1827 <template type="zero">Start recording on time</template> 1828 1828 <template type="positive">Start recording %n minute(s) early</template> … … 1830 1830 </spinbox> 1831 1831 1832 1832 <spinbox name="endoffset" from="basewidespinbox"> 1833 <position>377,4 45</position>1833 <position>377,425</position> 1834 1834 <template type="negative">End recording %n minute(s) early</template> 1835 1835 <template type="zero">End recording on time</template> 1836 1836 <template type="positive">End recording %n minute(s) late</template> … … 1838 1838 </spinbox> 1839 1839 1840 1840 <buttonlist name="dupmethod" from="basewideselector"> 1841 <position>377,4 90</position>1841 <position>377,470</position> 1842 1842 <helptext></helptext> 1843 1843 </buttonlist> 1844 1844 1845 1845 <buttonlist name="dupscope" from="basewideselector"> 1846 <position>377,5 35</position>1846 <position>377,515</position> 1847 1847 <helptext></helptext> 1848 1848 </buttonlist> 1849 1849 1850 <buttonlist name="season" from="basewideselector"> 1851 <position>377,560</position> 1852 <helptext></helptext> 1853 </buttonlist> 1854 1850 1855 <checkbox name="ruleactive" from="basecheckbox"> 1851 <position>500, 597</position>1856 <position>500,607</position> 1852 1857 </checkbox> 1853 1858 1854 1859 <textarea name="ruleactivelabel" from="basetextarea"> 1855 <area>550, 592,300,30</area>1860 <area>550,602,300,30</area> 1856 1861 <value>Recording Rule Active</value> 1857 1862 </textarea> 1858 1863 -
myththemes/Graphite/schedule-ui.xml
1839 1839 <helptext></helptext> 1840 1840 </spinbox> 1841 1841 1842 <textarea name="season_limit" from="basetextarea"> 1843 <area>20,443,180,30</area> 1844 <align>right,vcenter</align> 1845 <value>Season Limit:</value> 1846 </textarea> 1847 1848 <buttonlist name="season" from="basewideselector"> 1849 <position>215,439</position> 1850 <helptext></helptext> 1851 </buttonlist> 1852 1842 1853 <textarea name="endoff" from="basetextarea"> 1843 1854 <area>655,309,180,30</area> 1844 1855 <align>right,vcenter</align> … … 1876 1887 </buttonlist> 1877 1888 1878 1889 <checkbox name="ruleactive" from="basecheckbox"> 1879 <position> 482,440</position>1890 <position>364,488</position> 1880 1891 </checkbox> 1881 1892 1882 1893 <textarea name="ruleactivelabel" from="basetextarea"> 1883 <area> 517,442,300,30</area>1894 <area>396,490,300,30</area> 1884 1895 <value>Recording Rule Active</value> 1885 1896 </textarea> 1886 1897 1887 1898 <button name="back" from="basebutton"> 1888 <position> 565,480</position>1899 <position>700,486</position> 1889 1900 <value>Back</value> 1890 1901 </button> 1891 1902 </window> -
mythtv/themes/MythCenter/schedule-ui.xml
1784 1784 <helptext></helptext> 1785 1785 </buttonlist> 1786 1786 1787 <buttonlist name="season" from="basewideselector"> 1788 <position>215,480</position> 1789 <helptext></helptext> 1790 </buttonlist> 1791 1787 1792 <checkbox name="ruleactive" from="basecheckbox"> 1788 <position>215, 480</position>1793 <position>215,524</position> 1789 1794 </checkbox> 1790 1795 1791 1796 <textarea name="ruleactivelabel" from="basetextarea"> 1792 <area>260, 487,300,30</area>1797 <area>260,530,300,30</area> 1793 1798 <value>Recording Rule Active</value> 1794 1799 </textarea> 1795 1800 -
mythtv/themes/default/schedule-ui.xml
1686 1686 <multiline>yes</multiline> 1687 1687 <template>%|"SUBTITLE|"% %LONGREPEAT%%STARS| %%DESCRIPTION%</template> 1688 1688 </textarea> 1689 1689 1690 <spinbox name="priority" from="basewidespinbox"> 1690 <position>215,2 10</position>1691 <position>215,205</position> 1691 1692 <template type="negative">Reduce priority by %n</template> 1692 1693 <template type="zero">Normal recording priority</template> 1693 1694 <template type="positive">Raise priority by %n</template> … … 1695 1696 </spinbox> 1696 1697 1697 1698 <buttonlist name="input" from="basewideselector"> 1698 <position>215,25 5</position>1699 <position>215,250</position> 1699 1700 <helptext></helptext> 1700 1701 </buttonlist> 1701 1702 1702 1703 <spinbox name="startoffset" from="basewidespinbox"> 1703 <position>215, 300</position>1704 <position>215,295</position> 1704 1705 <template type="negative">Start recording %n minute(s) late</template> 1705 1706 <template type="zero">Start recording on time</template> 1706 1707 <template type="positive">Start recording %n minute(s) early</template> … … 1708 1709 </spinbox> 1709 1710 1710 1711 <spinbox name="endoffset" from="basewidespinbox"> 1711 <position>215,34 5</position>1712 <position>215,340</position> 1712 1713 <template type="negative">End recording %n minute(s) early</template> 1713 1714 <template type="zero">End recording on time</template> 1714 1715 <template type="positive">End recording %n minute(s) late</template> … … 1716 1717 </spinbox> 1717 1718 1718 1719 <buttonlist name="dupmethod" from="basewideselector"> 1719 <position>215,3 90</position>1720 <position>215,385</position> 1720 1721 <helptext></helptext> 1721 1722 </buttonlist> 1722 1723 1723 1724 <buttonlist name="dupscope" from="basewideselector"> 1724 <position>215,43 5</position>1725 <position>215,430</position> 1725 1726 <helptext></helptext> 1726 1727 </buttonlist> 1727 1728 1729 <buttonlist name="season" from="basewideselector"> 1730 <position>215,475</position> 1731 <helptext></helptext> 1732 </buttonlist> 1733 1728 1734 <checkbox name="ruleactive" from="basecheckbox"> 1729 <position>215, 480</position>1735 <position>215,520</position> 1730 1736 </checkbox> 1731 1737 1732 1738 <textarea name="ruleactivelabel" from="basetextarea"> 1733 <area>260, 487,300,30</area>1739 <area>260,527,300,30</area> 1734 1740 <value>Recording Rule Active</value> 1735 1741 </textarea> 1736 1742 1737 1743 <button name="back" from="basebutton"> 1738 <position>40,5 25</position>1744 <position>40,550</position> 1739 1745 <value>Back</value> 1740 1746 </button> 1741 1747 </window> -
mythtv/themes/MythCenter-wide/schedule-ui.xml
1854 1854 <helptext></helptext> 1855 1855 </buttonlist> 1856 1856 1857 <buttonlist name="season" from="basewideselector"> 1858 <position>454,578</position> 1859 <helptext></helptext> 1860 </buttonlist> 1861 1857 1862 <checkbox name="ruleactive" from="basecheckbox"> 1858 <position>45 4,580</position>1863 <position>450,630</position> 1859 1864 </checkbox> 1860 1865 1861 1866 <textarea name="ruleactivelabel" from="basetextarea"> 1862 <area> 500,582,300,30</area>1867 <area>495,632,300,30</area> 1863 1868 <value>Recording Rule Active</value> 1864 1869 </textarea> 1865 1870 1866 1871 <button name="back" from="basebutton"> 1867 <position> 590,644</position>1872 <position>805,628</position> 1868 1873 <value>Back</value> 1869 1874 </button> 1870 1875 </window> -
mythtv/themes/default-wide/schedule-ui.xml
1762 1762 </textarea> 1763 1763 1764 1764 <spinbox name="priority" from="basewidespinbox"> 1765 <position>455,3 10</position>1765 <position>455,305</position> 1766 1766 <template type="negative">Reduce priority by %n</template> 1767 1767 <template type="zero">Normal recording priority</template> 1768 1768 <template type="positive">Raise priority by %n</template> … … 1770 1770 </spinbox> 1771 1771 1772 1772 <buttonlist name="input" from="basewideselector"> 1773 <position>455,35 5</position>1773 <position>455,350</position> 1774 1774 <helptext></helptext> 1775 1775 </buttonlist> 1776 1776 1777 1777 <spinbox name="startoffset" from="basewidespinbox"> 1778 <position>455, 400</position>1778 <position>455,395</position> 1779 1779 <template type="negative">Start recording %n minute(s) late</template> 1780 1780 <template type="zero">Start recording on time</template> 1781 1781 <template type="positive">Start recording %n minute(s) early</template> … … 1783 1783 </spinbox> 1784 1784 1785 1785 <spinbox name="endoffset" from="basewidespinbox"> 1786 <position>455,44 5</position>1786 <position>455,440</position> 1787 1787 <template type="negative">End recording %n minute(s) early</template> 1788 1788 <template type="zero">End recording on time</template> 1789 1789 <template type="positive">End recording %n minute(s) late</template> … … 1791 1791 </spinbox> 1792 1792 1793 1793 <buttonlist name="dupmethod" from="basewideselector"> 1794 <position>455,4 90</position>1794 <position>455,485</position> 1795 1795 <helptext></helptext> 1796 1796 </buttonlist> 1797 1797 1798 1798 <buttonlist name="dupscope" from="basewideselector"> 1799 <position>455,53 5</position>1799 <position>455,530</position> 1800 1800 <helptext></helptext> 1801 1801 </buttonlist> 1802 1802 1803 <buttonlist name="season" from="basewideselector"> 1804 <position>455,575</position> 1805 <helptext></helptext> 1806 </buttonlist> 1807 1803 1808 <checkbox name="ruleactive" from="basecheckbox"> 1804 <position>455, 580</position>1809 <position>455,618</position> 1805 1810 </checkbox> 1806 1811 1807 1812 <textarea name="ruleactivelabel" from="basetextarea"> 1808 <area>500, 583,300,30</area>1813 <area>500,621,300,30</area> 1809 1814 <value>Recording Rule Active</value> 1810 1815 </textarea> 1811 1816 -
mythtv/themes/Terra/schedule-ui.xml
1549 1549 </textarea> 1550 1550 1551 1551 <spinbox name="priority" from="basewidespinbox"> 1552 <position>40,1 60</position>1552 <position>40,100</position> 1553 1553 <template type="negative">Reduce priority by %n</template> 1554 1554 <template type="zero">Normal recording priority</template> 1555 1555 <template type="positive">Raise priority by %n</template> … … 1557 1557 </spinbox> 1558 1558 1559 1559 <buttonlist name="input" from="basewideselector"> 1560 <position>40, 220</position>1560 <position>40,160</position> 1561 1561 <helptext></helptext> 1562 1562 </buttonlist> 1563 1563 1564 1564 <spinbox name="startoffset" from="basewidespinbox"> 1565 <position>40,2 80</position>1565 <position>40,220</position> 1566 1566 <template type="negative">Start recording %n minute(s) late</template> 1567 1567 <template type="zero">Start recording on time</template> 1568 1568 <template type="positive">Start recording %n minute(s) early</template> … … 1570 1570 </spinbox> 1571 1571 1572 1572 <spinbox name="endoffset" from="basewidespinbox"> 1573 <position>40, 340</position>1573 <position>40,280</position> 1574 1574 <template type="negative">End recording %n minute(s) early</template> 1575 1575 <template type="zero">End recording on time</template> 1576 1576 <template type="positive">End recording %n minute(s) late</template> … … 1578 1578 </spinbox> 1579 1579 1580 1580 <buttonlist name="dupmethod" from="basewideselector"> 1581 <position>40, 400</position>1581 <position>40,340</position> 1582 1582 <helptext></helptext> 1583 1583 </buttonlist> 1584 1584 1585 1585 <buttonlist name="dupscope" from="basewideselector"> 1586 <position>40,4 60</position>1586 <position>40,400</position> 1587 1587 <helptext></helptext> 1588 1588 </buttonlist> 1589 1589 1590 <buttonlist name="season" from="basewideselector"> 1591 <position>40,460</position> 1592 <helptext></helptext> 1593 </buttonlist> 1594 1590 1595 <checkbox name="ruleactive" from="basecheckbox"> 1591 1596 <position>154,520</position> 1592 1597 </checkbox> -
mythtv/libs/libmythtv/dbcheck.cpp
20 20 mythtv/bindings/python/MythTV/MythStatic.py 21 21 */ 22 22 /// This is the DB schema version expected by the running MythTV instance. 23 const QString currentDatabaseVersion = "12 59";23 const QString currentDatabaseVersion = "1260"; 24 24 25 25 static bool UpdateDBVersionNumber(const QString &newnumber); 26 26 static bool performActualUpdate( … … 5340 5340 5341 5341 dbver = "1259"; 5342 5342 } 5343 5344 if (dbver == "1259") 5345 { 5346 const char *updates[] = { 5347 "ALTER TABLE record ADD COLUMN seasonlimit TINYINT(3) UNSIGNED " 5348 "DEFAULT 0 NOT NULL AFTER dupin;", 5349 NULL 5350 }; 5351 if (!performActualUpdate(updates, "1260", dbver)) { 5352 return false; 5353 } 5343 5354 5355 dbver = "1260"; 5356 } 5357 5344 5358 return true; 5345 5359 } 5346 5360 -
mythtv/libs/libmythtv/recordinginfo.h
95 95 RecordingType rectype, 96 96 RecordingDupInType dupin, 97 97 RecordingDupMethodType dupmethod, 98 int seasonlimit, 98 99 99 100 uint sourceid, 100 101 uint inputid, … … 138 139 RecordingType rectype, 139 140 RecordingDupInType dupin, 140 141 RecordingDupMethodType dupmethod, 142 int seasonlimit, 141 143 142 144 uint findid); 143 145 -
mythtv/libs/libmythtv/recordingrule.h
86 86 int m_prefInput; 87 87 int m_startOffset; 88 88 int m_endOffset; 89 int m_seasonLimit; 89 90 RecordingDupMethodType m_dupMethod; 90 91 RecordingDupInType m_dupIn; 91 92 -
mythtv/libs/libmythtv/recordingrule.cpp
31 31 m_dupMethod(static_cast<RecordingDupMethodType>( 32 32 gCoreContext->GetNumSetting("prefDupMethod", kDupCheckSubDesc))), 33 33 m_dupIn(kDupsInAll), 34 m_seasonLimit(0), 34 35 m_recProfile(QObject::tr("Default")), 35 36 m_recGroup("Default"), 36 37 m_storageGroup("Default"), … … 66 67 MSqlQuery query(MSqlQuery::InitCon()); 67 68 query.prepare("SELECT type, search, " 68 69 "recpriority, prefinput, startoffset, endoffset, dupmethod, dupin, " 69 "inactive, profile, recgroup, storagegroup, playgroup, autoexpire, " 70 "seasonlimit, inactive, " 71 "profile, recgroup, storagegroup, playgroup, autoexpire, " 70 72 "maxepisodes, maxnewest, autocommflag, autotranscode, transcoder, " 71 73 "autouserjob1, autouserjob2, autouserjob3, autouserjob4, " 72 74 "parentid, title, subtitle, description, category, " … … 95 97 m_dupMethod = static_cast<RecordingDupMethodType> 96 98 (query.value(6).toInt()); 97 99 m_dupIn = static_cast<RecordingDupInType>(query.value(7).toInt()); 98 m_isInactive = query.value(8).toBool(); 100 m_seasonLimit = query.value(8).toInt(); 101 m_isInactive = query.value(9).toBool(); 99 102 // Storage 100 m_recProfile = query.value( 9).toString();101 m_recGroup = query.value(1 0).toString();102 m_storageGroup = query.value(1 1).toString();103 m_playGroup = query.value(1 2).toString();104 m_autoExpire = query.value(1 3).toBool();105 m_maxEpisodes = query.value(1 4).toInt();106 m_maxNewest = query.value(1 5).toBool();103 m_recProfile = query.value(10).toString(); 104 m_recGroup = query.value(11).toString(); 105 m_storageGroup = query.value(12).toString(); 106 m_playGroup = query.value(13).toString(); 107 m_autoExpire = query.value(14).toBool(); 108 m_maxEpisodes = query.value(15).toInt(); 109 m_maxNewest = query.value(16).toBool(); 107 110 // Post Process 108 m_autoCommFlag = query.value(1 6).toBool();109 m_autoTranscode = query.value(1 7).toBool();110 m_transcoder = query.value(1 8).toInt();111 m_autoUserJob1 = query.value( 19).toBool();112 m_autoUserJob2 = query.value(2 0).toBool();113 m_autoUserJob3 = query.value(2 1).toBool();114 m_autoUserJob4 = query.value(2 2).toBool();111 m_autoCommFlag = query.value(17).toBool(); 112 m_autoTranscode = query.value(18).toBool(); 113 m_transcoder = query.value(19).toInt(); 114 m_autoUserJob1 = query.value(20).toBool(); 115 m_autoUserJob2 = query.value(21).toBool(); 116 m_autoUserJob3 = query.value(22).toBool(); 117 m_autoUserJob4 = query.value(23).toBool(); 115 118 // Original rule id for override rule 116 m_parentRecID = query.value(2 3).toInt();119 m_parentRecID = query.value(24).toInt(); 117 120 // Recording metadata 118 m_title = query.value(2 4).toString();119 m_subtitle = query.value(2 5).toString();120 m_description = query.value(2 6).toString();121 m_category = query.value(2 7).toString();122 m_starttime = query.value(2 8).toTime();123 m_startdate = query.value( 29).toDate();124 m_endtime = query.value(3 0).toTime();125 m_enddate = query.value(3 1).toDate();126 m_seriesid = query.value(3 2).toString();127 m_programid = query.value(3 3).toString();121 m_title = query.value(25).toString(); 122 m_subtitle = query.value(26).toString(); 123 m_description = query.value(27).toString(); 124 m_category = query.value(28).toString(); 125 m_starttime = query.value(29).toTime(); 126 m_startdate = query.value(30).toDate(); 127 m_endtime = query.value(31).toTime(); 128 m_enddate = query.value(32).toDate(); 129 m_seriesid = query.value(33).toString(); 130 m_programid = query.value(34).toString(); 128 131 // Associated data for rule types 129 m_channelid = query.value(3 4).toInt();130 m_station = query.value(3 5).toString();131 m_findday = query.value(3 6).toInt();132 m_findtime = query.value(3 7).toTime();133 m_findid = query.value(3 8).toInt();132 m_channelid = query.value(35).toInt(); 133 m_station = query.value(36).toString(); 134 m_findday = query.value(37).toInt(); 135 m_findtime = query.value(38).toTime(); 136 m_findid = query.value(39).toInt(); 134 137 // Statistic fields - Used to generate statistics about particular rules 135 138 // and influence watch list weighting 136 m_nextRecording = query.value( 39).toDateTime();137 m_lastRecorded = query.value(4 0).toDateTime();138 m_lastDeleted = query.value(4 1).toDateTime();139 m_averageDelay = query.value(4 2).toInt();139 m_nextRecording = query.value(40).toDateTime(); 140 m_lastRecorded = query.value(41).toDateTime(); 141 m_lastDeleted = query.value(42).toDateTime(); 142 m_averageDelay = query.value(43).toInt(); 140 143 141 144 m_isOverride = (m_type == kOverrideRecord || m_type == kDontRecord); 142 145 } … … 288 291 "recpriority = :RECPRIORITY, prefinput = :INPUT, " 289 292 "startoffset = :STARTOFFSET, endoffset = :ENDOFFSET, " 290 293 "dupmethod = :DUPMETHOD, dupin = :DUPIN, " 294 "seasonlimit = :SEASONLIMIT, " 291 295 "inactive = :INACTIVE, profile = :RECPROFILE, " 292 296 "recgroup = :RECGROUP, storagegroup = :STORAGEGROUP, " 293 297 "playgroup = :PLAYGROUP, autoexpire = :AUTOEXPIRE, " … … 326 330 query.bindValue(":ENDOFFSET", m_endOffset); 327 331 query.bindValue(":DUPMETHOD", m_dupMethod); 328 332 query.bindValue(":DUPIN", m_dupIn); 333 query.bindValue(":SEASONLIMIT", m_seasonLimit); 329 334 query.bindValue(":INACTIVE", m_isInactive); 330 335 query.bindValue(":RECPROFILE", m_recProfile); 331 336 query.bindValue(":RECGROUP", m_recGroup); -
mythtv/libs/libmythtv/recordinginfo.cpp
83 83 RecordingType _rectype, 84 84 RecordingDupInType _dupin, 85 85 RecordingDupMethodType _dupmethod, 86 int _seasonlimit, 86 87 87 88 uint _sourceid, 88 89 uint _inputid, … … 133 134 rectype = _rectype; 134 135 dupin = _dupin; 135 136 dupmethod = _dupmethod; 137 seasonlimit = _seasonlimit; 136 138 137 139 sourceid = _sourceid; 138 140 inputid = _inputid; … … 182 184 RecordingType _rectype, 183 185 RecordingDupInType _dupin, 184 186 RecordingDupMethodType _dupmethod, 187 int _seasonlimit, 185 188 186 189 uint _findid) : 187 190 ProgramInfo( … … 202 205 rectype = _rectype; 203 206 dupin = _dupin; 204 207 dupmethod = _dupmethod; 208 seasonlimit = _seasonlimit; 205 209 206 210 findid = _findid; 207 211 } -
mythtv/libs/libmyth/programinfo.h
25 25 mythtv/bindings/perl/MythTV/Program.pm 26 26 mythtv/bindings/python/MythTV/MythData.py 27 27 */ 28 #define NUMPROGRAMLINES 4 128 #define NUMPROGRAMLINES 42 29 29 30 30 class ProgramInfo; 31 31 typedef AutoDeleteDeque<ProgramInfo*> ProgramList; … … 118 118 119 119 RecordingDupInType dupin, 120 120 RecordingDupMethodType dupmethod, 121 int seasonlimit, 121 122 122 123 uint findid, 123 124 … … 651 652 uint8_t rectype; 652 653 uint8_t dupin; 653 654 uint8_t dupmethod; 655 int32_t seasonlimit; 654 656 655 657 // everything below this line is not serialized 656 658 uint8_t availableStatus; // only used for playbackbox.cpp -
mythtv/libs/libmyth/programinfo.cpp
60 60 " r.preserve, r.cutlist, r.autoexpire, "//33-35 61 61 " r.editing, r.bookmark, r.watched, "//36-38 62 62 " p.audioprop+0, p.videoprop+0, p.subtitletypes+0, "//39-41 63 " r.findid, rec.dupin, rec.dupmethod "//42-44 63 " r.findid, rec.dupin, rec.dupmethod, "//42-44 64 " rec.seasonlimit "//45 64 65 "FROM recorded AS r " 65 66 "LEFT JOIN channel AS c " 66 67 "ON (r.chanid = c.chanid) " … … 140 141 rectype(kNotRecording), 141 142 dupin(kDupsInAll), 142 143 dupmethod(kDupCheckSubDesc), 144 seasonlimit(0), 143 145 144 146 // everything below this line is not serialized 145 147 availableStatus(asAvailable), … … 214 216 rectype(other.rectype), 215 217 dupin(other.dupin), 216 218 dupmethod(other.dupmethod), 219 seasonlimit(other.seasonlimit), 217 220 218 221 // everything below this line is not serialized 219 222 availableStatus(other.availableStatus), … … 278 281 279 282 RecordingDupInType _dupin, 280 283 RecordingDupMethodType _dupmethod, 284 int _seasonlimit, 281 285 282 286 uint _findid, 283 287 … … 343 347 rectype(kNotRecording), 344 348 dupin(_dupin), 345 349 dupmethod(_dupmethod), 350 seasonlimit(_seasonlimit), 346 351 347 352 // everything below this line is not serialized 348 353 availableStatus(asAvailable), … … 446 451 rectype(_rectype), 447 452 dupin(kDupsInAll), 448 453 dupmethod(kDupCheckSubDesc), 454 seasonlimit(0), 449 455 450 456 // everything below this line is not serialized 451 457 availableStatus(asAvailable), … … 550 556 rectype(_rectype), 551 557 dupin(kDupsInAll), 552 558 dupmethod(kDupCheckSubDesc), 559 seasonlimit(0), 553 560 554 561 // everything below this line is not serialized 555 562 availableStatus(asAvailable), … … 584 591 inputid = s.inputid; 585 592 dupin = s.dupin; 586 593 dupmethod = s.dupmethod; 594 seasonlimit = s.seasonlimit; 587 595 findid = s.findid; 588 596 589 597 if (s.recstatus == rsWillRecord || s.recstatus == rsRecording) … … 683 691 rectype(kNotRecording), 684 692 dupin(kDupsInAll), 685 693 dupmethod(kDupCheckSubDesc), 694 seasonlimit(0), 686 695 687 696 // everything below this line is not serialized 688 697 availableStatus(asAvailable), … … 905 914 rectype = other.rectype; 906 915 dupin = other.dupin; 907 916 dupmethod = other.dupmethod; 917 seasonlimit = other.seasonlimit; 908 918 909 919 sourceid = other.sourceid; 910 920 inputid = other.inputid; … … 1004 1014 rectype = kNotRecording; 1005 1015 dupin = kDupsInAll; 1006 1016 dupmethod = kDupCheckSubDesc; 1017 seasonlimit = 0; 1007 1018 1008 1019 sourceid = 0; 1009 1020 inputid = 0; … … 1132 1143 INT_TO_LIST(rectype); // 20 1133 1144 INT_TO_LIST(dupin); // 21 1134 1145 INT_TO_LIST(dupmethod); // 22 1135 DATETIME_TO_LIST(recstartts);//23 1136 DATETIME_TO_LIST(recendts);// 24 1137 INT_TO_LIST(programflags); // 25 1138 STR_TO_LIST((!recgroup.isEmpty()) ? recgroup : "Default"); // 26 1139 STR_TO_LIST(chanplaybackfilters); // 27 1140 STR_TO_LIST(seriesid); // 28 1141 STR_TO_LIST(programid); // 29 1146 INT_TO_LIST(seasonlimit); //23 1147 DATETIME_TO_LIST(recstartts);//24 1148 DATETIME_TO_LIST(recendts);// 25 1149 INT_TO_LIST(programflags); // 26 1150 STR_TO_LIST((!recgroup.isEmpty()) ? recgroup : "Default"); // 27 1151 STR_TO_LIST(chanplaybackfilters); // 28 1152 STR_TO_LIST(seriesid); // 29 1153 STR_TO_LIST(programid); // 30 1142 1154 1143 DATETIME_TO_LIST(lastmodified); // 3 01144 FLOAT_TO_LIST(stars); // 3 11145 DATE_TO_LIST(originalAirDate); // 3 21146 STR_TO_LIST((!playgroup.isEmpty()) ? playgroup : "Default"); // 3 31147 INT_TO_LIST(recpriority2); // 3 41148 INT_TO_LIST(parentid); // 3 51149 STR_TO_LIST((!storagegroup.isEmpty()) ? storagegroup : "Default"); // 3 61150 INT_TO_LIST(GetAudioProperties()); // 3 71151 INT_TO_LIST(GetVideoProperties()); // 3 81152 INT_TO_LIST(GetSubtitleType()); // 391155 DATETIME_TO_LIST(lastmodified); // 31 1156 FLOAT_TO_LIST(stars); // 32 1157 DATE_TO_LIST(originalAirDate); // 33 1158 STR_TO_LIST((!playgroup.isEmpty()) ? playgroup : "Default"); // 34 1159 INT_TO_LIST(recpriority2); // 35 1160 INT_TO_LIST(parentid); // 36 1161 STR_TO_LIST((!storagegroup.isEmpty()) ? storagegroup : "Default"); // 37 1162 INT_TO_LIST(GetAudioProperties()); // 38 1163 INT_TO_LIST(GetVideoProperties()); // 39 1164 INT_TO_LIST(GetSubtitleType()); // 40 1153 1165 1154 INT_TO_LIST(year); // 4 01166 INT_TO_LIST(year); // 41 1155 1167 /* do not forget to update the NUMPROGRAMLINES defines! */ 1156 1168 } 1157 1169 … … 1224 1236 ENUM_FROM_LIST(rectype, RecordingType); // 20 1225 1237 ENUM_FROM_LIST(dupin, RecordingDupInType); // 21 1226 1238 ENUM_FROM_LIST(dupmethod, RecordingDupMethodType); // 22 1227 DATETIME_FROM_LIST(recstartts); // 23 1228 DATETIME_FROM_LIST(recendts); // 24 1229 INT_FROM_LIST(programflags); // 25 1230 STR_FROM_LIST(recgroup); // 26 1231 STR_FROM_LIST(chanplaybackfilters);//27 1232 STR_FROM_LIST(seriesid); // 28 1233 STR_FROM_LIST(programid); // 29 1239 INT_FROM_LIST(seasonlimit); // 23 1240 DATETIME_FROM_LIST(recstartts); // 24 1241 DATETIME_FROM_LIST(recendts); // 25 1242 INT_FROM_LIST(programflags); // 26 1243 STR_FROM_LIST(recgroup); // 27 1244 STR_FROM_LIST(chanplaybackfilters);//28 1245 STR_FROM_LIST(seriesid); // 29 1246 STR_FROM_LIST(programid); // 30 1234 1247 1235 DATETIME_FROM_LIST(lastmodified); // 3 01236 FLOAT_FROM_LIST(stars); // 3 11237 DATE_FROM_LIST(originalAirDate);; // 3 21238 STR_FROM_LIST(playgroup); // 3 31239 INT_FROM_LIST(recpriority2); // 3 41240 INT_FROM_LIST(parentid); // 3 51241 STR_FROM_LIST(storagegroup); // 3 61248 DATETIME_FROM_LIST(lastmodified); // 31 1249 FLOAT_FROM_LIST(stars); // 32 1250 DATE_FROM_LIST(originalAirDate);; // 33 1251 STR_FROM_LIST(playgroup); // 34 1252 INT_FROM_LIST(recpriority2); // 35 1253 INT_FROM_LIST(parentid); // 36 1254 STR_FROM_LIST(storagegroup); // 37 1242 1255 uint audioproperties, videoproperties, subtitleType; 1243 INT_FROM_LIST(audioproperties); // 3 71244 INT_FROM_LIST(videoproperties); // 3 81245 INT_FROM_LIST(subtitleType); // 391256 INT_FROM_LIST(audioproperties); // 38 1257 INT_FROM_LIST(videoproperties); // 39 1258 INT_FROM_LIST(subtitleType); // 40 1246 1259 properties = (subtitleType<<11) | (videoproperties<<6) | audioproperties; 1247 1260 1248 INT_FROM_LIST(year); // 4 01261 INT_FROM_LIST(year); // 41 1249 1262 1250 1263 if (!origChanid || !origRecstartts.isValid() || 1251 1264 (origChanid != chanid) || (origRecstartts != recstartts)) … … 1419 1432 { 1420 1433 tmp_rec += ::toString(GetRecordingStatus(), GetRecordingRuleType()); 1421 1434 } 1435 if (seasonlimit == 0) 1436 { 1437 tmp_rec += " - Any Season"; 1438 } 1439 else { 1440 tmp_rec += QString().sprintf(" - Season %d", seasonlimit); 1441 } 1422 1442 } 1423 1443 progMap["rectypestatus"] = tmp_rec; 1424 1444 … … 1675 1695 /**///rectype; 1676 1696 dupin = RecordingDupInType(query.value(43).toInt()); 1677 1697 dupmethod = RecordingDupMethodType(query.value(44).toInt()); 1698 seasonlimit = query.value(45).toInt(); 1678 1699 1679 1700 // ancillary data -- begin 1680 1701 set_flag(programflags, FL_CHANCOMMFREE, … … 4242 4263 4243 4264 RecordingDupInType(query.value(43).toInt()), 4244 4265 RecordingDupMethodType(query.value(44).toInt()), 4266 query.value(45).toInt(), 4245 4267 4246 4268 query.value(42).toUInt(), 4247 4269 -
mythtv/programs/mythfrontend/scheduleeditor.cpp
453 453 m_backButton(NULL), 454 454 m_prioritySpin(NULL), m_inputList(NULL), m_startoffsetSpin(NULL), 455 455 m_endoffsetSpin(NULL), m_dupmethodList(NULL), m_dupscopeList(NULL), 456 m_ ruleactiveCheck(NULL)456 m_seasonList(NULL), m_ruleactiveCheck(NULL) 457 457 { 458 458 if (recInfo) 459 459 m_recInfo = new RecordingInfo(*recInfo); … … 476 476 UIUtilE::Assign(this, m_endoffsetSpin, "endoffset", &err); 477 477 UIUtilE::Assign(this, m_dupmethodList, "dupmethod", &err); 478 478 UIUtilE::Assign(this, m_dupscopeList, "dupscope", &err); 479 UIUtilE::Assign(this, m_seasonList, "season", &err); 479 480 480 481 UIUtilE::Assign(this, m_ruleactiveCheck, "ruleactive", &err); 481 482 … … 596 597 } 597 598 m_dupscopeList->SetValueByData(ENUM_TO_QVARIANT(m_recordingRule->m_dupIn)); 598 599 600 // Season limit 601 new MythUIButtonListItem(m_seasonList, 602 tr("Any Season"), 603 qVariantFromValue(0)); 604 for (int i = 1; i <= 25; i++) { 605 new MythUIButtonListItem(m_seasonList, 606 tr("Season %1") 607 .arg(i), qVariantFromValue(i)); 608 } 609 m_seasonList->SetValueByData(m_recordingRule->m_seasonLimit); 610 599 611 // Active/Disabled 600 612 m_ruleactiveCheck->SetCheckState(!m_recordingRule->m_isInactive); 601 613 … … 642 654 m_recordingRule->m_dupIn = static_cast<RecordingDupInType> 643 655 (m_dupscopeList->GetDataValue().toInt()); 644 656 657 // Season Limiting 658 m_recordingRule->m_seasonLimit = m_seasonList->GetDataValue().toInt(); 659 645 660 // Active/Disabled 646 661 m_recordingRule->m_isInactive = (!m_ruleactiveCheck->GetBooleanCheckState()); 647 662 } -
mythtv/programs/mythfrontend/scheduleeditor.h
109 109 MythUISpinBox *m_endoffsetSpin; 110 110 MythUIButtonList *m_dupmethodList; 111 111 MythUIButtonList *m_dupscopeList; 112 MythUIButtonList *m_seasonList; 112 113 113 114 MythUICheckBox *m_ruleactiveCheck; 114 115 }; -
mythtv/programs/mythbackend/scheduler.cpp
3324 3324 " p.subtitletypes+0, p.audioprop+0, RECTABLE.storagegroup, "//39-41 3325 3325 " capturecard.hostname, recordmatch.oldrecstatus, " 3326 3326 " RECTABLE.avg_delay, "//42-44 3327 " RECTABLE.seasonlimit, "//45 3327 3328 + pwrpri + QString( 3328 3329 "FROM recordmatch " 3329 3330 "INNER JOIN RECTABLE ON (recordmatch.recordid = RECTABLE.recordid) " 3330 3331 "INNER JOIN program AS p " 3331 3332 "ON ( recordmatch.chanid = p.chanid AND " 3332 3333 " recordmatch.starttime = p.starttime AND " 3333 " recordmatch.manualid = p.manualid ) " 3334 " recordmatch.manualid = p.manualid AND " 3335 " (RECTABLE.seasonlimit = 0 OR " 3336 " (p.syndicatedepisodenumber >= (RECTABLE.seasonlimit * 100) AND " 3337 " p.syndicatedepisodenumber < ((RECTABLE.seasonlimit + 1) * 100) " 3338 " )" 3339 " )" 3340 " )" 3334 3341 "INNER JOIN channel AS c " 3335 3342 "ON ( c.chanid = p.chanid ) " 3336 3343 "INNER JOIN cardinput ON (c.sourceid = cardinput.sourceid) " … … 3411 3418 RecordingType(result.value(16).toInt()),//rectype 3412 3419 RecordingDupInType(result.value(13).toInt()),//dupin 3413 3420 RecordingDupMethodType(result.value(22).toInt()),//dupmethod 3421 result.value(45).toInt(), // seasonlimit 3414 3422 3415 3423 result.value(1).toUInt(),//sourceid 3416 3424 result.value(25).toUInt(),//inputid … … 3430 3438 3431 3439 p->SetRecordingPriority( 3432 3440 p->GetRecordingPriority() + recTypeRecPriorityMap[p->GetRecordingRuleType()] + 3433 result.value(4 5).toInt() +3441 result.value(46).toInt() + 3434 3442 ((autopriority) ? 3435 3443 autopriority - (result.value(44).toInt() * autostrata / 200) : 0)); 3436 3444 … … 3547 3555 " RECTABLE.recordid, RECTABLE.type, " // 17,18 3548 3556 " RECTABLE.dupin, RECTABLE.dupmethod, " // 19,20 3549 3557 " RECTABLE.findid, " // 21 3550 " RECTABLE.startoffset, RECTABLE.endoffset " // 22,23 3558 " RECTABLE.startoffset, RECTABLE.endoffset, " // 22,23 3559 " RECTABLE.seasonlimit " // 24 3551 3560 "FROM RECTABLE " 3552 3561 "INNER JOIN channel ON (channel.chanid = RECTABLE.chanid) " 3553 3562 "LEFT JOIN recordmatch on RECTABLE.recordid = recordmatch.recordid " … … 3656 3665 3657 3666 RecordingDupInType(result.value(19).toInt()), 3658 3667 RecordingDupMethodType(result.value(20).toInt()), 3668 result.value(24).toInt(), 3659 3669 3660 3670 result.value(21).toUInt()); 3661 3671 … … 3681 3691 " RECTABLE.enddate, RECTABLE.endtime, " // 15,16 3682 3692 " RECTABLE.recordid, RECTABLE.type, " // 17,18 3683 3693 " RECTABLE.dupin, RECTABLE.dupmethod, " // 19,20 3684 " RECTABLE.findid " // 213694 " RECTABLE.findid, RECTABLE.seasonlimit " // 21,22 3685 3695 "FROM RECTABLE " 3686 3696 "LEFT JOIN channel ON channel.callsign = RECTABLE.station " 3687 3697 "GROUP BY recordid " … … 3743 3753 result.value(17).toUInt(), rectype, 3744 3754 RecordingDupInType(result.value(19).toInt()), 3745 3755 RecordingDupMethodType(result.value(20).toInt()), 3756 result.value(22).toInt(), 3746 3757 3747 3758 result.value(21).toUInt())); 3748 3759 } -
mythtv/bindings/python/MythTV/MythStatic.py
5 5 """ 6 6 7 7 OWN_VERSION = (0,23,0,10) 8 SCHEMA_VERSION = 12 598 SCHEMA_VERSION = 1260 9 9 MVSCHEMA_VERSION = 1035 10 10 NVSCHEMA_VERSION = 1007 11 11 PROTO_VERSION = 57 -
mythtv/bindings/python/MythTV/MythData.py
501 501 'findid', 'hostname', 'sourceid', 502 502 'cardid', 'inputid', 'recpriority', 503 503 'recstatus', 'recordid', 'rectype', 504 'dupin', 'dupmethod', ' recstartts',505 'rec endts', 'programflags', 'recgroup',506 ' outputfilters','seriesid', 'programid',507 ' lastmodified', 'stars', 'airdate',508 ' playgroup', 'recpriority2', 'parentid',509 ' storagegroup', 'audio_props', 'video_props',510 ' subtitle_type','year']504 'dupin', 'dupmethod', 'seasonlimit', 505 'recstartts', 'recendts', 'programflags', 506 'recgroup', 'outputfilters','seriesid', 507 'programid', 'lastmodified', 'stars', 508 'airdate', 'playgroup', 'recpriority2', 509 'parentid', 'storagegroup', 'audio_props', 510 'video_props', 'subtitle_type','year'] 511 511 _field_type = [ 3, 3, 3, 512 512 3, 0, 3, 513 513 3, 3, 3, … … 515 515 0, 3, 0, 516 516 0, 0, 0, 517 517 0, 0, 3, 518 0, 0, 4, 519 4, 3, 3, 520 3, 3, 3, 521 3, 1, 3, 522 3, 0, 3, 523 3, 0, 0, 524 0, 0] 518 0, 0, 0, 519 4, 4, 3, 520 3, 3, 3, 521 3, 3, 1, 522 3, 3, 0, 523 3, 3, 0, 524 0, 0, 0] 525 525 526 def __str__(self): 526 527 return u"<Program '%s','%s' at %s>" % (self.title, 527 528 self.starttime.strftime('%Y-%m-%d %H:%M:%S'), hex(id(self))) -
mythtv/bindings/perl/MythTV.pm
106 106 # NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is 107 107 # the number of items in a ProgramInfo QStringList group used by 108 108 # ProgramInfo::ToSringList and ProgramInfo::FromStringList. 109 our $NUMPROGRAMLINES = 4 1;109 our $NUMPROGRAMLINES = 42; 110 110 111 111 # Reasons a recording wouldn't be happening (from libs/libmythtv/programinfo.h) 112 112 our %RecStatus_Types = ( -
mythtv/bindings/perl/MythTV/Program.pm
65 65 $self->{'rectype'} = $_[20]; # 20 rectype 66 66 $self->{'dupin'} = $_[21]; # 21 dupin 67 67 $self->{'dupmethod'} = $_[22]; # 22 dupmethod 68 $self->{'recstartts'} = $_[23]; # 23 recstartts ACTUAL start time (unix timestamp) 69 $self->{'recendts'} = $_[24]; # 24 recendts ACTUAL end time (unix timestamp) 70 $self->{'progflags'} = $_[25]; # 25 programflags 71 $self->{'recgroup'} = $_[26]; # 26 recgroup 72 $self->{'outputfilters'} = $_[27]; # 27 chanOutputFilters 73 $self->{'seriesid'} = $_[28]; # 28 seriesid 74 $self->{'programid'} = $_[29]; # 29 programid 68 $self->{'seasonlimit'] = $_[23]; # 23 seasonlimt 69 $self->{'recstartts'} = $_[23]; # 24 recstartts ACTUAL start time (unix timestamp) 70 $self->{'recendts'} = $_[24]; # 25 recendts ACTUAL end time (unix timestamp) 71 $self->{'progflags'} = $_[25]; # 26 programflags 72 $self->{'recgroup'} = $_[26]; # 27 recgroup 73 $self->{'outputfilters'} = $_[27]; # 28 chanOutputFilters 74 $self->{'seriesid'} = $_[28]; # 29 seriesid 75 $self->{'programid'} = $_[29]; # 30 programid 75 76 76 $self->{'lastmodified'} = $_[30]; # 3 0lastmodified77 $self->{'stars'} = $_[31]; # 3 1stars78 $self->{'airdate'} = $_[32]; # 3 2originalAirDate (ISO 8601 format)79 $self->{'playgroup'} = $_[33]; # 3 3playgroup80 $self->{'recpriority2'} = $_[34]; # 3 4recpriority281 $self->{'parentid'} = $_[35]; # 3 5parentid82 $self->{'storagegroup'} = $_[36]; # 3 6storagegroup83 $self->{'audio_props'} = $_[37]; # 3 7Audio properties84 $self->{'video_props'} = $_[38]; # 3 8Video properties85 $self->{'subtitle_type'} = $_[39]; # 39Subtitle type77 $self->{'lastmodified'} = $_[30]; # 31 lastmodified 78 $self->{'stars'} = $_[31]; # 32 stars 79 $self->{'airdate'} = $_[32]; # 33 originalAirDate (ISO 8601 format) 80 $self->{'playgroup'} = $_[33]; # 34 playgroup 81 $self->{'recpriority2'} = $_[34]; # 35 recpriority2 82 $self->{'parentid'} = $_[35]; # 36 parentid 83 $self->{'storagegroup'} = $_[36]; # 37 storagegroup 84 $self->{'audio_props'} = $_[37]; # 38 Audio properties 85 $self->{'video_props'} = $_[38]; # 39 Video properties 86 $self->{'subtitle_type'} = $_[39]; # 40 Subtitle type 86 87 87 $self->{'year'} = $_[40]; # 4 0Production year88 $self->{'year'} = $_[40]; # 41 Production year 88 89 89 90 # Load the channel data 90 91 if ($self->{'chanid'}) { … … 156 157 $self->{'rectype'} , # 20 rectype 157 158 $self->{'dupin'} , # 21 dupin 158 159 $self->{'dupmethod'} , # 22 dupmethod 159 $self->{'recstartts'} , # 23 recstartts 160 $self->{'recendts'} , # 24 recendts 161 $self->{'progflags'} , # 25 programflags 162 $self->{'recgroup'} , # 26 recgroup 163 $self->{'outputfilters'} , # 27 chanOutputFilters 164 $self->{'seriesid'} , # 28 seriesid 165 $self->{'programid'} , # 29 programid 160 $sefl->{'seasonlimit'} , # 23 seasonlimit 161 $self->{'recstartts'} , # 24 recstartts 162 $self->{'recendts'} , # 25 recendts 163 $self->{'progflags'} , # 26 programflags 164 $self->{'recgroup'} , # 27 recgroup 165 $self->{'outputfilters'} , # 28 chanOutputFilters 166 $self->{'seriesid'} , # 29 seriesid 167 $self->{'programid'} , # 30 programid 166 168 167 $self->{'lastmodified'} , # 3 0lastmodified168 $self->{'stars'} , # 3 1stars169 $self->{'airdate'} , # 3 2originalAirDate170 $self->{'playgroup'} , # 3 3playgroup171 $self->{'recpriority2'} , # 3 4recpriority2172 $self->{'parentid'} , # 3 5parentid173 $self->{'storagegroup'} , # 3 6storagegroup174 $self->{'audio_props'} , # 3 7audio properties175 $self->{'video_props'} , # 3 8video properties176 $self->{'subtitle_type'} , # 39subtitle type169 $self->{'lastmodified'} , # 31 lastmodified 170 $self->{'stars'} , # 32 stars 171 $self->{'airdate'} , # 33 originalAirDate 172 $self->{'playgroup'} , # 34 playgroup 173 $self->{'recpriority2'} , # 35 recpriority2 174 $self->{'parentid'} , # 36 parentid 175 $self->{'storagegroup'} , # 37 storagegroup 176 $self->{'audio_props'} , # 38 audio properties 177 $self->{'video_props'} , # 39 video properties 178 $self->{'subtitle_type'} , # 40 subtitle type 177 179 178 $self->{'year'} , # 4 0production year180 $self->{'year'} , # 41 production year 179 181 '' # trailing separator 180 182 ); 181 183 }