[PATCH 06/15] core: Moved GrlMetadataResolutionFlags into grl-operation-options.h



From: Guillaume Emont <gemont igalia com>

---
 src/grl-metadata-source.h   |   18 ++----------------
 src/grl-operation-options.h |   16 ++++++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/grl-metadata-source.h b/src/grl-metadata-source.h
index 1d65eee..a0505d7 100644
--- a/src/grl-metadata-source.h
+++ b/src/grl-metadata-source.h
@@ -35,6 +35,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <grl-operation-options.h>
+
 /* Macros */
 
 #define GRL_TYPE_METADATA_SOURCE                \
@@ -64,22 +66,6 @@
                               GrlMetadataSourceClass))
 
 /**
- * GrlMetadataResolutionFlags:
- * @GRL_RESOLVE_NORMAL: Normal mode.
- * @GRL_RESOLVE_FULL: Try other plugins if necessary.
- * @GRL_RESOLVE_IDLE_RELAY: Use idle loop to relay results.
- * @GRL_RESOLVE_FAST_ONLY: Only resolve fast metadata keys.
- *
- * GrlMetadata resolution flags
- */
-typedef enum {
-  GRL_RESOLVE_NORMAL     = 0,        /* Normal mode */
-  GRL_RESOLVE_FULL       = (1 << 0), /* Try other plugins if necessary */
-  GRL_RESOLVE_IDLE_RELAY = (1 << 1), /* Use idle loop to relay results */
-  GRL_RESOLVE_FAST_ONLY  = (1 << 2), /* Only resolve fast metadata keys */
-} GrlMetadataResolutionFlags;
-
-/**
  * GrlMetadataWritingFlags:
  * @GRL_WRITE_NORMAL: Normal mode.
  * @GRL_WRITE_FULL: Try other plugins if necessary.
diff --git a/src/grl-operation-options.h b/src/grl-operation-options.h
index f00d320..e433eff 100644
--- a/src/grl-operation-options.h
+++ b/src/grl-operation-options.h
@@ -56,6 +56,22 @@ typedef struct {
 #define IS_GRL_OPERATION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GRL_OPERATION_OPTIONS_TYPE))
 #define GRL_OPERATION_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GRL_OPERATION_OPTIONS_TYPE, GrlOperationOptionsClass))
 
+/**
+ * GrlMetadataResolutionFlags:
+ * @GRL_RESOLVE_NORMAL: Normal mode.
+ * @GRL_RESOLVE_FULL: Try other plugins if necessary.
+ * @GRL_RESOLVE_IDLE_RELAY: Use idle loop to relay results.
+ * @GRL_RESOLVE_FAST_ONLY: Only resolve fast metadata keys.
+ *
+ * GrlMetadata resolution flags
+ */
+typedef enum {
+  GRL_RESOLVE_NORMAL     = 0,        /* Normal mode */
+  GRL_RESOLVE_FULL       = (1 << 0), /* Try other plugins if necessary */
+  GRL_RESOLVE_IDLE_RELAY = (1 << 1), /* Use idle loop to relay results */
+  GRL_RESOLVE_FAST_ONLY  = (1 << 2), /* Only resolve fast metadata keys */
+} GrlMetadataResolutionFlags;
+
 #define GRL_COUNT_INFINITY (-1)
 
 GType grl_operation_options_get_type (void);
-- 
1.7.5.4



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]