[mythtv-commits] mythtv/master commit: 80eea05d6 by Robert McNamara (rmcnamara)

[MythTV]

      Author:  Robert McNamara <rmcnamara at mythtv.org>
 Change Date:  2011-10-26T18:31:51-07:00
   Push Date:  2011/10/26 18:32:53 -0700
  Repository:  mythtv
      Branch:  master
New Revision:  80eea05d6c20a8927c807dbd44e9ed08db3419d2
   Changeset:  https://github.com/MythTV/mythtv/commit/80eea05d6

Log:

Allow the GetUpcoming API to show conflicts and non-recording items.

This will allow a third party program to also show conflicts and previously recorded items (even if you can't technically do everything needed for conflict resolution via the API yet)

Modified:

   mythtv/libs/libmythservicecontracts/services/dvrServices.h
   mythtv/programs/mythbackend/services/dvr.cpp
   mythtv/programs/mythbackend/services/dvr.h