timer: instance_params: use an utility macro to declare GObject-derived object

Since gobject v2.44, an utility macro is available to declare
GObject-derived objects.

This commit replaces existent boireplates with it.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/src/timer/instance-params.c b/src/timer/instance-params.c
index ddade1b5769968b972ed97fe1ff3c40a12d9c798..54a375c5198dc136e43a8ed68441f43b0d2ebd18 100644 (file)
--- a/src/timer/instance-params.c
+++ b/src/timer/instance-params.c
@@ -16,9 +16,9 @@
  *
  * The object wraps 'struct snd_timer_params' in UAPI of Linux sound subsystem.
  */
-struct _ALSATimerInstanceParamsPrivate{
+typedef struct {
     struct snd_timer_params params;
-};
+} ALSATimerInstanceParamsPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSATimerInstanceParams, alsatimer_instance_params, G_TYPE_OBJECT)
 
 enum timer_instance_params_prop_type {

diff --git a/src/timer/instance-params.h b/src/timer/instance-params.h
index 942364f0a96c22ba178afee2e52913029e5c5163..fc4e00d0ecd7329545e2cf528d03e1af6b1d3e25 100644 (file)
--- a/src/timer/instance-params.h
+++ b/src/timer/instance-params.h
@@ -8,42 +8,13 @@ G_BEGIN_DECLS
 
 #define ALSATIMER_TYPE_INSTANCE_PARAMS  (alsatimer_instance_params_get_type())
 
-#define ALSATIMER_INSTANCE_PARAMS(obj)                          \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                          \
-                                ALSATIMER_TYPE_INSTANCE_PARAMS, \
-                                ALSATimerInstanceParams))
-#define ALSATIMER_IS_INSTANCE_PARAMS(obj)                       \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                          \
-                                ALSATIMER_TYPE_INSTANCE_PARAMS))
-
-#define ALSATIMER_INSTANCE_PARAMS_CLASS(klass)                  \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                           \
-                             ALSATIMER_TYPE_INSTANCE_PARAMS,    \
-                             ALSATimerInstanceParamsClass))
-#define ALSATIMER_IS_INSTANCE_PARAMS_CLASS(klass)               \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                           \
-                             ALSATIMER_TYPE_INSTANCE_PARAMS))
-#define ALSATIMER_INSTANCE_PARAMS_GET_CLASS(obj)                \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                           \
-                               ALSATIMER_TYPE_INSTANCE_PARAMS,  \
-                               ALSATimerInstanceParamsClass))
-
-typedef struct _ALSATimerInstanceParams         ALSATimerInstanceParams;
-typedef struct _ALSATimerInstanceParamsClass    ALSATimerInstanceParamsClass;
-typedef struct _ALSATimerInstanceParamsPrivate  ALSATimerInstanceParamsPrivate;
-
-struct _ALSATimerInstanceParams {
-    GObject parent_instance;
-
-    ALSATimerInstanceParamsPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSATimerInstanceParams, alsatimer_instance_params, ALSATIMER,
+                         INSTANCE_PARAMS, GObject);
 
 struct _ALSATimerInstanceParamsClass {
     GObjectClass parent_class;
 };
 
-GType alsatimer_instance_params_get_type() G_GNUC_CONST;
-
 ALSATimerInstanceParams *alsatimer_instance_params_new();
 
 void alsatimer_instance_params_set_event_filter(ALSATimerInstanceParams *self,