~mamarley/tvheadend/+git/trunk:fixmemset

Last commit made on 2024-02-20
Get this branch:
git clone -b fixmemset https://git.launchpad.net/~mamarley/tvheadend/+git/trunk

Branch merges

Branch information

Name:
fixmemset
Repository:
lp:~mamarley/tvheadend/+git/trunk

Recent commits

ba8bdf9... by Flole998 <email address hidden>

Replace poison memset by memset_s to avoid compiler optimizing it out

6372bd0... by "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com>

intl: Translate intl/js/tvheadend.js.pot in pl

100% translated source file: 'intl/js/tvheadend.js.pot'
on 'pl'.

bdaf0f3... by "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com>

intl: Translate intl/tvheadend.pot in pl

100% translated source file: 'intl/tvheadend.pot'
on 'pl'.

2962b43... by "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com>

intl: Translate intl/js/tvheadend.js.pot in pl

100% translated source file: 'intl/js/tvheadend.js.pot'
on 'pl'.

828d438... by "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com>

intl: Translate intl/tvheadend.pot in pl

100% translated source file: 'intl/tvheadend.pot'
on 'pl'.

d98312d... by "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com>

intl: Translate intl/js/tvheadend.js.pot in pl

100% translated source file: 'intl/js/tvheadend.js.pot'
on 'pl'.

e4a4954... by "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com>

intl: Translate intl/tvheadend.pot in pl

100% translated source file: 'intl/tvheadend.pot'
on 'pl'.

b0be01c... by "E.Smith" <email address hidden>

bouquet: Allow merging of services across network bouquet, fixes #5617

In a mixed network environment (such as DVB-T and DVB-S) it is common
to receive many of the same channels. However, with "auto map to
channels" on a bouquet, you could not merge the channels across the
network bouquets.

Now we create a separate "Tvheadend Network" in the bouquets and allow
"auto map to channels" on it. Any other bouquets that are enabled but
do _not_ have "auto map to channels" enabled will be added to the
enabled "Tvheadend Network".

So, if "DVB-T Network" and "DVB-S Network" in the bouquet tab are both
enabled _and_ their tickbox for "auto map to channels" is deselected,
then their services will be added to the "Tvheadend Network". That can
then be enabled with "merge channels" to produce the merged channels.

We call it "Tvheadend Network" instead of "Tvheaded Virtual Bouquet"
to be consistent with the other auto-generated names.

The new bouquet is lazily updated to ensure the CPU overhead is
minimized. This means that when other bouquets are scanned, we wait
until the system is quiet before updating the new bouquet with
the new channels.

Fixes: #5617

075e6cd... by Flole998 <email address hidden>

ci: Use correct version of merge commit block action

757eaa9... by Flole998 <email address hidden>

ci: Block merge or autosquash commits in PRs