[mythtv] [mythtv-commits] mythtv branch master updated by stuartm. v0.26-pre-1381-g5980582

[Andrei Rjeousski]

On Thu, Nov 22, 2012 at 6:13 AM, Git Repo Owner <noreply at mythtv.org> wrote:

> The branch, master has been updated on the
> mythtv repository by gitolite user stuartm.
>        via  59805821a11921f862fe142e6f3df477b7de5fa2 (commit)
>       from  fe22adc5c485b8b19969b0e1804a84f652227577 (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 59805821a11921f862fe142e6f3df477b7de5fa2
> Author:    Stuart Morgan <smorgan at mythtv.org> at Thu, 22 Nov 2012
> 11:11:27 +0000
> Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 22 Nov 2012
> 11:11:27 +0000
> URL:
> http://code.mythtv.org/cgit/mythtv/commit/?id=59805821a11921f862fe142e6f3df477b7de5fa2
>
> Merge DBChannel and ChannelInfo classes. Make (dist)clean recommended
>
>
>
> -----------------------------------------------------------------------
>
> Summary of changes:
>  mythtv/libs/libmythbase/mythversion.h              |    2 +-
>  mythtv/libs/libmythtv/channelgroupsettings.cpp     |    5 +-
>  .../{dbchannelinfo.cpp => channelinfo.cpp}         |  168
> ++++++++++++-------
>  .../libmythtv/{dbchannelinfo.h => channelinfo.h}   |   89 +++++++----
>  mythtv/libs/libmythtv/channelutil.cpp              |   28 ++--
>  mythtv/libs/libmythtv/channelutil.h                |   12 +-
>  mythtv/libs/libmythtv/dtvmultiplex.h               |    2 +-
>  mythtv/libs/libmythtv/inputinfo.h                  |    6 +-
>  mythtv/libs/libmythtv/libmythtv.pro                |    4 +-
>  mythtv/libs/libmythtv/recorders/channelbase.cpp    |   17 +-
>  mythtv/libs/libmythtv/recorders/channelbase.h      |    8 +-
>  mythtv/libs/libmythtv/tv_play.cpp                  |    8 +-
>  mythtv/libs/libmythtv/tv_play.h                    |    5 +-
>  mythtv/libs/libmythtv/tvbrowsehelper.cpp           |    8 +-
>  mythtv/libs/libmythtv/tvbrowsehelper.h             |    6 +-
>  mythtv/libs/libmythtv/videosource.cpp              |    3 +-
>  .../programs/mythfrontend/channelrecpriority.cpp   |   40 +++---
>  mythtv/programs/mythfrontend/guidegrid.cpp         |   40 +++---
>  mythtv/programs/mythfrontend/guidegrid.h           |    8 +-
>  mythtv/programs/mythfrontend/manualschedule.cpp    |    5 +-
>  mythtv/programs/mythfrontend/proglist.cpp          |    5 +-
>  mythtv/programs/mythfrontend/proglist_helpers.cpp  |    5 +-
>  22 files changed, 272 insertions(+), 202 deletions(-)
>  rename mythtv/libs/libmythtv/{dbchannelinfo.cpp => channelinfo.cpp} (86%)
>  rename mythtv/libs/libmythtv/{dbchannelinfo.h => channelinfo.h} (79%)
>
> --
>
> _______________________________________________
> mythtv-commits mailing list
> mythtv-commits at mythtv.org
> http://www.mythtv.org/mailman/listinfo/mythtv-commits
>

Hi Stuart,

I've tracked down a small problem with this commit. The problem is with
Init(); call inside
ChannelInfo &ChannelInfo::operator=(const ChannelInfo &other)

The issue originates from ChannelUtil::SortChannels when trying to sort
channels for channel guide or livetv browsing. It appears that on my
system, some of my channels are already in the correct order
and stable_sort call inside SortChannels causes some of the elements in the
list to get assigned to themselves. Since Init is called in the assignment
operator, this causes some fields to get reset (one of which is chanid
which breaks channel browsing guide display).

Simply removing Init() call from the assignment operator fixes the problem.
Let me know if you'd like me to open ticket with patch for this issue.

Thanks,

Andrei Rjeousski
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mythtv.org/pipermail/mythtv-dev/attachments/20121221/e211b315/attachment.html>