[mythtv-commits] mythtv/master commit: 97047fc66 by David Engel (gigem)

[MythTV]

      Author:  David Engel <dengel at mythtv.org>
 Change Date:  2012-01-19T17:05:51-08:00
   Push Date:  2012/01/19 17:14:58 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  97047fc6646eb17dc3869663a61357a12a4b642a
   Changeset:  https://github.com/MythTV/mythtv/commit/97047fc66

Log:

Finish input ordering changes started in commit 3281cdd3.

Honor the livetvorder setting when choosing the starting input for
live TV.  Onc correction from the previous commit is needed.  It said
that the available input with the lowest, non-zero livetvorder is used
first.  It is actually the available, local input witht the lowest,
non-zero livetvorder.  If no local input is available, it is the
available, remote input with the loweset, non-zero order.  In other
words, available inputs on local recorders are preferred over remote
inputs.

Please note that this change also does away with the concept of the
"defaultinput" for a card.  It was actually the last used input.  It
is no longer needed since livetvorder determines the chosen input.

Modified:

   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythservicecontracts/datacontracts/captureCard.h
   mythtv/libs/libmythservicecontracts/services/captureServices.h
   mythtv/libs/libmythtv/cardutil.cpp
   mythtv/libs/libmythtv/cardutil.h
   mythtv/libs/libmythtv/channelbase.cpp
   mythtv/libs/libmythtv/channelbase.h
   mythtv/libs/libmythtv/dbcheck.cpp
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythtv/tv_rec.h
   mythtv/libs/libmythtv/videosource.cpp
   mythtv/libs/libmythtv/videosource.h
   mythtv/programs/mythbackend/services/capture.cpp
   mythtv/programs/mythbackend/services/capture.h
   mythtv/programs/mythtv-setup/main.cpp