From 580dae2183e27ccec00f127b85188df143f49c54 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Tue, 12 Jun 2012 10:21:55 +0200
Subject: Generate enum types from source

It became a little unwieldy to create the enum types manually via
g_enums_register_static(). This changeset creates the types from enum
definitions in public headers using glib2-mkenum.

Be sure to include uca-enums.h in every source file that needs to know GObject
enum type.
---
 src/uca-camera.c | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

(limited to 'src/uca-camera.c')

diff --git a/src/uca-camera.c b/src/uca-camera.c
index fcb2ab7..5844eef 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -18,6 +18,7 @@
 #include <glib.h>
 #include "config.h"
 #include "uca-camera.h"
+#include "uca-enums.h"
 
 #ifdef HAVE_PCO_CL
 #include "cameras/uca-pco-camera.h"
@@ -35,6 +36,14 @@
 
 G_DEFINE_TYPE(UcaCamera, uca_camera, G_TYPE_OBJECT)
 
+/**
+ * UcaCameraTrigger:
+ * @UCA_CAMERA_TRIGGER_AUTO: Trigger automatically
+ * @UCA_CAMERA_TRIGGER_EXTERNAL: Trigger from an external source
+ * @UCA_CAMERA_TRIGGER_INTERNAL: Trigger internally from software using
+ *      #uca_camera_trigger
+ */
+
 /**
  * UcaCameraError:
  * @UCA_CAMERA_ERROR_NOT_FOUND: Camera type is unknown
@@ -103,31 +112,6 @@ struct _UcaCameraPrivate {
     gboolean transfer_async;
 };
 
-/**
- * UcaCameraTrigger:
- * @UCA_CAMERA_TRIGGER_AUTO: Trigger automatically
- * @UCA_CAMERA_TRIGGER_EXTERNAL: Trigger from an external source
- * @UCA_CAMERA_TRIGGER_INTERNAL: Trigger internally from software using
- *      #uca_camera_trigger
- */
-static GType uca_camera_trigger_get_type(void)
-{
-    static GType camera_trigger_type = 0;
-
-    if (!camera_trigger_type) {
-        static GEnumValue trigger_types[] = {
-            { UCA_CAMERA_TRIGGER_AUTO,      "Automatic internal camera trigger",  "auto" },
-            { UCA_CAMERA_TRIGGER_EXTERNAL,  "External trigger",                   "external" },
-            { UCA_CAMERA_TRIGGER_INTERNAL,  "Internal software trigger",          "internal" },
-            { 0, NULL, NULL }
-        }; 
-
-        camera_trigger_type = g_enum_register_static("UcaCameraTrigger", trigger_types);
-    }
-
-    return camera_trigger_type;
-}
-
 static void uca_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
     UcaCameraPrivate *priv = UCA_CAMERA_GET_PRIVATE(object);
-- 
cgit v1.2.3