Merge pull request #50 from swami/bugs-cleanup

derselbst · web-flow · commit db7405fbe556 · 2020-05-13T19:16:16.000+02:00
Fix bugs and clean up
diff --git a/libinstpatch/IpatchContainer.c b/libinstpatch/IpatchContainer.c
@@ -232,14 +232,19 @@ const GType *
 ipatch_container_get_child_types(IpatchContainer *container)
 {
     IpatchContainerClass *klass;
-    const GType *types;
 
     g_return_val_if_fail(IPATCH_IS_CONTAINER(container), 0);
 
     klass = IPATCH_CONTAINER_GET_CLASS(container);
-    types = klass->child_types();
 
-    return (types);
+    if(klass->child_types)
+    {
+        return(klass->child_types());
+    }
+    else
+    {
+        return(NULL);
+    }
 }
 
 /**
diff --git a/libinstpatch/IpatchDLS2.c b/libinstpatch/IpatchDLS2.c
@@ -74,9 +74,6 @@ static gpointer parent_class = NULL;
 static GType dls2_child_types[3] = { 0 };
 static GType dls2_virt_types[4] = { 0 };
 
-/* for chaining to original file-name property */
-static IpatchItemClass *base_item_class;
-
 
 
 /* SoundFont item type creation function */
@@ -111,9 +108,6 @@ ipatch_dls2_class_init(IpatchDLS2Class *klass)
     IpatchContainerClass *container_class = IPATCH_CONTAINER_CLASS(klass);
     IpatchBaseClass *base_class = IPATCH_BASE_CLASS(klass);
 
-    /* save original base class for chaining file-name property */
-    base_item_class = IPATCH_ITEM_CLASS(g_type_class_ref(IPATCH_TYPE_BASE));
-
     parent_class = g_type_class_peek_parent(klass);
 
     obj_class->finalize = ipatch_dls2_finalize;
diff --git a/libinstpatch/IpatchItem.c b/libinstpatch/IpatchItem.c
@@ -276,7 +276,7 @@ ipatch_item_class_init(IpatchItemClass *klass)
     g_object_class_install_property(obj_class, PROP_FLAGS,
                                     g_param_spec_uint("flags", _("Flags"), _("Flags"),
                                             0, G_MAXUINT, 0,
-                                            G_PARAM_READABLE | IPATCH_PARAM_HIDE
+                                            G_PARAM_READWRITE | IPATCH_PARAM_HIDE
                                             | IPATCH_PARAM_NO_SAVE_CHANGE
                                             | IPATCH_PARAM_NO_SAVE));
     g_object_class_install_property(obj_class, PROP_PARENT,
diff --git a/libinstpatch/IpatchSF2.c b/libinstpatch/IpatchSF2.c
@@ -97,7 +97,6 @@ static void ipatch_sf2_foreach_info_GHFunc(gpointer key, gpointer value,
 static int ipatch_sf2_info_array_qsort(const void *a, const void *b);
 
 static gpointer parent_class = NULL;
-static IpatchItemClass *base_item_class;
 
 static GType sf2_child_types[4] = { 0 };
 static GType sf2_virt_types[6] = { 0 };
@@ -135,10 +134,7 @@ ipatch_sf2_class_init(IpatchSF2Class *klass)
     IpatchBaseClass *base_class = IPATCH_BASE_CLASS(klass);
     GParamSpec **sp = &info_prop_pspecs[0];
 
-    /* save original base class for chaining file-name property */
-    base_item_class = IPATCH_ITEM_CLASS(g_type_class_ref(IPATCH_TYPE_BASE));
-
-    parent_class = g_type_class_ref(IPATCH_TYPE_BASE);
+    parent_class = g_type_class_peek_parent(klass);
 
     obj_class->finalize = ipatch_sf2_finalize;
     obj_class->get_property = ipatch_sf2_get_property;
diff --git a/libinstpatch/IpatchSF2Gen.c b/libinstpatch/IpatchSF2Gen.c
@@ -147,23 +147,23 @@ _ipatch_sf2_gen_init(void)
 
     gen_property_names = g_malloc(sizeof(char *) * IPATCH_SF2_GEN_COUNT);
 
-    enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE);
+    enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE); /* ++ref */
 
     if(log_if_fail(enum_class != NULL))	/* shouldn't happen.. just in case */
     {
         for(i = 0; i < IPATCH_SF2_GEN_COUNT; i++)
         {
             gen_property_names[i] = NULL;
         }
-
-        return;
     }
