From 1fac7f5af9e503437e534ed8f4c44a6804634df5 Mon Sep 17 00:00:00 2001 From: MegaV0lt Date: Mon, 3 May 2021 12:32:32 +0200 Subject: [PATCH 1/4] Disable sorting by name Temporarly disabled, because channellist also gets sorted bay names. This causes duplicate channels appear side-by-side --- vdradmind.pl | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/vdradmind.pl b/vdradmind.pl index acb9686..f569821 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -1100,10 +1100,11 @@ sub ChanTree { $CHAN{$CHAN_RADIO}->{channels} = \@CHANNELS_RADIO; } - # Sort channel lists by channel name - foreach my $idx (keys(%CHAN)) { - @{$CHAN{$idx}->{channels}} = sort {$a->{name} cmp $b->{name}} @{$CHAN{$idx}->{channels}} - } + # Temporarly disabled, because channellist also gets sortd ba names. this couses duplicate channels appear side-by-side + # Sort channel lists by channel name + #foreach my $idx (keys(%CHAN)) { + # @{$CHAN{$idx}->{channels}} = sort {$a->{name} cmp $b->{name}} @{$CHAN{$idx}->{channels}} + #} } sub getChannelGroups { @@ -1164,7 +1165,7 @@ sub get_name_from_uniqid { # return $_->{name} if ($_->{uniq_id} eq $uniq_id); # } - # Es darf nach Spec nur eine Übereinstimmung geben + # Es darf nach Spec nur eine Ãœbereinstimmung geben if (scalar(@C) == 1) { return $C[0]->{name}; } @@ -1178,7 +1179,7 @@ sub get_name_from_vdrid { # Kanalliste nach identischer vdr_id durchsuchen my @C = grep($_->{vdr_id} == $vdr_id, @{$CHAN{$CHAN_FULL}->{channels}}); - # Es darf nach Spec nur eine Übereinstimmung geben + # Es darf nach Spec nur eine Ãœbereinstimmung geben if (scalar(@C) == 1) { return $C[0]->{name}; } @@ -1192,7 +1193,7 @@ sub get_channel_from_vdrid { # Kanalliste nach identischer vdr_id durchsuchen my @C = grep($_->{vdr_id} == $vdr_id, @{$CHAN{$CHAN_FULL}->{channels}}); - # Es darf nach Spec nur eine Übereinstimmung geben + # Es darf nach Spec nur eine Ãœbereinstimmung geben if (scalar(@C) == 1) { return $C[0]; } @@ -1206,7 +1207,7 @@ sub get_transponder_from_vdrid { # Kanalliste nach identischer vdr_id durchsuchen my @C = grep($_->{vdr_id} == $vdr_id, @{$CHAN{$CHAN_FULL}->{channels}}); - # Es darf nach Spec nur eine Übereinstimmung geben + # Es darf nach Spec nur eine Ãœbereinstimmung geben if (scalar(@C) == 1) { return ("$C[0]->{source}-$C[0]->{frequency}-$C[0]->{polarization}"); } @@ -1220,7 +1221,7 @@ sub get_ca_from_vdrid { # Kanalliste nach identischer vdr_id durchsuchen my @C = grep($_->{vdr_id} == $vdr_id, @{$CHAN{$CHAN_FULL}->{channels}}); - # Es darf nach Spec nur eine Übereinstimmung geben + # Es darf nach Spec nur eine Ãœbereinstimmung geben if (scalar(@C) == 1) { return ($C[0]->{ca}); } @@ -3031,7 +3032,7 @@ sub epgsearch_Param2Line { $directory =~ s/:/\|/g; } - #TODO: $searchtimer_from & $searchtimer_until auf korrektes Format prüfen + #TODO: $searchtimer_from & $searchtimer_until auf korrektes Format prüfen my $searchtimer_from = $q->param("searchtimer_from"); if ($searchtimer_from) { $searchtimer_from = my_mktime("0", "0", substr($searchtimer_from, 8, 2), substr($searchtimer_from, 5, 2) - 1, substr($searchtimer_from, 0, 4)); @@ -5342,7 +5343,7 @@ sub encode_RecTitle { # VFAT on for ($i = 0 ; $i < length($title) ; $i++) { $c = substr($title, $i, 1); - unless ($c =~ /[öäüßÖÄÜA-Za-z0123456789_!@\$%&()+,.\-;=~ ]/) { + unless ($c =~ /[öäüßÖÄÜA-Za-z0123456789_!@\$%&()+,.\-;=~ ]/) { $newtitle .= sprintf("#%02X", ord($c)); } else { $newtitle .= $c; From c61feca6c5c78b1f07f4f82b72c5bc0538ad1401 Mon Sep 17 00:00:00 2001 From: MegaV0lt Date: Mon, 12 Dec 2022 12:21:44 +0100 Subject: [PATCH 2/4] Change Values to match fullhd --- vdradmind.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vdradmind.pl b/vdradmind.pl index f569821..c8fd4fd 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -7107,8 +7107,8 @@ sub grab_picture { $CONFIG{TV_SIZE} = $q->param("size") if($q->param("size")); $CONFIG{TV_SIZE} = "half" unless($CONFIG{TV_SIZE}); - my $maxwidth = 960; - my $maxheight = 540; + my $maxwidth = 1920; # FullHD + my $maxheight = 1080; my ($width, $height); if ($CONFIG{TV_SIZE} eq "full") { ($width, $height) = ($maxwidth, $maxheight); From ef34797ddea2942dec854a27933df46bdace2bab Mon Sep 17 00:00:00 2001 From: MegaV0lt Date: Mon, 12 Dec 2022 12:24:11 +0100 Subject: [PATCH 3/4] Adapt values to match fullhd --- template/default/tv.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/default/tv.html b/template/default/tv.html index 506b1ec..ddbba3e 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -41,7 +41,7 @@ tmpImage.src = "&size=" + size + "&interval=" + interval + "&rand=" + Before.getTime(); //TODO: wait until (tmpImage.complete == true)? document.Bild.src = tmpImage.src; - document.getElementById('sect_tv').style.width = (size == 'full' ? 780 : (size == 'half' ? 400 : 210)) + "px"; + document.getElementById('sect_tv').style.width = (size == 'full' ? 1920 : (size == 'half' ? 960 : 480)) + "px"; if(interval > 0) { After = new Date(); wait_sec = (interval * 1000) - (After - Before); @@ -68,8 +68,8 @@ } function tv_open() { - width = (size == 'full' ? 780 : (size == 'half' ? 400 : 210)) + 350; - height = (size == 'full' ? 576 : 525) + 60; + width = (size == 'full' ? 1920 : (size == 'half' ? 960 : 480)) + 350; + height = (size == 'full' ? 1080 : 520) + 60; window.open("./vdradmin.pl?aktion=tv_show&new_win=1&full_tv=1", "vdradminTV", "width=" + width + ", height=" + height + ", resizable=yes, scrollbars=no, status=no, toolbar=no, menubar=no, location=no"); } //--> From 645e05076be6ffc2698bcaf2695bc977b91ebacf Mon Sep 17 00:00:00 2001 From: MegaV0lt Date: Tue, 7 Feb 2023 22:24:44 +0100 Subject: [PATCH 4/4] Update vdradmind.pl Fix typo in comment --- vdradmind.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdradmind.pl b/vdradmind.pl index c8fd4fd..ba5d410 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -1100,7 +1100,7 @@ sub ChanTree { $CHAN{$CHAN_RADIO}->{channels} = \@CHANNELS_RADIO; } - # Temporarly disabled, because channellist also gets sortd ba names. this couses duplicate channels appear side-by-side + # Temporarly disabled, because channellist also gets sorted by names. This causes duplicate channels appear side-by-side # Sort channel lists by channel name #foreach my $idx (keys(%CHAN)) { # @{$CHAN{$idx}->{channels}} = sort {$a->{name} cmp $b->{name}} @{$CHAN{$idx}->{channels}}