diff --git a/HISTORY b/HISTORY index cfb9dbcb..470e52d2 100644 --- a/HISTORY +++ b/HISTORY @@ -7961,11 +7961,6 @@ Video Disk Recorder Revision History PrefixVideoFileName() are now static members of cVideoDirectory and need to be called with the proper prefix. + The name of the video directory is now available through cVideoDirectory::Name(). - The former global variable VideoDirectory is still there for backwards compatibility, - but will be removed in a future version. Comment out the line - #define DEPRECATED_VIDEODIR - in videodir.h and recompile your plugins to see whether your code will work without - this variable. If you get a compile error, replace it with cVideoDirectory::Name(). - Added renaming and moving recordings and folders, editing a recording's priority and lifetime, and queueing cutting jobs (inspired by the "extrecmenu" plugin from Martin Prochnow). diff --git a/videodir.c b/videodir.c index 1885a1a7..932f8ce3 100644 --- a/videodir.c +++ b/videodir.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: videodir.c 3.3 2013/10/08 13:26:41 kls Exp $ + * $Id: videodir.c 3.4 2013/10/11 09:38:07 kls Exp $ */ #include "videodir.h" @@ -19,9 +19,6 @@ #include "recording.h" #include "tools.h" -#ifdef DEPRECATED_VIDEODIR -const char *VideoDirectory = VIDEODIR; -#endif cString cVideoDirectory::name; cVideoDirectory *cVideoDirectory::current = NULL; @@ -61,9 +58,6 @@ const char *cVideoDirectory::Name(void) void cVideoDirectory::SetName(const char *Name) { name = Name; -#ifdef DEPRECATED_VIDEODIR - VideoDirectory = Name; -#endif } bool cVideoDirectory::Register(const char *FileName) diff --git a/videodir.h b/videodir.h index c604d046..f520d77b 100644 --- a/videodir.h +++ b/videodir.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: videodir.h 3.1 2013/09/11 12:19:47 kls Exp $ + * $Id: videodir.h 3.2 2013/10/11 09:37:48 kls Exp $ */ #ifndef __VIDEODIR_H @@ -13,11 +13,6 @@ #include #include "tools.h" -#define DEPRECATED_VIDEODIR -#ifdef DEPRECATED_VIDEODIR -extern const char *VideoDirectory; -#endif - class cVideoDirectory { private: static cString name;