[mythtv-firehose] mythtv branch master updated by gigem. v0.27-pre2-1485-g23914b0

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user gigem.
       via  23914b079856ebb5a9eea20aa90c77eded5469a4 (commit)
       via  7e250bc1b1385bbaba45c71ce7db9e1173180707 (commit)
      from  ba5cc8cc1b9b12caadec82386dc8947ceca6346d (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 23914b079856ebb5a9eea20aa90c77eded5469a4
Author:    David Engel <dengel at mythtv.org> at Sun, 16 Jun 2013 14:40:26 -0500
Committer: David Engel <dengel at mythtv.org> at Sun, 16 Jun 2013 14:40:26 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=23914b079856ebb5a9eea20aa90c77eded5469a4

Add mplexid to RecordingInfo for use within the scheduler.
This avoids having to repeatedly query the database when checking for
conflicts between virtual tuners.



commit 7e250bc1b1385bbaba45c71ce7db9e1173180707
Author:    David Engel <dengel at mythtv.org> at Sun, 16 Jun 2013 14:13:31 -0500
Committer: David Engel <dengel at mythtv.org> at Sun, 16 Jun 2013 14:13:31 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7e250bc1b1385bbaba45c71ce7db9e1173180707

Divide inputs into sets for detecting conflicts during scheduling.
Before input group and multirec support were added, the scheduler
split recording candidates into separate, conflict lists by cardid.
That avoided wasting time checking for conflicts that could never
occur.  It didn't alter the O(n^2) nature of conflict detection, but
it helped to keep n low.  After input group and multirec support were
added, all recording candidates were effectively placed on a single
list because recordings on different cards could now potentially
conflict.

This change restores the practice of putting recording candidates that
can't conflict on separate lists.  Instead of using cardids, however,
the scheduler uses cardids and input groups to split inputs into
mutually exclusive sets where any recording in one set can never
conflict with any recording in another set.



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

Summary of changes:
 mythtv/libs/libmythtv/recordinginfo.cpp   |    9 ++-
 mythtv/libs/libmythtv/recordinginfo.h     |    9 ++-
 mythtv/programs/mythbackend/scheduler.cpp |  131 +++++++++++++++++++++++++++--
 mythtv/programs/mythbackend/scheduler.h   |    5 +-
 4 files changed, 143 insertions(+), 11 deletions(-)

--