From 8c55ada0af204e7212d2359d221c4f5c632454d8 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 31 Mar 2006 14:12:53 +0200 Subject: [PATCH] Fixed 'sources.conf' and 'diseqc.conf' --- CONTRIBUTORS | 3 +++ HISTORY | 5 ++++- diseqc.conf | 24 ++++++++++++------------ sources.conf | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index ed374f51..4a21c4a4 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1519,6 +1519,7 @@ Luca Olivetti for suggesting to make the "Menu" key behave consistently for suggesting to implement a timeout for remote controls that don't deliver "repeat" keypresses very fast + for reporting a broken entry 'A111.1W' in sources.conf Mikko Salo for suggesting to make the setup option "DVB/Video display format" available only @@ -1545,6 +1546,7 @@ Ville Skytt for making the cLircRemote try to reestablish the connection to the LIRC daemon in case it breaks for enabling generating a core dump if VDR is run with a different user id + for reporting an obsolete entry 'S21.5E' in the default 'diseqc.conf' Steffen Beyer for fixing setting the colored button help after deleting a recording in case the next @@ -1795,6 +1797,7 @@ Jan Lenz Oleg Roitburd for translating OSD texts to the Russian language + for updating 'sources.conf' Marius Heidenstecker for suggesting to make cMenuRecordings::GetRecording() 'protected' diff --git a/HISTORY b/HISTORY index f5073beb..7826b527 100644 --- a/HISTORY +++ b/HISTORY @@ -4428,7 +4428,7 @@ Video Disk Recorder Revision History Rolf Ahrenberg). - Fixed cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is false (thanks to Werner Fink). -- Updated 'sources.conf'. +- Updated 'sources.conf' (thanks to Oleg Roitburd). - Fixed the shutdown timeout (thanks to Alexander Wenzel). - Only calling RemoveEmptyVideoDirectories() once in case a recording has been deleted (reported by Hardy Flor). @@ -4462,3 +4462,6 @@ Video Disk Recorder Revision History to detect these). - Added a missing "Button$" for the Timer button and "Key$" in skinclassic.c (thanks to Rolf Ahrenberg). +- Fixed broken entry 'A111.1W' in sources.conf (reported by Luca Olivetti). +- Replaced the obsolete entry 'S21.5E' in the default 'diseqc.conf' with 'S13.0E' + (reported by Ville Skyttä). diff --git a/diseqc.conf b/diseqc.conf index 9708327c..3dfc7036 100644 --- a/diseqc.conf +++ b/diseqc.conf @@ -32,10 +32,10 @@ S19.2E 99999 V 10600 t v W15 [E0 10 38 F1] W15 A W15 T S19.2E 11700 H 9750 t V W15 [E0 10 38 F2] W15 A W15 t S19.2E 99999 H 10600 t V W15 [E0 10 38 F3] W15 A W15 T -S21.5E 11700 V 9750 t v W15 [E0 10 38 F4] W15 B W15 t -S21.5E 99999 V 10600 t v W15 [E0 10 38 F5] W15 B W15 T -S21.5E 11700 H 9750 t V W15 [E0 10 38 F6] W15 B W15 t -S21.5E 99999 H 10600 t V W15 [E0 10 38 F7] W15 B W15 T +S13.0E 11700 V 9750 t v W15 [E0 10 38 F4] W15 B W15 t +S13.0E 99999 V 10600 t v W15 [E0 10 38 F5] W15 B W15 T +S13.0E 11700 H 9750 t V W15 [E0 10 38 F6] W15 B W15 t +S13.0E 99999 H 10600 t V W15 [E0 10 38 F7] W15 B W15 T # Optimized for mini DiSEqC (aka toneburst): # @@ -44,10 +44,10 @@ S21.5E 99999 H 10600 t V W15 [E0 10 38 F7] W15 B W15 T # S19.2E 11700 H 9750 t V W15 A W15 t # S19.2E 99999 H 10600 t V W15 A W15 T # -# S21.5E 11700 V 9750 t v W15 B W15 t -# S21.5E 99999 V 10600 t v W15 B W15 T -# S21.5E 11700 H 9750 t V W15 B W15 t -# S21.5E 99999 H 10600 t V W15 B W15 T +# S13.0E 11700 V 9750 t v W15 B W15 t +# S13.0E 99999 V 10600 t v W15 B W15 T +# S13.0E 11700 H 9750 t V W15 B W15 t +# S13.0E 99999 H 10600 t V W15 B W15 T # # Optimized for full DiSEqC: # @@ -56,10 +56,10 @@ S21.5E 99999 H 10600 t V W15 [E0 10 38 F7] W15 B W15 T # S19.2E 11700 H 9750 [E0 10 38 F2] # S19.2E 99999 H 10600 [E0 10 38 F3] # -# S21.5E 11700 V 9750 [E0 10 38 F4] -# S21.5E 99999 V 10600 [E0 10 38 F5] -# S21.5E 11700 H 9750 [E0 10 38 F6] -# S21.5E 99999 H 10600 [E0 10 38 F7] +# S13.0E 11700 V 9750 [E0 10 38 F4] +# S13.0E 99999 V 10600 [E0 10 38 F5] +# S13.0E 11700 H 9750 [E0 10 38 F6] +# S13.0E 99999 H 10600 [E0 10 38 F7] # # DisiCon-4 Single Cable Network: # diff --git a/sources.conf b/sources.conf index e770496a..09ee0a41 100644 --- a/sources.conf +++ b/sources.conf @@ -165,7 +165,7 @@ S103W AMC1 S105W AMC15 S107.3W Anik F1/F1R S110W DirecTV 5 & Echostar 6/8 -A111.1W Anik F2 +S111.1W Anik F2 S113W Solidaridad 2 S119W Echostar 7 & DirecTV 7S S121W Echostar 9 & Intelsat Americas 13