From 14bd32b9486980a99ca552ec4eda6a11ab3a286a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 9 Feb 2013 15:35:00 +0100 Subject: Version 1.7.37 VDR developer version 1.7.37 is now available at MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.37.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.36-1.7.37.diff MD5 checksums: 602dc7e678bcfcf075da36344a337562 vdr-1.7.37.tar.bz2 34e953fcffc112f316cbfc1f53915324 vdr-1.7.36-1.7.37.diff WARNING: ======== This is a developer version. Even though I use it in my productive environment. I strongly recommend that you only use it under controlled conditions and for testing and debugging. Approaching version 2.0.0: ========================== If all goes well, there should be no more functional or API changes before the final version 2.0.0. There will just be a few more fixes. From the HISTORY file: - Now also using FindHeader() in cMpeg2Fixer::AdjTref() (pointed out by Sören Moch). - Added missing template for DVBDIR to Make.config.template (reported by Derek Kelly). - The LCARS menu now also works if the OSD has only 1bpp (two colors). - Fixed possible garbage in the remaining time of the LCARS replay display in case the hours change from two to one digit. - Fixed upscaling bitmaps. The last row and column of the scaled bitmap was not filled, which resulted in empty lines between scaled subtitles. - Fixed a leftover line in case a two line subtitle was followed by a one line subtitle on the dvbhddevice in "high level" OSD mode. - Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given. - The index file is now closed after initially reading it if it is older than 3600 seconds. - Improved responsiveness during replay when close to the recording's end. - Fixed a leftover progress display in the LCARS main menu when replay of a recording ends while the menu is open, and the live channel has no EPG information. - Fixed possible audio chatter when a recording is replayed to its very end. - Added dependency on 'i18n' to 'install-i18n' in the VDR Makefile (thanks to Tobias Grimm). - Changed several calls to Skins.Message() in vdr.c to Skins.QueueMessage() in order to avoid a black screen while such a message is displayed in case the channel will be switched (reported by Uwe Scheffler). - Updated the Slovakian language texts (thanks to Milan Hrala). - Improved LIRC timing for repeat function. - When pausing live video, the current audio and subtitle tracks are now retained. - Added some notes about plugin Makefiles to PLUGINS.html. - Avoiding an extra key press event if the repeat function kicks in when controlling VDR via the PC keyboard. - The new options "Setup/Miscellaneous/Remote control repeat delay" and "Setup/Miscellaneous/Remote control repeat delta" can be used to adjust the behavior of the remote control in case a key is held pressed down for a while, so that the repeat function kicks in (see MANUAL). The builtin LIRC and KBD remote controls already use these parameters. It is recommended that plugins that implement an interface to any kind of remote controls also use the parameters Setup.RcRepeatDelay and Setup.RcRepeatDelta for the desired purpose, and remove any setup options they might have that serve the same purpose. - cTimer no longer does any special "VFAT" handling to shorten directory names to 40 characters. When a string is used as a directory name for a recording, the maximum length of the directory path, as well as the individual directory names, is now limited to the values specified by the new command line option --dirnames (see man vdr(1) for details). For backwards compatibility the option --vfat is still available and has the same effect as --dirnames=250,40,1. - The macro MaxFileName is now obsolete and may be removed in future versions. Use NAME_MAX directly instead. - There is no more fixed limit to the maximum number of cPixmap objects an OSD can create. However, a particular device may still be unable to create an arbitrary number of pixmaps, due to limited resources. So it's always a good idea to use as few pixmaps as possible. - Fixed formatting and removed some superfluous break statements in vdr.c's command line option switch. --- vdr.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 34 deletions(-) (limited to 'vdr.c') diff --git a/vdr.c b/vdr.c index 88b8956..8bb208b 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 2.45 2012/12/06 10:29:23 kls Exp $ + * $Id: vdr.c 2.48 2013/02/08 10:47:02 kls Exp $ */ #include @@ -227,6 +227,7 @@ int main(int argc, char *argv[]) { "config", required_argument, NULL, 'c' }, { "daemon", no_argument, NULL, 'd' }, { "device", required_argument, NULL, 'D' }, + { "dirnames", required_argument, NULL, 'd' | 0x100 }, { "edit", required_argument, NULL, 'e' | 0x100 }, { "epgfile", required_argument, NULL, 'E' }, { "filesize", required_argument, NULL, 'f' | 0x100 }, @@ -266,7 +267,8 @@ int main(int argc, char *argv[]) break; case 'c': ConfigDirectory = optarg; break; - case 'd': DaemonMode = true; break; + case 'd': DaemonMode = true; + break; case 'D': if (isnumber(optarg)) { int n = atoi(optarg); if (0 <= n && n < MAXDEVICES) { @@ -276,6 +278,43 @@ int main(int argc, char *argv[]) } fprintf(stderr, "vdr: invalid DVB device number: %s\n", optarg); return 2; + case 'd' | 0x100: { + char *s = optarg; + int n = strtol(s, &s, 10); + if (n <= 0 || n >= PATH_MAX) { + fprintf(stderr, "vdr: invalid directory path length: %s\n", optarg); + return 2; + } + DirectoryPathMax = n; + if (!*s) + break; + if (*s++ != ',') { + fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); + return 2; + } + n = strtol(s, &s, 10); + if (n <= 0 || n >= NAME_MAX) { + fprintf(stderr, "vdr: invalid directory name length: %s\n", optarg); + return 2; + } + DirectoryNameMax = n; + if (!*s) + break; + if (*s++ != ',') { + fprintf(stderr, "vdr: invalid delimiter: %s\n", optarg); + return 2; + } + n = strtol(s, &s, 10); + if (n != 0 && n != 1) { + fprintf(stderr, "vdr: invalid directory encoding: %s\n", optarg); + return 2; + } + DirectoryEncoding = n; + if (*s) { + fprintf(stderr, "vdr: unexpected data: %s\n", optarg); + return 2; + } + } break; case 'e' | 0x100: return CutRecording(optarg) ? 0 : 2; @@ -302,31 +341,30 @@ int main(int argc, char *argv[]) fprintf(stderr, "vdr: invalid instance id: %s\n", optarg); return 2; case 'l': { - char *p = strchr(optarg, '.'); - if (p) - *p = 0; - if (isnumber(optarg)) { - int l = atoi(optarg); - if (0 <= l && l <= 3) { - SysLogLevel = l; - if (!p) - break; - if (isnumber(p + 1)) { - int l = atoi(p + 1); - if (0 <= l && l <= 7) { - int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; - SysLogTarget = targets[l]; - break; - } - } - } - } + char *p = strchr(optarg, '.'); + if (p) + *p = 0; + if (isnumber(optarg)) { + int l = atoi(optarg); + if (0 <= l && l <= 3) { + SysLogLevel = l; + if (!p) + break; + if (isnumber(p + 1)) { + int l = atoi(p + 1); + if (0 <= l && l <= 7) { + int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; + SysLogTarget = targets[l]; + break; + } + } + } + } if (p) *p = '.'; fprintf(stderr, "vdr: invalid log level: %s\n", optarg); return 2; } - break; case 'L': if (access(optarg, R_OK | X_OK) == 0) PluginManager.SetDirectory(optarg); else { @@ -384,7 +422,9 @@ int main(int argc, char *argv[]) case 'V': DisplayVersion = true; break; case 'v' | 0x100: - VfatFileSystem = true; + DirectoryPathMax = 250; + DirectoryNameMax = 40; + DirectoryEncoding = true; break; case 'v': VideoDirectory = optarg; while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/') @@ -399,7 +439,6 @@ int main(int argc, char *argv[]) } fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg); return 2; - break; default: return 2; } } @@ -435,6 +474,13 @@ int main(int argc, char *argv[]) " -D NUM, --device=NUM use only the given DVB device (NUM = 0, 1, 2...)\n" " there may be several -D options (default: all DVB\n" " devices will be used)\n" + " --dirnames=PATH[,NAME[,ENC]]\n" + " set the maximum directory path length to PATH\n" + " (default: %d); if NAME is also given, it defines\n" + " the maximum directory name length (default: %d);\n" + " the optional ENC can be 0 or 1, and controls whether\n" + " special characters in directory names are encoded as\n" + " hex values (default: 0)\n" " --edit=REC cut recording REC and exit\n" " -E FILE, --epgfile=FILE write the EPG data into the given FILE (default is\n" " '%s' in the video directory)\n" @@ -477,13 +523,15 @@ int main(int argc, char *argv[]) " --userdump allow coredumps if -u is given (debugging)\n" " -v DIR, --video=DIR use DIR as video directory (default: %s)\n" " -V, --version print version information and exit\n" - " --vfat encode special characters in recording names to\n" - " avoid problems with VFAT file systems\n" + " --vfat for backwards compatibility (same as\n" + " --dirnames=250,40,1\n" " -w SEC, --watchdog=SEC activate the watchdog timer with a timeout of SEC\n" " seconds (default: %d); '0' disables the watchdog\n" "\n", DEFAULTCACHEDIR, DEFAULTCONFDIR, + PATH_MAX, + NAME_MAX, DEFAULTEPGDATAFILENAME, MAXVIDEOFILESIZEDEFAULT, DEFAULTPLUGINDIR, @@ -924,7 +972,7 @@ int main(int argc, char *argv[]) Device->SetOccupied(TIMERDEVICETIMEOUT); } if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme()) - Skins.Message(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel + Skins.QueueMessage(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel } } } @@ -1095,7 +1143,7 @@ int main(int argc, char *argv[]) if (Setup.PauseKeyHandling) { if (Setup.PauseKeyHandling > 1 || Interface->Confirm(tr("Pause live video?"))) { if (!cRecordControls::PauseLiveVideo()) - Skins.Message(mtError, tr("No free DVB device to record!")); + Skins.QueueMessage(mtError, tr("No free DVB device to record!")); } } key = kNone; // nobody else needs to see this key @@ -1105,7 +1153,7 @@ int main(int argc, char *argv[]) case kRecord: if (!cControl::Control()) { if (cRecordControls::Start()) - Skins.Message(mtInfo, tr("Recording started")); + Skins.QueueMessage(mtInfo, tr("Recording started")); key = kNone; // nobody else needs to see this key } break; @@ -1157,11 +1205,11 @@ int main(int argc, char *argv[]) switch (state) { case osPause: DELETE_MENU; if (!cRecordControls::PauseLiveVideo()) - Skins.Message(mtError, tr("No free DVB device to record!")); + Skins.QueueMessage(mtError, tr("No free DVB device to record!")); break; case osRecord: DELETE_MENU; if (cRecordControls::Start()) - Skins.Message(mtInfo, tr("Recording started")); + Skins.QueueMessage(mtInfo, tr("Recording started")); break; case osRecordings: DELETE_MENU; @@ -1179,7 +1227,7 @@ int main(int argc, char *argv[]) case osSwitchDvb: DELETE_MENU; cControl::Shutdown(); - Skins.Message(mtInfo, tr("Switching primary DVB...")); + Skins.QueueMessage(mtInfo, tr("Switching primary DVB...")); cDevice::SetPrimaryDevice(Setup.PrimaryDVB); break; case osPlugin: DELETE_MENU; @@ -1249,9 +1297,9 @@ int main(int argc, char *argv[]) EITScanner.Process(); if (!cCutter::Active() && cCutter::Ended()) { if (cCutter::Error()) - Skins.Message(mtError, tr("Editing process failed!")); + Skins.QueueMessage(mtError, tr("Editing process failed!")); else - Skins.Message(mtInfo, tr("Editing process finished")); + Skins.QueueMessage(mtInfo, tr("Editing process finished")); } } -- cgit v1.2.3