Moved service id into the service interface

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5846 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

2 files changed, 7 insertions, 4 deletions

diff --git a/src/childlock.cpp b/src/childlock.cpp
index 3ca7d69..38f6d20 100644
--- a/src/childlock.cpp
+++ b/src/childlock.cpp
@@ -79,7 +79,7 @@ IChildLockService* ChildLock::ChildLockService()
     {
         IChildLockService* childLockService;
 
-        if (cPluginManager::CallFirstService(CHILDLOCKSERVICEID, &childLockService))
+        if (cPluginManager::CallFirstService(IChildLockService::ServiceId, &childLockService))
         {
             _childLockService = childLockService;
         }
diff --git a/src/childlockservice.h b/src/childlockservice.h
index 28a3ca4..8c6faa9 100644
--- a/src/childlockservice.h
+++ b/src/childlockservice.h
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id:$
+ * $Id$
  *
  */
 
@@ -32,11 +32,12 @@ class cTimer;
 class cEvent;
 class cOsdObject;
 
-#define CHILDLOCKSERVICEID "ChildLockService-v0.1::ChildLockService"
-
 class IChildLockService
 {
     public:
+        static const char* ServiceId;
+
+    public:
         virtual ~IChildLockService() {};
         virtual bool IsUnlocked() = 0;
 
@@ -50,4 +51,6 @@ class IChildLockService
         virtual bool IsRecordingHidden(const cRecording* Recording, const char* Name, const char* Base, bool isDirectory) = 0;
 };
 
+const char* IChildLockService::ServiceId = "ChildLockService-v0.1::ChildLockService";
+
 #endif