-
-    for(i = 0; i < IPATCH_SF2_GEN_COUNT; i++)
+    else for(i = 0; i < IPATCH_SF2_GEN_COUNT; i++)
     {
         enum_val = g_enum_get_value(enum_class, i);
         gen_property_names[i] = enum_val ? enum_val->value_nick : NULL;
     }
+
+    g_type_class_unref(enum_class); /* --ref */
+
 }
 
 /**
diff --git a/libinstpatch/IpatchSF2GenItem.c b/libinstpatch/IpatchSF2GenItem.c
@@ -640,7 +640,7 @@ ipatch_sf2_gen_item_iface_install_properties(GObjectClass *klass,
     ispreset = propstype & 1;
 
     /* get generator type GObject enum */
-    enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE);
+    enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE); /* ++ref */
     g_return_if_fail(enum_class != NULL);
 
     *specs = g_new(GParamSpec *, IPATCH_SF2_GEN_COUNT);
@@ -713,7 +713,7 @@ ipatch_sf2_gen_item_iface_install_properties(GObjectClass *klass,
             }
             else if(unit == IPATCH_UNIT_TYPE_SF2_ABS_TIME)
             {
-                unit = IPATCH_UNIT_TYPE_SF2_OFS_PITCH;
+                unit = IPATCH_UNIT_TYPE_SF2_OFS_TIME;
             }
         }
 
@@ -731,6 +731,8 @@ ipatch_sf2_gen_item_iface_install_properties(GObjectClass *klass,
         /* install "-set" property */
         g_object_class_install_property(klass, i + IPATCH_SF2_GEN_ITEM_FIRST_PROP_SET_ID, pspec);
     } /* for loop */
+
+    g_type_class_unref(enum_class); /* --ref */
 }
 
 /**
diff --git a/libinstpatch/IpatchSF2Inst.c b/libinstpatch/IpatchSF2Inst.c
@@ -127,7 +127,7 @@ ipatch_sf2_inst_class_init(IpatchSF2InstClass *klass)
     IpatchItemClass *item_class = IPATCH_ITEM_CLASS(klass);
     IpatchContainerClass *container_class = IPATCH_CONTAINER_CLASS(klass);
 
-    parent_class = g_type_class_ref(IPATCH_TYPE_CONTAINER);
+    parent_class = g_type_class_peek_parent(klass);
 
     obj_class->finalize = ipatch_sf2_inst_finalize;
     obj_class->get_property = ipatch_sf2_inst_get_property;
diff --git a/libinstpatch/IpatchSF2Preset.c b/libinstpatch/IpatchSF2Preset.c
@@ -132,7 +132,7 @@ ipatch_sf2_preset_class_init(IpatchSF2PresetClass *klass)
     IpatchItemClass *item_class = IPATCH_ITEM_CLASS(klass);
     IpatchContainerClass *container_class = IPATCH_CONTAINER_CLASS(klass);
 
-    parent_class = g_type_class_ref(IPATCH_TYPE_CONTAINER);
+    parent_class = g_type_class_peek_parent(klass);
 
     obj_class->finalize = ipatch_sf2_preset_finalize;
     obj_class->get_property = ipatch_sf2_preset_get_property;
diff --git a/libinstpatch/IpatchSLI.c b/libinstpatch/IpatchSLI.c
@@ -67,9 +67,6 @@ static gpointer parent_class = NULL;
 static GType sli_child_types[3] = { 0 };
 static GType sli_virt_types[3] = { 0 };
 
-/* for chaining to original file-name property */
-static IpatchItemClass *base_item_class;
-
 
 /* Spectralis item type creation function */
 GType
@@ -102,9 +99,6 @@ ipatch_sli_class_init(IpatchSLIClass *klass)
     IpatchItemClass *item_class = IPATCH_ITEM_CLASS(klass);
     IpatchContainerClass *container_class = IPATCH_CONTAINER_CLASS(klass);
 
