Skip to content

Fix for "Forget Old" bug #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbrehon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for "Forget Old" bug #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6c12e
Add two params to param-list sent to mythbackend via FORGET_PREVIOUS …
mbrehon May 15, 2022
757a943
fix stopRecording() -- only seems to be invoked when cancelling a sch…
mbrehon May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions modules/tv/classes/Program.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class Program extends MythBase {
public $subtitled = 0;
public $deaf_signed = 0;
public $recordedid = 0;
public $bookmarkupdate = '0000-00-00 00:00:00'; // zero date is default in recorded table, 1900-01-01 00:00:00 is default for QDateTime. Which to use?

// The rest of these variables (which really need to get organized) are
// calculated or queried separately from the db.
Expand Down Expand Up @@ -134,6 +135,8 @@ public function __construct($data) {
$this->parttotal = $data[47];
$this->category_type = $data[48];
$this->recordedid = $data[49];
//$this->inputname = $data[50]; # seems to get set further down...
$this->bookmarkupdate = $data[51]; # assuming this index *should* match that supplied/commented in backend_row()
// Is this a previously-recorded program?
if (!empty($this->filename)) {
$this->url = video_url($this); // get download info
Expand Down Expand Up @@ -182,6 +185,7 @@ public function __construct($data) {
$this->title_pronounce = $data['title_pronounce'];
$this->recstatus = $data['recstatus'];
$this->recordedid = $data['recordedid'];
$this->bookmarkupdate = $data['bookmarkupdate'];

// These db fields should really get renamed...
$this->audioproperties = $data['stereo'];
Expand Down Expand Up @@ -358,7 +362,7 @@ public function load_jobs() {
}

/**
* Generate a mythproto-compatible row of data for this show.
* Generate a mythproto-compatible row of data for this show. Info about this data structure from MythTV: libs/libmyth/programinfo.cpp
**/
public function backend_row() {
return implode(MythBackend::$backend_separator,
Expand Down Expand Up @@ -416,7 +420,10 @@ public function backend_row() {
$this->parttotal , // 46 parttotal
$this->category_type , // 48 category type
$this->recordedid , // 49 recordedid
$this->inputname , // 50 inputname
$this->bookmarkupdate , // 51 bookmarkupdate
)
// should be of *length* MythBackend::$program_line_number from MythTV php bindings, see notes there
);
}

Expand Down Expand Up @@ -758,7 +765,7 @@ public static function categories() {
public function stopRecording() {
if ($this->recstatus != 'Recording')
return false;
MythBackend::find()->sendCommand(array('STOP_RECORDING', $prog->backend_row(), '0'));
MythBackend::find()->sendCommand(array('STOP_RECORDING', $this->backend_row(), '0'));
return true;
}

Expand Down