Index: includes/programs.php =================================================================== --- includes/programs.php (revision 9646) +++ includes/programs.php (working copy) @@ -261,6 +261,7 @@ var $is_movie; var $timestretch; + var $playgroup; var $credits = array(); @@ -333,7 +334,8 @@ $this->recpriority = $data[36]; $this->airdate = date('Y-m-d', $data[37]); $this->hasairdate = $data[38]; - $this->timestretch = $data[39]; + $this->playgroup = $data[39]; + $this->timestretch = ''; # Not printed by ToStringList() $this->recpriority2 = $data[40]; // Assign the program flags $this->has_commflag = ($progflags & 0x01) ? true : false; // FL_COMMFLAG = 0x01 Index: includes/recording_schedules.php =================================================================== --- includes/recording_schedules.php (revision 9646) +++ includes/recording_schedules.php (working copy) @@ -143,6 +143,7 @@ var $findid; var $transcoder; var $parentid; + var $playgroup; var $texttype; var $channel; @@ -251,7 +252,7 @@ // Update the type, in case it changed $this->type = $new_type; // Update the record - $result = mysql_query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search,title,subtitle,description,profile,recpriority,category,maxnewest,inactive,maxepisodes,autoexpire,startoffset,endoffset,recgroup,dupmethod,dupin,station,seriesid,programid,autocommflag,findday,findtime,findid,autotranscode,transcoder,parentid,tsdefault,autouserjob1,autouserjob2,autouserjob3,autouserjob4) values (' + $result = mysql_query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search,title,subtitle,description,profile,recpriority,category,maxnewest,inactive,maxepisodes,autoexpire,startoffset,endoffset,recgroup,dupmethod,dupin,station,seriesid,programid,autocommflag,findday,findtime,findid,autotranscode,transcoder,parentid,tsdefault,autouserjob1,autouserjob2,autouserjob3,autouserjob4,playgroup) values (' .escape($this->recordid, true) .',' .escape($this->type) .',' .escape($this->chanid) .',' @@ -289,7 +290,8 @@ .escape($this->autouserjob1) .',' .escape($this->autouserjob2) .',' .escape($this->autouserjob3) .',' - .escape($this->autouserjob4) .')') + .escape($this->autouserjob4) .',' + .escape($this->playgroup) .')') or trigger_error('SQL Error: '.mysql_error(), FATAL); // Get the id that was returned $recordid = mysql_insert_id(); @@ -512,4 +514,31 @@ echo ''; } +/** + * prints a \n"; + foreach($playgroups as $playgroup) + { + echo "\t\n"; + } + echo "\n"; + return; + } Index: includes/css.php =================================================================== --- includes/css.php (revision 9646) +++ includes/css.php (working copy) @@ -31,14 +31,15 @@ // Scan the $Categories hash for any matches else { global $Categories; - foreach ($Categories as $cat => $details) { - if (!$details[1]) - continue; - if (preg_match('/'.$details[1].'/', $category)) { - $class[] = $cache[$category] = 'cat_'.$cat; - break; + if(is_array($Categories)) + foreach ($Categories as $cat => $details) { + if (!$details[1]) + continue; + if (preg_match('/'.$details[1].'/', $category)) { + $class[] = $cache[$category] = 'cat_'.$cat; + break; + } } - } } // No category found? if (!$cache[$category]) Index: modules/settings/playgroup.php =================================================================== --- modules/settings/playgroup.php (revision 0) +++ modules/settings/playgroup.php (revision 0) @@ -0,0 +1,43 @@ +query('SELECT * FROM playgroup WHERE name = ?', $_GET['playgroup']); + if($sh->num_rows() == 1) + $row = $sh->fetch_assoc(); + } + $name = isset($row['name']) ? $row['name'] : ''; + $titlematch = isset($row['titlematch']) ? $row['titlematch'] : ''; + $skipahead = isset($row['skipahead']) ? $row['skipahead'] : ''; + $skipback = isset($row['skipback']) ? $row['skipback'] : ''; + $timestretch = isset($row['timestretch']) ? $row['timestretch'] : ''; + $jump = isset($row['jump']) ? $row['jump'] : ''; + +// Save changes + if(isset($_POST['save'])) + $db->query('REPLACE INTO playgroup (name, titlematch, skipahead, skipback, timestretch, jump) VALUES (?, ?, ?, ?, ?, ?)', $_POST['name'], $_POST['titlematch'], $_POST['skipahead'], $_POST['skipback'], $_POST['timestretch'], $_POST['jump']); + +// Delete group + if(isset($_POST['delete'])) + $db->query('DELETE FROM playgroup WHERE name = ?', $_POST['name']); + +// Load the class for this page + require_once tmpl_dir.'playgroup.php'; + + exit(0); Index: modules/settings/init.php =================================================================== --- modules/settings/init.php (revision 9646) +++ modules/settings/init.php (working copy) @@ -23,5 +23,6 @@ 'channels' => t('MythTV channel info'), 'keys' => t('MythTV key bindings'), 'settings' => t('MythTV settings table'), + 'playgroup' => t('MythTV playback group editor') ), ); Index: modules/settings/tmpl/default/playgroup.php =================================================================== --- modules/settings/tmpl/default/playgroup.php (revision 0) +++ modules/settings/tmpl/default/playgroup.php (revision 0) @@ -0,0 +1,73 @@ + + + + + +
+
+ + + + + + +
:  
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ +

+ + +

+ +
+findday = $_POST['findday']; $schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0; $schedule->transcoder = $_POST['transcoder']; + $schedule->playgroup = $_POST['playgroup']; // Parse the findtime $schedule->findtime = trim($_POST['findtime']); if ($schedule->findtime) { Index: modules/tv/schedules_manual.php =================================================================== --- modules/tv/schedules_manual.php (revision 9646) +++ modules/tv/schedules_manual.php (working copy) @@ -87,6 +87,7 @@ $schedule->findtime = date('H:m:s', $schedule->starttime); $schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0; $schedule->transcoder = $_POST['transcoder']; + $schedule->playgroup = $_POST['playgroup']; // Figure out the title $channel = $Channels[$_POST['channel']]; if (strcasecmp($_POST['title'], t('Use callsign')) == 0) { Index: modules/tv/detail.php =================================================================== --- modules/tv/detail.php (revision 9646) +++ modules/tv/detail.php (working copy) @@ -132,6 +132,7 @@ $schedule->endoffset = intval($_POST['endoffset']); $schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0; $schedule->transcoder = $_POST['transcoder']; + $schedule->playgroup = $_POST['playgroup']; $schedule->tsdefault = $_POST['timestretch']; // Keep track of the parent recording for overrides if ($_POST['record'] == rectype_override) { Index: modules/tv/tmpl/default/schedules_custom.php =================================================================== --- modules/tv/tmpl/default/schedules_custom.php (revision 9646) +++ modules/tv/tmpl/default/schedules_custom.php (working copy) @@ -160,6 +160,8 @@ echo ">$i"; } ?> +
:
+
playgroup) ?>
:
+
:
+
playgroup) ?>
:
+
:
+
playgroup) ?>
: