aboutsummaryrefslogtreecommitdiff
path: root/multimedia/vdr/files/patch-initialchannel
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/vdr/files/patch-initialchannel')
-rw-r--r--multimedia/vdr/files/patch-initialchannel33
1 files changed, 0 insertions, 33 deletions
diff --git a/multimedia/vdr/files/patch-initialchannel b/multimedia/vdr/files/patch-initialchannel
deleted file mode 100644
index cb658665a03d..000000000000
--- a/multimedia/vdr/files/patch-initialchannel
+++ /dev/null
@@ -1,33 +0,0 @@
---- config.c.orig
-+++ config.c
-@@ -399,7 +399,7 @@ cSetup::cSetup(void)
- CurrentChannel = -1;
- CurrentVolume = MAXVOLUME;
- CurrentDolby = 0;
-- // InitialChannel is initialized by constructor
-+ InitialChannel = "";
- InitialVolume = -1;
- ChannelsWrap = 0;
- EmergencyExit = 1;
---- vdr.c.orig
-+++ vdr.c
-@@ -735,12 +723,14 @@ int main(int argc, char *argv[])
-
- if (!cDevice::WaitForAllDevicesReady(DEVICEREADYTIMEOUT))
- dsyslog("not all devices ready after %d seconds", DEVICEREADYTIMEOUT);
-- if (isnumber(Setup.InitialChannel)) { // for compatibility with old setup.conf files
-- if (cChannel *Channel = Channels.GetByNumber(atoi(Setup.InitialChannel)))
-- Setup.InitialChannel = Channel->GetChannelID().ToString();
-+ if (*Setup.InitialChannel) {
-+ if (isnumber(Setup.InitialChannel)) { // for compatibility with old setup.conf files
-+ if (cChannel *Channel = Channels.GetByNumber(atoi(Setup.InitialChannel)))
-+ Setup.InitialChannel = Channel->GetChannelID().ToString();
-+ }
-+ if (cChannel *Channel = Channels.GetByChannelID(tChannelID::FromString(Setup.InitialChannel)))
-+ Setup.CurrentChannel = Channel->Number();
- }
-- if (cChannel *Channel = Channels.GetByChannelID(tChannelID::FromString(Setup.InitialChannel)))
-- Setup.CurrentChannel = Channel->Number();
- if (Setup.InitialVolume >= 0)
- Setup.CurrentVolume = Setup.InitialVolume;
- Channels.SwitchTo(Setup.CurrentChannel);