[libdmapsharing] Start refactor of MLCL_Bits / share_bitwise_t so that share can be passed to add_entry_to_mlcl() Sig

[W. Michael Petullo <wmpetullo src gnome org>]

commit 8aefe3eeab3441109834cfde5f90b804614eb5d7
Author: W. Michael Petullo <mike flyn org>
Date:   Sat Mar 19 19:10:21 2011 -0500

    Start refactor of MLCL_Bits / share_bitwise_t so that share can be passed to add_entry_to_mlcl()
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/daap-share.c |    2 +-
 libdmapsharing/dmap-share.c |   17 +++++++++--------
 libdmapsharing/dmap-share.h |    5 +++++
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index 74def68..46afb0c 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -615,7 +615,7 @@ add_entry_to_mlcl (gpointer id, DMAPRecord * record, gpointer _mb)
 		gchar *transcode_mimetype = NULL;
 
 		/* FIXME: This should be share, not record: */
-		g_object_get (record, "transcode-mimetype",
+		g_object_get (mb->share, "transcode-mimetype",
 			      &transcode_mimetype, NULL);
 		if (transcode_mimetype) {
 			format = g_strdup (mime_to_format
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index 9c9dd28..95ad1e4 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -100,7 +100,6 @@ struct DMAPSharePrivate
 /* FIXME: name this something else, as it is more than just share/bitwise now */
 struct share_bitwise_t
 {
-	DMAPShare *share;
 	SoupServer *server;	/* Also in share, but we need to know whether server_ipv6 or _ipv4. */
 	struct MLCL_Bits mb;
 	GSList *id_list;
@@ -1572,7 +1571,7 @@ accumulate_mlcl_size_and_ids (gpointer id,
 
 	mb_copy.mlcl = dmap_structure_add (NULL, DMAP_CC_MLCL);;
 
-	DMAP_SHARE_GET_CLASS (share_bitwise->share)->add_entry_to_mlcl (id,
+	DMAP_SHARE_GET_CLASS (share_bitwise->mb.share)->add_entry_to_mlcl (id,
 									record,
 									&mb_copy);
 	share_bitwise->size += dmap_structure_get_size (mb_copy.mlcl);
@@ -1607,7 +1606,7 @@ write_next_mlit (SoupMessage * message, struct share_bitwise_t *share_bitwise)
 		gchar *data = NULL;
 		guint length;
 		DMAPRecord *record;
-		struct MLCL_Bits mb = { NULL, 0 };
+		struct MLCL_Bits mb = { NULL, 0, NULL };
 
 		record = share_bitwise->lookup_by_id (share_bitwise->db,
 						      GPOINTER_TO_UINT
@@ -1617,7 +1616,7 @@ write_next_mlit (SoupMessage * message, struct share_bitwise_t *share_bitwise)
 		mb.bits = share_bitwise->mb.bits;
 		mb.mlcl = dmap_structure_add (NULL, DMAP_CC_MLCL);
 
-		DMAP_SHARE_GET_CLASS (share_bitwise->share)->
+		DMAP_SHARE_GET_CLASS (share_bitwise->mb.share)->
 			add_entry_to_mlcl (share_bitwise->id_list->data,
 					   record, &mb);
 		data = dmap_structure_serialize (g_node_first_child (mb.mlcl),
@@ -1832,7 +1831,7 @@ _dmap_share_databases (DMAPShare * share,
 		GHashTable *records = NULL;
 		struct DMAPMetaDataMap *map;
 		gint32 num_songs;
-		struct MLCL_Bits mb = { NULL, 0 };
+		struct MLCL_Bits mb = { NULL, 0, NULL };
 		struct share_bitwise_t *share_bitwise;
 
 		record_query = g_hash_table_lookup (query, "query");
@@ -1853,6 +1852,7 @@ _dmap_share_databases (DMAPShare * share,
 
 		map = DMAP_SHARE_GET_CLASS (share)->get_meta_data_map (share);
 		mb.bits = _dmap_share_parse_meta (query, map);
+		mb.share = share;
 
 		/* NOTE:
 		 * We previously simply called foreach...add_entry_to_mlcl and later serialized the entire
@@ -1871,7 +1871,6 @@ _dmap_share_databases (DMAPShare * share,
 		/* 1: */
 		share_bitwise = g_new (struct share_bitwise_t, 1);
 
-		share_bitwise->share = share;
 		share_bitwise->server = server;
 		share_bitwise->mb = mb;
 		share_bitwise->id_list = NULL;
@@ -1957,10 +1956,11 @@ _dmap_share_databases (DMAPShare * share,
 		GNode *aply;
 		GNode *mlit;
 		struct DMAPMetaDataMap *map;
-		struct MLCL_Bits mb = { NULL, 0 };
+		struct MLCL_Bits mb = { NULL, 0, NULL };
 
 		map = DMAP_SHARE_GET_CLASS (share)->get_meta_data_map (share);
 		mb.bits = _dmap_share_parse_meta (query, map);
+		mb.share = share;
 
 		g_object_get ((gpointer) share, "name", &nameprop, NULL);
 
@@ -2016,7 +2016,7 @@ _dmap_share_databases (DMAPShare * share,
 		 */
 		GNode *apso;
 		struct DMAPMetaDataMap *map;
-		struct MLCL_Bits mb = { NULL, 0 };
+		struct MLCL_Bits mb = { NULL, 0, NULL };
 		guint pl_id;
 		gchar *record_query;
 		GSList *filter_def;
@@ -2024,6 +2024,7 @@ _dmap_share_databases (DMAPShare * share,
 
 		map = DMAP_SHARE_GET_CLASS (share)->get_meta_data_map (share);
 		mb.bits = _dmap_share_parse_meta (query, map);
+		mb.share = share;
 
 		apso = dmap_structure_add (NULL, DMAP_CC_APSO);
 		dmap_structure_add (apso, DMAP_CC_MSTT,
diff --git a/libdmapsharing/dmap-share.h b/libdmapsharing/dmap-share.h
index c230598..b88eb3d 100644
--- a/libdmapsharing/dmap-share.h
+++ b/libdmapsharing/dmap-share.h
@@ -170,10 +170,15 @@ struct DMAPMetaDataMap
 	guint md;
 };
 
+/* FIXME: this is passed as user_data to various functions; 
+ * need to rename. Also, get rid of initializations elsewhere: { NULL, 0, NULL };
+ * instead define a function to do this.
+ */
 struct MLCL_Bits
 {
 	GNode *mlcl;
 	bitwise bits;
+	DMAPShare *share;
 };
 
 GType dmap_share_get_type (void);