Deactivated definition of __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS (recording.h) and LEGACY_CRECEIVER (receiver.h)

3 files changed, 9 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index 5913f8c9..a290893e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7022,3 +7022,8 @@ Video Disk Recorder Revision History
 - Removed the obsolete function cPlugin::RegisterI18n().
 - Removed the obsolete typedef tI18nPhrase.
 - Adapted menu column widths of 'skincurses' to the wider HD OSD sizes.
+- Deactivated definition of __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS (recording.h)
+  and LEGACY_CRECEIVER (receiver.h) to trigger an error for any plugin that still
+  uses the respective code. You can reactivate these to quickly make your plugin
+  compile again, but beware that these code parts will be removed in one of the next
+  versions.
diff --git a/receiver.h b/receiver.h
index ec9d8021..efa7be87 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 2.5 2012/03/01 09:50:24 kls Exp $
+ * $Id: receiver.h 2.6 2012/03/11 15:25:40 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -14,7 +14,7 @@
 
 #define MAXRECEIVEPIDS  64 // the maximum number of PIDs per receiver
 
-#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
+//#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version
 
 class cReceiver {
   friend class cDevice;
diff --git a/recording.h b/recording.h
index 61ec2a64..8e6b4b13 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 2.27 2012/02/19 10:44:53 kls Exp $
+ * $Id: recording.h 2.28 2012/03/11 15:26:01 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -22,7 +22,7 @@
 #define TIMERMACRO_TITLE    "TITLE"
 #define TIMERMACRO_EPISODE  "EPISODE"
 
-#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
+//#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
 
 extern bool VfatFileSystem;
 extern int InstanceId;