summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2005-01-23 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2005-01-23 18:00:00 +0100
commite36fe18c483b8e520752f61975e44ddd0317a332 (patch)
tree83cbf9e5ec53bcf099f702028f9d6720f5fe13ce /vdr.c
parentfb5cccb2df60361a18fe3fd572b0fe18f3a4331c (diff)
downloadvdr-patch-lnbsharing-e36fe18c483b8e520752f61975e44ddd0317a332.tar.gz
vdr-patch-lnbsharing-e36fe18c483b8e520752f61975e44ddd0317a332.tar.bz2
Version 1.3.19vdr-1.3.19
- Making sure at least the default skin is available at program start in case a plugin needs to issue an error message (thanks to Achim Tuffentshammer for reporting a crash in such a case). Also checking if there is a current skin in cSkins::Message(). - Completed the Finnish OSD texts and fixed internationalization of the text for "Setup/DVB/Audio language(s)" (thanks to Rolf Ahrenberg). - Completed the Estonian OSD texts and switched to iso8859-13 character set (thanks to Arthur Konovalov). - Made cCondWait::SleepMs() sleep at least 3ms to avoid a possible busy wait. - Fixed canceling the LIRC thread (thanks to Marco Schlüßler for pointing out this one). - The "Green" button in the "Main" menu is now always "Audio", since the audio channel might be changed even if there is only one actual audio PID. - Fixed handling the '-E' option which was broken in version 1.3.18 (thanks to Christian Jacobsen for reporting this one). - Added 'channels.conf.terr' entries for Mainz (thanks to Michael Heyse). - Implemented cDolbyRepacker for better handling of Dolby Digital PES packets (thanks to Reinhard Nissl). - Fixed playing files with PES packets longer than 2048 byte through the full featured DVB card (thanks to Marco Kremer for reporting this one and providing a test sample). - Recording and Transfer Mode now handle more than 2 audio PIDs. For this the interfaces of the following functions have been changed: cTransferControl::cTransferControl() cTransfer::cTransfer() cRecorder::cRecorder() cReceiver::cReceiver() cRemux::cRemux() - Fixed a possible race condition in cDevice::Action() and cTSBuffer::Action() (thanks to Stefan Huelswitt). - Extended some buffer sizes to allow handling HDTV streams (thanks to Reinhard Nissl). - Added 'channels.conf.terr' entries for Düsseldorf and Köln (thanks to Walter Koch). - Falling back to 'stereo' when switching channels in case the user had switched to 'left' or 'right' (suggested by Rolf Groppe). - Completed the Danish OSD texts (thanks to Mogens Elneff). - Recording and Transfer Mode can now handle up to 8 Dolby Digital tracks (thanks to Marco Schlüßler for a patch that implements substream handling into cDevice::PlayPesPacket(), and Reinhard Nissl for adding substream handling to cDolbyRepacker). - Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer to avoid overflows (thanks to Marco Schlüßler for pointing this out).
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/vdr.c b/vdr.c
index 5c82372..d1f8c4a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.198 2005/01/06 14:36:40 kls Exp $
+ * $Id: vdr.c 1.200 2005/01/14 16:50:39 kls Exp $
*/
#include <getopt.h>
@@ -412,7 +412,10 @@ int main(int argc, char *argv[])
}
else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
EpgDirectory = VideoDirectory;
- cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+ if (EpgDirectory)
+ cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+ else
+ cSchedules::SetEpgDataFileName(EpgDataFileName);
cSchedules::Read();
}
@@ -460,15 +463,20 @@ int main(int argc, char *argv[])
Interface = new cInterface(SVDRPport);
+ // Default skins:
+
+ new cSkinClassic;
+ new cSkinSTTNG;
+ Skins.SetCurrent(Setup.OSDSkin);
+ cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
+
// Start plugins:
if (!PluginManager.StartPlugins())
EXIT(2);
- // Skins:
+ // Set skin and theme in case they're implemented by a plugin:
- new cSkinClassic;
- new cSkinSTTNG;
Skins.SetCurrent(Setup.OSDSkin);
cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());