[Rawstudio-commit] r2046 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-29 02:06:38 +0200 (Mon, 29 Sep 2008)
New Revision: 2046

Modified:
   trunk/src/rawstudio.h
   trunk/src/rs-metadata.h
Log:
Moved RS_MAKE-enum to rs-metadata.h.

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-09-29 00:04:00 UTC (rev 2045)
+++ trunk/src/rawstudio.h	2008-09-29 00:06:38 UTC (rev 2046)
@@ -54,24 +54,6 @@
 #define MASK_WB (MASK_WARMTH|MASK_TINT)
 
 enum {
-	MAKE_UNKNOWN = 0,
-	MAKE_CANON,
-	MAKE_EPSON,
-	MAKE_FUJIFILM,
-	MAKE_KODAK,
-	MAKE_LEICA,
-	MAKE_MINOLTA,
-	MAKE_NIKON,
-	MAKE_OLYMPUS,
-	MAKE_PANASONIC,
-	MAKE_PENTAX,
-	MAKE_PHASEONE,
-	MAKE_SAMSUNG,
-	MAKE_SIGMA,
-	MAKE_SONY,
-};
-
-enum {
 	MASK_OVER = 128,
 	MASK_UNDER = 64,
 };

Modified: trunk/src/rs-metadata.h
===================================================================
--- trunk/src/rs-metadata.h	2008-09-29 00:04:00 UTC (rev 2045)
+++ trunk/src/rs-metadata.h	2008-09-29 00:06:38 UTC (rev 2046)
@@ -32,10 +32,28 @@
 #define RS_IS_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RS_TYPE_METADATA))
 #define RS_METADATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RS_TYPE_METADATA, RSMetadataClass))
 
+typedef enum {
+	MAKE_UNKNOWN = 0,
+	MAKE_CANON,
+	MAKE_EPSON,
+	MAKE_FUJIFILM,
+	MAKE_KODAK,
+	MAKE_LEICA,
+	MAKE_MINOLTA,
+	MAKE_NIKON,
+	MAKE_OLYMPUS,
+	MAKE_PANASONIC,
+	MAKE_PENTAX,
+	MAKE_PHASEONE,
+	MAKE_SAMSUNG,
+	MAKE_SIGMA,
+	MAKE_SONY,
+} RS_MAKE;
+
 struct _RSMetadata {
 	GObject parent;
 	gboolean dispose_has_run;
-	gint make;
+	RS_MAKE make;
 	gchar *make_ascii;
 	gchar *model_ascii;
 	gchar *time_ascii;