[mythtv-commits] [MythTV/mythtv] 3b58ac: Suggest existing channel number if non-conflicting

[kmdewaal]

  Branch: refs/heads/master
  Home:   https://github.com/MythTV/mythtv
  Commit: 3b58ac6e106368b57eb66bcbc2e24bf45acaa46a
      https://github.com/MythTV/mythtv/commit/3b58ac6e106368b57eb66bcbc2e24bf45acaa46a
  Author: Klaas de Waal <kdewaal at mythtv.org>
  Date:   2019-08-12 (Mon, 12 Aug 2019)

  Changed paths:
    M mythtv/libs/libmythtv/channelscan/channelimporter.cpp
    A mythtv/make.log

  Log Message:
  -----------
  Suggest existing channel number if non-conflicting

In ComputedSuggestedChannelNumber, now first test if the
already present channel number is non-conflicting.
This is useful when "Insert Manually" is selected  after a channels scan
and when there are already channel numbers present, such as the Logical
Channel Numbers that are present in some DVB networks.


  Commit: d8956b9397db8e36d82118b72958bf7e9f27eb62
      https://github.com/MythTV/mythtv/commit/d8956b9397db8e36d82118b72958bf7e9f27eb62
  Author: Klaas de Waal <kdewaal at mythtv.org>
  Date:   2019-08-12 (Mon, 12 Aug 2019)

  Changed paths:
    M mythtv/libs/libmythtv/channelscan/channelimporter.cpp
    M mythtv/libs/libmythtv/channelscan/channelimporter.h

  Log Message:
  -----------
  Remove unused parameters.

Fixes compiler diagnostic about unused parameter in functions
ChannelImporter::QueryUserResolve and ChannelImporter::QueryUserInsert.


Compare: https://github.com/MythTV/mythtv/compare/da558ca5f531...d8956b9397db