Renamed things to improive the API and implemented the mandatory State

Changed handler. Added access methods to Resource.

1 files changed, 30 insertions, 19 deletions

diff --git a/include/resource-types.h b/include/resource-types.h
index 5732251..57c6bfc 100644
--- a/include/resource-types.h
+++ b/include/resource-types.h
@@ -1,24 +1,35 @@
 #ifndef RESOURCE_TYPES_H
 #define RESOURCE_TYPES_H
-enum ResourceClass {
-    InvalidClass = 0,
-    VoIPClass,
-    CallClass = VoIPClass,
-    MediaClass,
-    BackgroundClass,
-    RingtoneClass,
-    VoiceUIClass,
-    CameraClass,
-    GameClass,
-    AlarmClass,
-    FlashClass,
-    SystemClass,
-    InputClass
-};
 
-#define RP_FLAGS_AUDIO 0x01
-#define RP_FLAGS_VIDEO 0x02
-#define RP_FLAGS_AUDIO_RECORDING 0x04
-#define RP_FLAGS_VIDEO_RECORDING 0x08
+namespace ResourceTypes {
 
+   enum ResourceClass {
+	   InvalidClass = 0,
+	   VoIPClass,
+	   CallClass = VoIPClass,
+	   MediaClass,
+	   BackgroundClass,
+	   RingtoneClass,
+	   VoiceUIClass,
+	   CameraClass,
+	   GameClass,
+	   AlarmClass,
+	   FlashClass,
+	   SystemClass,
+	   InputClass
+   };
+
+   enum ResourceType {
+	   AudioResource = 0x01,
+	   VideoResource = 0x02,
+	   AudioRecorderResource = 0x04,
+	   VideoRecorderResource = 0x08
+   };
+
+   enum ResourceState {
+	   UnknownState,
+	   NotOwnedState,
+	   OwnedState
+   };
+}
 #endif