[mythtv-commits] mythtv branch master updated by jyavenard. v0.27-alpha-150-g8cddf62

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user jyavenard.
       via  8cddf6200f622b952f6e7d727d057556c6dd605e (commit)
       via  0a639d9bdf6612fdf827b123cd2a2f23d0600156 (commit)
       via  0a32a1dd8058f0e1c835de28e74856943aaa12d6 (commit)
       via  229a4267480a59b9a0de02e2d5ad4c9a971b7c9c (commit)
       via  eb3a3382a21c71fd0d1c9ff57aa64480ad03b36a (commit)
       via  e715acc3fbf72c54cea97df27ef7661221fb3dab (commit)
      from  bf10280b5fcb90b4a011e656a863e551665881fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8cddf6200f622b952f6e7d727d057556c6dd605e
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:28:43 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:28:43 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8cddf6200f622b952f6e7d727d057556c6dd605e

Fix comment typo



commit 0a639d9bdf6612fdf827b123cd2a2f23d0600156
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:21:20 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:22:45 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0a639d9bdf6612fdf827b123cd2a2f23d0600156

Do not use QMap::operator[] unless map definitely contains the key
QMap::operator[] would add here a NULL entry in the list of cards which would later cause a null dereference.

Fixes #11279



commit 0a32a1dd8058f0e1c835de28e74856943aaa12d6
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:16:37 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:22:44 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0a32a1dd8058f0e1c835de28e74856943aaa12d6

Fix potential deadlocks.
when changing channel very quickly, and depending on when a cancel would be called, we could enter various deadlocks.



commit 229a4267480a59b9a0de02e2d5ad4c9a971b7c9c
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 11 Aug 2013 23:10:57 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:22:44 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=229a4267480a59b9a0de02e2d5ad4c9a971b7c9c

Ensure cancelling a download is done in the same thread it started; take #2
MythDownloadManager::cancelDownload() needs to wait for the cancel to actually occur as some code relies on that behaviour.
This includes the same fix as commit eb78c7bda7c1859831997a54a3e3eadbb0993dd7 "Prevent multiple instances of the same DownloadInfo"

Fixes #11663



commit eb3a3382a21c71fd0d1c9ff57aa64480ad03b36a
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 11 Aug 2013 21:52:23 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:22:44 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=eb3a3382a21c71fd0d1c9ff57aa64480ad03b36a

Revert "Fix MythDownloadManger after 997f7aa10. It was possible for queue and cancel requests to be handled out of order resulting in newly queued downloads being cancelled almost immediately. We avoid this by removing any cancelled downloads  from the download queue to a new cancellation queue, then we clean up the cancelled downloads later without affecting new additions."
This reverts commit 277feb598e975d43c68f4b0a042a3ce6d5fd48bb.



commit e715acc3fbf72c54cea97df27ef7661221fb3dab
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 11 Aug 2013 21:52:13 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Mon, 12 Aug 2013 00:22:44 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e715acc3fbf72c54cea97df27ef7661221fb3dab

Revert "Prevent multiple instances of the same DownloadInfo pointer being added to the cancellation queue"
This reverts commit eb78c7bda7c1859831997a54a3e3eadbb0993dd7.



-----------------------------------------------------------------------

Summary of changes:
 mythtv/libs/libmythbase/mythdownloadmanager.cpp    |   82 +++++++++++--------
 mythtv/libs/libmythbase/mythdownloadmanager.h      |    3 +-
 mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp |   17 +++-
 mythtv/programs/mythbackend/mainserver.cpp         |    5 +-
 mythtv/programs/mythbackend/scheduler.cpp          |   15 ++--
 5 files changed, 73 insertions(+), 49 deletions(-)

--