-    /* save original base class for chaining file-name property */
-    base_item_class = IPATCH_ITEM_CLASS(g_type_class_ref(IPATCH_TYPE_BASE));
-
     parent_class = g_type_class_peek_parent(klass);
 
     obj_class->get_property = ipatch_sli_get_property;
diff --git a/libinstpatch/IpatchSLIInst.c b/libinstpatch/IpatchSLIInst.c
@@ -105,7 +105,7 @@ ipatch_sli_inst_class_init(IpatchSLIInstClass *klass)
     IpatchItemClass *item_class = IPATCH_ITEM_CLASS(klass);
     IpatchContainerClass *container_class = IPATCH_CONTAINER_CLASS(klass);
 
-    parent_class = g_type_class_ref(IPATCH_TYPE_CONTAINER);
+    parent_class = g_type_class_peek_parent(klass);
 
     obj_class->finalize = ipatch_sli_inst_finalize;
     obj_class->get_property = ipatch_sli_inst_get_property;

Original file line number	Diff line number	Diff line change
`@@ -147,23 +147,23 @@ _ipatch_sf2_gen_init(void)`
`147`	`147`
`148`	`148`	`gen_property_names = g_malloc(sizeof(char ) IPATCH_SF2_GEN_COUNT);`
`149`	`149`
`150`		`- enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE);`
	`150`	`+ enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE); /* ++ref */`
`151`	`151`
`152`	`152`	`if(log_if_fail(enum_class != NULL)) /* shouldn't happen.. just in case */`
`153`	`153`	`{`
`154`	`154`	`for(i = 0; i < IPATCH_SF2_GEN_COUNT; i++)`
`155`	`155`	`{`
`156`	`156`	`gen_property_names[i] = NULL;`
`157`	`157`	`}`
`158`		`-`
`159`		`- return;`
`160`	`158`	`}`
`161`		`-`
`162`		`- for(i = 0; i < IPATCH_SF2_GEN_COUNT; i++)`
	`159`	`+ else for(i = 0; i < IPATCH_SF2_GEN_COUNT; i++)`
`163`	`160`	`{`
`164`	`161`	`enum_val = g_enum_get_value(enum_class, i);`
`165`	`162`	`gen_property_names[i] = enum_val ? enum_val->value_nick : NULL;`
`166`	`163`	`}`
	`164`	`+`
	`165`	`+ g_type_class_unref(enum_class); /* --ref */`
	`166`	`+`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ ipatch_sf2_gen_item_iface_install_properties(GObjectClass *klass,`
`640`	`640`	`ispreset = propstype & 1;`
`641`	`641`
`642`	`642`	`/* get generator type GObject enum */`
`643`		`- enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE);`
	`643`	`+ enum_class = g_type_class_ref(IPATCH_TYPE_SF2_GEN_TYPE); /* ++ref */`
`644`	`644`	`g_return_if_fail(enum_class != NULL);`
`645`	`645`
`646`	`646`	`specs = g_new(GParamSpec , IPATCH_SF2_GEN_COUNT);`
`@@ -713,7 +713,7 @@ ipatch_sf2_gen_item_iface_install_properties(GObjectClass *klass,`
`713`	`713`	`}`
`714`	`714`	`else if(unit == IPATCH_UNIT_TYPE_SF2_ABS_TIME)`
`715`	`715`	`{`
`716`		`- unit = IPATCH_UNIT_TYPE_SF2_OFS_PITCH;`
	`716`	`+ unit = IPATCH_UNIT_TYPE_SF2_OFS_TIME;`
`717`	`717`	`}`
`718`	`718`	`}`
`719`	`719`
`@@ -731,6 +731,8 @@ ipatch_sf2_gen_item_iface_install_properties(GObjectClass *klass,`
`731`	`731`	`/* install "-set" property */`
`732`	`732`	`g_object_class_install_property(klass, i + IPATCH_SF2_GEN_ITEM_FIRST_PROP_SET_ID, pspec);`
`733`	`733`	`} /* for loop */`
	`734`	`+`
	`735`	`+ g_type_class_unref(enum_class); /* --ref */`
`734`	`736`	`}`
`735`	`737`
`736`	`738`	`/**`