[easytag/wip/et_core-refactor: 4/9] Move EtPicture declaration to picture.h

[David King <davidk src gnome org>]

commit bb9ce6f6bc4a4318c4b4b3dbc07079c91d04caff
Author: David King <amigadave amigadave com>
Date:   Sun Dec 28 18:58:30 2014 +0000

    Move EtPicture declaration to picture.h

 src/et_core.h |   17 +----------------
 src/picture.h |   35 +++++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 30 deletions(-)
---
diff --git a/src/et_core.h b/src/et_core.h
index e85f675..5b683a9 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -28,6 +28,7 @@ G_BEGIN_DECLS
 #include <gdk/gdk.h>
 
 #include "core_types.h"
+#include "picture.h"
 
 /*
  * Colors Used (see declaration into et_core.c)
@@ -47,22 +48,6 @@ struct _File_Name
     gchar *value_ck;       /* Collate key of "value_utf8" to speed up comparaison */
 };
 
-
-/*
- * Description of EtPicture item (see picture.h)
- */
-typedef struct _EtPicture EtPicture;
-struct _EtPicture
-{
-    gint type;
-    gchar *description;
-    gint width; /* Original width of the picture */
-    gint height; /* Original height of the picture */
-    GBytes *bytes;
-    EtPicture *next;
-};
-
-
 /*
  * Description of each item of the TagList list
  */
diff --git a/src/picture.h b/src/picture.h
index 19185ff..34a8ab5 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -20,27 +20,14 @@
 #ifndef ET_PICTURE_H_
 #define ET_PICTURE_H_
 
-#include <glib-object.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
 #include "core_types.h"
-#include "et_core.h"
 
 #define ET_TYPE_PICTURE (et_picture_get_type ())
 
-/* Defined in et_core.h
-typedef struct _Picture Picture;
-struct _Picture
-{
-    gint     type;
-    gchar   *description;
-    gint     width;         // Original width of the picture
-    gint     height;        // Original height of the picture
-    GBytes *bytes;
-    Picture *next;
-};*/
-
 typedef enum // Picture types
 {
     // Same values for FLAC, see: http://flac.sourceforge.net/api/group__flac__format.html#ga113
@@ -69,6 +56,26 @@ typedef enum // Picture types
     ET_PICTURE_TYPE_UNDEFINED
 } EtPictureType;
 
+/*
+ * EtPicture:
+ * @type: type of cover art
+ * @description: string to describe the image, often a suitable filename
+ * @width: original width, or 0 if unknown
+ * @height: original height, or 0 if unknown
+ * @bytes: image data
+ * @next: next image data in the list, or %NULL
+ */
+typedef struct _EtPicture EtPicture;
+struct _EtPicture
+{
+    EtPictureType type;
+    gchar *description;
+    gint width;
+    gint height;
+    GBytes *bytes;
+    EtPicture *next;
+};
+
 typedef enum
 {
     PICTURE_FORMAT_JPEG,