[mythtv-firehose] mythtv branch master updated by stuartm. v0.26-pre-795-ga32d5e3

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  a32d5e31ad2833c6e55f3161732faa7fe2f00cfc (commit)
       via  c722636fec8a7afc9202863bab58e282fde5b2b5 (commit)
      from  70f02af9fe11bacc3465736ccd00b56a9865f49d (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 a32d5e31ad2833c6e55f3161732faa7fe2f00cfc
Author:    Lawrence Rust <lvr at softsystem.co.uk> at Wed, 8 Jun 2011 17:18:59 +0200
Committer: Stuart Morgan <smorgan at mythtv.org> at Fri, 6 Jul 2012 22:43:25 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a32d5e31ad2833c6e55f3161732faa7fe2f00cfc

ChannelScan: Update multiplex transponder and network id when channel updated
When a transport is added manually using the transport editor, the transport
and network ids are not known and are left unset.  This causes a problem
for interactive TV which tunes a channel by network and transport id.

This patch updates the transport and network ids for a multiplex whenever a
channel is found or updated on the transport.

Signed-off-by: Lawrence Rust <lvr at softsystem.co.uk>
Signed-off-by: Stuart Morgan <smorgan at mythtv.org>



commit c722636fec8a7afc9202863bab58e282fde5b2b5
Author:    Lawrence Rust <lvr at softsystem.co.uk> at Thu, 8 Dec 2011 19:43:24 +0100
Committer: Stuart Morgan <smorgan at mythtv.org> at Fri, 6 Jul 2012 22:43:25 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c722636fec8a7afc9202863bab58e282fde5b2b5

mythgallery: Improve the list of supported image and movie file formats
Since images are read using QImage::load() it is correct to use
QImageReader::supportedImageFormats to specify the list of supported types.

Add *.iso, *.img and *.bin to the list of movie files supoorted by mplayer.

Signed-off-by: Lawrence Rust <lvr at softsystem.co.uk>
Signed-off-by: Stuart Morgan <smorgan at mythtv.org>



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

Summary of changes:
 .../mythgallery/mythgallery/galleryutil.cpp        |   14 +++++----
 mythplugins/mythgallery/mythgallery/main.cpp       |   11 ++++++-
 .../libs/libmythtv/channelscan/channelimporter.cpp |   31 ++++++++++++++++++--
 3 files changed, 46 insertions(+), 10 deletions(-)

--