diff options
| author | Michal Ratajsky <[email protected]> | 2014-06-07 01:07:02 +0200 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-06-07 01:07:02 +0200 |
| commit | d2c3a4be634018a2b63f4c80a26f9024a0d3de47 (patch) | |
| tree | f0f8128aa2e914de6c1449bf5ef999dfebbc9767 /backends/null | |
| parent | 9b4cafb0b47c6ec453d301bd812ae7001955dc2a (diff) | |
| download | libmatemixer-d2c3a4be634018a2b63f4c80a26f9024a0d3de47.tar.bz2 libmatemixer-d2c3a4be634018a2b63f4c80a26f9024a0d3de47.tar.xz | |
Weekly update
Diffstat (limited to 'backends/null')
| -rw-r--r-- | backends/null/Makefile.am | 6 | ||||
| -rw-r--r-- | backends/null/null.c | 32 | ||||
| -rw-r--r-- | backends/null/null.h | 6 |
3 files changed, 17 insertions, 27 deletions
diff --git a/backends/null/Makefile.am b/backends/null/Makefile.am index b6d92c7..f28bc06 100644 --- a/backends/null/Makefile.am +++ b/backends/null/Makefile.am @@ -6,15 +6,13 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"libmatemixer-null\" -libmatemixer_null_la_CFLAGS = \ - $(GLIB_CFLAGS) +libmatemixer_null_la_CFLAGS = $(GLIB_CFLAGS) libmatemixer_null_la_SOURCES = \ null.c \ null.h -libmatemixer_null_la_LIBADD = \ - $(GLIB_LIBS) +libmatemixer_null_la_LIBADD = $(GLIB_LIBS) libmatemixer_null_la_LDFLAGS = \ -avoid-version \ diff --git a/backends/null/null.c b/backends/null/null.c index b96c9b0..1e8085d 100644 --- a/backends/null/null.c +++ b/backends/null/null.c @@ -26,19 +26,17 @@ #define BACKEND_NAME "Null" #define BACKEND_PRIORITY 999 -/* Support function for dynamic loading of the backend module */ -void backend_module_init (GTypeModule *module); - -const MateMixerBackendModuleInfo *backend_module_get_info (void); - static void mate_mixer_backend_interface_init (MateMixerBackendInterface *iface); +static void mate_mixer_null_class_init (MateMixerNullClass *klass); +static void mate_mixer_null_class_finalize (MateMixerNullClass *klass); +static void mate_mixer_null_init (MateMixerNull *null); G_DEFINE_DYNAMIC_TYPE_EXTENDED (MateMixerNull, mate_mixer_null, G_TYPE_OBJECT, 0, G_IMPLEMENT_INTERFACE_DYNAMIC (MATE_MIXER_TYPE_BACKEND, mate_mixer_backend_interface_init)) -static MateMixerBackendModuleInfo info; +static MateMixerBackendInfo info; void backend_module_init (GTypeModule *module) @@ -48,10 +46,10 @@ backend_module_init (GTypeModule *module) info.name = BACKEND_NAME; info.priority = BACKEND_PRIORITY; info.g_type = MATE_MIXER_TYPE_NULL; - info.backend_type = MATE_MIXER_BACKEND_TYPE_NULL; + info.backend_type = MATE_MIXER_BACKEND_NULL; } -const MateMixerBackendModuleInfo * +const MateMixerBackendInfo * backend_module_get_info (void) { return &info; @@ -64,28 +62,18 @@ mate_mixer_backend_interface_init (MateMixerBackendInterface *iface) } static void -mate_mixer_null_init (MateMixerNull *null) -{ -} - -static void -mate_mixer_null_finalize (GObject *object) +mate_mixer_null_class_init (MateMixerNullClass *klass) { - G_OBJECT_CLASS (mate_mixer_null_parent_class)->finalize (object); } +/* Called in the code generated by G_DEFINE_DYNAMIC_TYPE_EXTENDED() */ static void -mate_mixer_null_class_init (MateMixerNullClass *klass) +mate_mixer_null_class_finalize (MateMixerNullClass *klass) { - GObjectClass *object_class; - - object_class = G_OBJECT_CLASS (klass); - object_class->finalize = mate_mixer_null_finalize; } -/* Called in the code generated by G_DEFINE_DYNAMIC_TYPE_EXTENDED() */ static void -mate_mixer_null_class_finalize (MateMixerNullClass *klass) +mate_mixer_null_init (MateMixerNull *null) { } diff --git a/backends/null/null.h b/backends/null/null.h index d73794e..c9dd501 100644 --- a/backends/null/null.h +++ b/backends/null/null.h @@ -51,6 +51,10 @@ struct _MateMixerNullClass GType mate_mixer_null_get_type (void) G_GNUC_CONST; -gboolean mate_mixer_null_open (MateMixerBackend *backend); +/* Support function for dynamic loading of the backend module */ +void backend_module_init (GTypeModule *module); +const MateMixerBackendInfo *backend_module_get_info (void); + +gboolean mate_mixer_null_open (MateMixerBackend *backend); #endif /* MATEMIXER_NULL_H */ |