GNOME.org
 

[brasero] Remove headers for plugins and integrates their contents in the .c files

commit 845d98ca101f2312272a879ec79d881da666f45b
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Tue Sep 22 16:07:23 2009 +0200

    Remove headers for plugins and integrates their contents in the .c files

 plugins/cdrdao/Makefile.am             |    4 +-
 plugins/cdrdao/burn-cdrdao.c           |    9 ++++-
 plugins/cdrdao/burn-cdrdao.h           |   48 ----------------------
 plugins/cdrdao/burn-toc2cue.c          |   11 ++++-
 plugins/cdrdao/burn-toc2cue.h          |   48 ----------------------
 plugins/cdrkit/Makefile.am             |    6 +-
 plugins/cdrkit/burn-genisoimage.c      |    9 ++++-
 plugins/cdrkit/burn-genisoimage.h      |   50 -----------------------
 plugins/cdrkit/burn-readom.c           |   10 ++++-
 plugins/cdrkit/burn-readom.h           |   50 -----------------------
 plugins/cdrkit/burn-wodim.c            |    9 ++++-
 plugins/cdrkit/burn-wodim.h            |   48 ----------------------
 plugins/cdrtools/Makefile.am           |    6 +-
 plugins/cdrtools/burn-cdrecord.c       |    9 ++++-
 plugins/cdrtools/burn-cdrecord.h       |   48 ----------------------
 plugins/cdrtools/burn-mkisofs.c        |    9 ++++-
 plugins/cdrtools/burn-mkisofs.h        |   50 -----------------------
 plugins/cdrtools/burn-readcd.c         |    9 ++++-
 plugins/cdrtools/burn-readcd.h         |   50 -----------------------
 plugins/checksum/Makefile.am           |    4 +-
 plugins/checksum/burn-checksum-files.c |    9 ++++-
 plugins/checksum/burn-checksum-files.h |   48 ----------------------
 plugins/checksum/burn-checksum-image.c |    9 ++++-
 plugins/checksum/burn-checksum-image.h |   48 ----------------------
 plugins/dvdauthor/Makefile.am          |    2 +-
 plugins/dvdauthor/burn-dvdauthor.c     |    9 ++++-
 plugins/dvdauthor/burn-dvdauthor.h     |   47 ----------------------
 plugins/dvdcss/Makefile.am             |    2 +-
 plugins/dvdcss/burn-dvdcss.c           |    9 ++++-
 plugins/dvdcss/burn-dvdcss.h           |   52 ------------------------
 plugins/growisofs/Makefile.am          |    4 +-
 plugins/growisofs/burn-dvd-rw-format.c |    9 ++++-
 plugins/growisofs/burn-dvd-rw-format.h |   50 -----------------------
 plugins/growisofs/burn-growisofs.c     |    9 ++++-
 plugins/growisofs/burn-growisofs.h     |   48 ----------------------
 plugins/libburnia/Makefile.am          |    3 +-
 plugins/libburnia/burn-libburn.c       |    9 ++++-
 plugins/libburnia/burn-libburn.h       |   52 ------------------------
 plugins/libburnia/burn-libisofs.c      |    9 ++++-
 plugins/libburnia/burn-libisofs.h      |   52 ------------------------
 plugins/libburnia/burn-libread-disc.h  |   68 --------------------------------
 plugins/local-track/Makefile.am        |    4 +-
 plugins/local-track/burn-local-image.c |    9 ++++-
 plugins/local-track/burn-local-image.h |   48 ----------------------
 plugins/local-track/burn-uri.c         |    9 ++++-
 plugins/local-track/burn-uri.h         |   48 ----------------------
 plugins/transcode/Makefile.am          |    4 +-
 plugins/transcode/burn-normalize.c     |   10 ++++-
 plugins/transcode/burn-normalize.h     |   11 +-----
 plugins/transcode/burn-transcode.c     |    9 ++++-
 plugins/transcode/burn-transcode.h     |   48 ----------------------
 plugins/transcode/burn-vob.c           |    9 ++++-
 plugins/transcode/burn-vob.h           |   47 ----------------------
 plugins/vcdimager/Makefile.am          |    2 +-
 plugins/vcdimager/burn-vcdimager.c     |    9 ++++-
 plugins/vcdimager/burn-vcdimager.h     |   47 ----------------------
 56 files changed, 199 insertions(+), 1150 deletions(-)
---
diff --git a/plugins/cdrdao/Makefile.am b/plugins/cdrdao/Makefile.am
index 245b8d7..ac8582d 100644
--- a/plugins/cdrdao/Makefile.am
+++ b/plugins/cdrdao/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 #cdrdao
 cdrdaodir = $(libdir)/brasero/plugins
 cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
-libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c burn-cdrdao.h \
+libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c \
 	burn-cdrdao-common.h 
 libbrasero_cdrdao_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
@@ -26,7 +26,7 @@ libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
 #toc2cue
 toc2cuedir = $(libdir)/brasero/plugins
 toc2cue_LTLIBRARIES = libbrasero-toc2cue.la
-libbrasero_toc2cue_la_SOURCES = burn-toc2cue.c burn-toc2cue.h \
+libbrasero_toc2cue_la_SOURCES = burn-toc2cue.c \
 	burn-cdrdao-common.h 
 libbrasero_toc2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_toc2cue_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/cdrdao/burn-cdrdao.c b/plugins/cdrdao/burn-cdrdao.c
index d050751..9396c1c 100644
--- a/plugins/cdrdao/burn-cdrdao.c
+++ b/plugins/cdrdao/burn-cdrdao.c
@@ -46,7 +46,6 @@
 #include <gconf/gconf-client.h>
 
 #include "burn-cdrdao-common.h"
-#include "burn-cdrdao.h"
 #include "brasero-error.h"
 #include "brasero-plugin-registration.h"
 #include "burn-job.h"
@@ -56,6 +55,14 @@
 #include "brasero-drive.h"
 #include "brasero-medium.h"
 
+
+#define BRASERO_TYPE_CDRDAO         (brasero_cdrdao_get_type ())
+#define BRASERO_CDRDAO(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_CDRDAO, BraseroCdrdao))
+#define BRASERO_CDRDAO_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_CDRDAO, BraseroCdrdaoClass))
+#define BRASERO_IS_CDRDAO(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_CDRDAO))
+#define BRASERO_IS_CDRDAO_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_CDRDAO))
+#define BRASERO_CDRDAO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_CDRDAO, BraseroCdrdaoClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroCdrdao, brasero_cdrdao, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 struct _BraseroCdrdaoPrivate {
diff --git a/plugins/cdrdao/burn-toc2cue.c b/plugins/cdrdao/burn-toc2cue.c
index 4b74a39..0eb131c 100644
--- a/plugins/cdrdao/burn-toc2cue.c
+++ b/plugins/cdrdao/burn-toc2cue.c
@@ -46,9 +46,16 @@
 #include "burn-job.h"
 #include "burn-process.h"
 #include "burn-cdrdao-common.h"
-#include "burn-toc2cue.h"
 #include "brasero-track-image.h"
- 
+
+
+#define BRASERO_TYPE_TOC2CUE         (brasero_toc2cue_get_type ())
+#define BRASERO_TOC2CUE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_TOC2CUE, BraseroToc2Cue))
+#define BRASERO_TOC2CUE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_TOC2CUE, BraseroToc2CueClass))
+#define BRASERO_IS_TOC2CUE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_TOC2CUE))
+#define BRASERO_IS_TOC2CUE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_TOC2CUE))
+#define BRASERO_TOC2CUE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_TOC2CUE, BraseroToc2CueClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroToc2Cue, brasero_toc2cue, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 struct _BraseroToc2CuePrivate {
diff --git a/plugins/cdrkit/Makefile.am b/plugins/cdrkit/Makefile.am
index 3b58300..570fd38 100644
--- a/plugins/cdrkit/Makefile.am
+++ b/plugins/cdrkit/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 #wodim
 wodimdir = $(libdir)/brasero/plugins
 wodim_LTLIBRARIES = libbrasero-wodim.la
-libbrasero_wodim_la_SOURCES = burn-wodim.c burn-wodim.h \
+libbrasero_wodim_la_SOURCES = burn-wodim.c \
 	burn-cdrkit.h 
 libbrasero_wodim_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_wodim_la_LDFLAGS = -module -avoid-version
@@ -26,7 +26,7 @@ libbrasero_wodim_la_LDFLAGS = -module -avoid-version
 #genisoimage
 genisoimagedir = $(libdir)/brasero/plugins
 genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
-libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c burn-genisoimage.h \
+libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
 	burn-cdrkit.h 
 libbrasero_genisoimage_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
@@ -34,7 +34,7 @@ libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
 #readom
 readomdir = $(libdir)/brasero/plugins
 readom_LTLIBRARIES = libbrasero-readom.la
-libbrasero_readom_la_SOURCES = burn-readom.c burn-readom.h \
+libbrasero_readom_la_SOURCES = burn-readom.c \
 	burn-cdrkit.h 
 libbrasero_readom_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_readom_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/cdrkit/burn-genisoimage.c b/plugins/cdrkit/burn-genisoimage.c
index ceaaf9a..602836c 100644
--- a/plugins/cdrkit/burn-genisoimage.c
+++ b/plugins/cdrkit/burn-genisoimage.c
@@ -48,9 +48,16 @@
 #include "burn-process.h"
 #include "brasero-plugin-registration.h"
 #include "burn-cdrkit.h"
-#include "burn-genisoimage.h"
 #include "brasero-track-data.h"
 
+
+#define BRASERO_TYPE_GENISOIMAGE         (brasero_genisoimage_get_type ())
+#define BRASERO_GENISOIMAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_GENISOIMAGE, BraseroGenisoimage))
+#define BRASERO_GENISOIMAGE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_GENISOIMAGE, BraseroGenisoimageClass))
+#define BRASERO_IS_GENISOIMAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_GENISOIMAGE))
+#define BRASERO_IS_GENISOIMAGE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_GENISOIMAGE))
+#define BRASERO_GENISOIMAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_GENISOIMAGE, BraseroGenisoimageClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroGenisoimage, brasero_genisoimage, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 struct _BraseroGenisoimagePrivate {
diff --git a/plugins/cdrkit/burn-readom.c b/plugins/cdrkit/burn-readom.c
index 2716b81..11db0a6 100644
--- a/plugins/cdrkit/burn-readom.c
+++ b/plugins/cdrkit/burn-readom.c
@@ -41,7 +41,6 @@
 #include <gmodule.h>
 
 #include "burn-cdrkit.h"
-#include "burn-readom.h"
 #include "burn-process.h"
 #include "burn-job.h"
 #include "brasero-plugin-registration.h"
@@ -51,7 +50,16 @@
 #include "burn-volume.h"
 #include "brasero-drive.h"
 
+
+#define BRASERO_TYPE_READOM         (brasero_readom_get_type ())
+#define BRASERO_READOM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_READOM, BraseroReadom))
+#define BRASERO_READOM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_READOM, BraseroReadomClass))
+#define BRASERO_IS_READOM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_READOM))
+#define BRASERO_IS_READOM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_READOM))
+#define BRASERO_READOM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_READOM, BraseroReadomClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroReadom, brasero_readom, BRASERO_TYPE_PROCESS, BraseroProcess);
+
 static GObjectClass *parent_class = NULL;
 
 static BraseroBurnResult
diff --git a/plugins/cdrkit/burn-wodim.c b/plugins/cdrkit/burn-wodim.c
index f80d8cb..4090da0 100644
--- a/plugins/cdrkit/burn-wodim.c
+++ b/plugins/cdrkit/burn-wodim.c
@@ -55,12 +55,19 @@
 #include "burn-process.h"
 #include "brasero-plugin-registration.h"
 #include "burn-cdrkit.h"
-#include "burn-wodim.h"
 
 #include "brasero-tags.h"
 #include "brasero-track-image.h"
 #include "brasero-track-stream.h"
 
+
+#define BRASERO_TYPE_WODIM         (brasero_wodim_get_type ())
+#define BRASERO_WODIM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_WODIM, BraseroWodim))
+#define BRASERO_WODIM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_WODIM, BraseroWodimClass))
+#define BRASERO_IS_WODIM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_WODIM))
+#define BRASERO_IS_WODIM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_WODIM))
+#define BRASERO_WODIM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_WODIM, BraseroWodimClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroWodim, brasero_wodim, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 struct _BraseroWodimPrivate {
diff --git a/plugins/cdrtools/Makefile.am b/plugins/cdrtools/Makefile.am
index 9f8e65f..3ce7c86 100644
--- a/plugins/cdrtools/Makefile.am
+++ b/plugins/cdrtools/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 #cdrecord
 cdrecorddir = $(libdir)/brasero/plugins
 cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
-libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c burn-cdrecord.h \
+libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
 	burn-cdrtools.h 
 libbrasero_cdrecord_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
@@ -26,7 +26,7 @@ libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
 #mkisofs
 mkisofsdir = $(libdir)/brasero/plugins
 mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
-libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c burn-mkisofs.h \
+libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
 	burn-cdrtools.h 
 libbrasero_mkisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
@@ -34,7 +34,7 @@ libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
 #readcd
 readcddir = $(libdir)/brasero/plugins
 readcd_LTLIBRARIES = libbrasero-readcd.la
-libbrasero_readcd_la_SOURCES = burn-readcd.c burn-readcd.h \
+libbrasero_readcd_la_SOURCES = burn-readcd.c \
 	burn-cdrtools.h 
 libbrasero_readcd_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_readcd_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/cdrtools/burn-cdrecord.c b/plugins/cdrtools/burn-cdrecord.c
index 2e6e852..05dce95 100644
--- a/plugins/cdrtools/burn-cdrecord.c
+++ b/plugins/cdrtools/burn-cdrecord.c
@@ -55,12 +55,19 @@
 #include "burn-process.h"
 #include "brasero-plugin-registration.h"
 #include "burn-cdrtools.h"
-#include "burn-cdrecord.h"
 
 #include "brasero-tags.h"
 #include "brasero-track-image.h"
 #include "brasero-track-stream.h"
 
+
+#define BRASERO_TYPE_CD_RECORD         (brasero_cdrecord_get_type ())
+#define BRASERO_CD_RECORD(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_CD_RECORD, BraseroCDRecord))
+#define BRASERO_CD_RECORD_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_CD_RECORD, BraseroCDRecordClass))
+#define BRASERO_IS_CD_RECORD(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_CD_RECORD))
+#define BRASERO_IS_CD_RECORD_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_CD_RECORD))
+#define BRASERO_CD_RECORD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_CD_RECORD, BraseroCDRecordClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroCDRecord, brasero_cdrecord, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 struct _BraseroCDRecordPrivate {
diff --git a/plugins/cdrtools/burn-mkisofs.c b/plugins/cdrtools/burn-mkisofs.c
index 15bc3a3..c9d91a5 100644
--- a/plugins/cdrtools/burn-mkisofs.c
+++ b/plugins/cdrtools/burn-mkisofs.c
@@ -49,9 +49,16 @@
 #include "burn-process.h"
 #include "brasero-plugin-registration.h"
 #include "burn-cdrtools.h"
-#include "burn-mkisofs.h"
 #include "brasero-track-data.h"
 
+
+#define BRASERO_TYPE_MKISOFS         (brasero_mkisofs_get_type ())
+#define BRASERO_MKISOFS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_MKISOFS, BraseroMkisofs))
+#define BRASERO_MKISOFS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_MKISOFS, BraseroMkisofsClass))
+#define BRASERO_IS_MKISOFS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_MKISOFS))
+#define BRASERO_IS_MKISOFS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_MKISOFS))
+#define BRASERO_MKISOFS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_MKISOFS, BraseroMkisofsClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroMkisofs, brasero_mkisofs, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 struct _BraseroMkisofsPrivate {
diff --git a/plugins/cdrtools/burn-readcd.c b/plugins/cdrtools/burn-readcd.c
index 42c4b24..b26ed87 100644
--- a/plugins/cdrtools/burn-readcd.c
+++ b/plugins/cdrtools/burn-readcd.c
@@ -41,7 +41,6 @@
 #include <gmodule.h>
 
 #include "burn-cdrtools.h"
-#include "burn-readcd.h"
 #include "burn-process.h"
 #include "burn-job.h"
 #include "brasero-plugin-registration.h"
@@ -51,6 +50,14 @@
 #include "burn-volume.h"
 #include "brasero-drive.h"
 
+
+#define BRASERO_TYPE_READCD         (brasero_readcd_get_type ())
+#define BRASERO_READCD(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_READCD, BraseroReadcd))
+#define BRASERO_READCD_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_READCD, BraseroReadcdClass))
+#define BRASERO_IS_READCD(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_READCD))
+#define BRASERO_IS_READCD_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_READCD))
+#define BRASERO_READCD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_READCD, BraseroReadcdClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroReadcd, brasero_readcd, BRASERO_TYPE_PROCESS, BraseroProcess);
 static GObjectClass *parent_class = NULL;
 
diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
index 4fe464a..3002aa5 100644
--- a/plugins/checksum/Makefile.am
+++ b/plugins/checksum/Makefile.am
@@ -18,8 +18,7 @@ INCLUDES = \
 
 checksumdir = $(libdir)/brasero/plugins
 checksum_LTLIBRARIES = libbrasero-checksum.la
-libbrasero_checksum_la_SOURCES = burn-checksum-image.c	\
-				 burn-checksum-image.h
+libbrasero_checksum_la_SOURCES = burn-checksum-image.c	
 
 libbrasero_checksum_la_LDFLAGS = -module -avoid-version
 libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
@@ -27,7 +26,6 @@ libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../..
 checksumfiledir = $(libdir)/brasero/plugins
 checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
 libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c	\
-				      burn-checksum-files.h\
 				      burn-volume-read.c  \
 				      burn-volume-read.h
 
diff --git a/plugins/checksum/burn-checksum-files.c b/plugins/checksum/burn-checksum-files.c
index c793986..4c0991f 100644
--- a/plugins/checksum/burn-checksum-files.c
+++ b/plugins/checksum/burn-checksum-files.c
@@ -50,7 +50,6 @@
 #include "scsi-device.h"
 #include "brasero-plugin-registration.h"
 #include "burn-job.h"
-#include "burn-checksum-files.h"
 
 #include "brasero-tags.h"
 #include "brasero-track-data.h"
@@ -62,6 +61,14 @@
 
 #include "burn-volume-read.h"
 
+
+#define BRASERO_TYPE_CHECKSUM_FILES		(brasero_checksum_files_get_type ())
+#define BRASERO_CHECKSUM_FILES(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_CHECKSUM_FILES, BraseroChecksumFiles))
+#define BRASERO_CHECKSUM_FILES_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_CHECKSUM_FILES, BraseroChecksumFilesClass))
+#define BRASERO_IS_CHECKSUM_FILES(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_CHECKSUM_FILES))
+#define BRASERO_IS_CHECKSUM_FILES_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_CHECKSUM_FILES))
+#define BRASERO_CHECKSUM_FILES_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_CHECKSUM_FILES, BraseroChecksumFilesClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroChecksumFiles, brasero_checksum_files, BRASERO_TYPE_JOB, BraseroJob);
 
 struct _BraseroChecksumFilesPrivate {
diff --git a/plugins/checksum/burn-checksum-image.c b/plugins/checksum/burn-checksum-image.c
index f21d608..a6d67ee 100644
--- a/plugins/checksum/burn-checksum-image.c
+++ b/plugins/checksum/burn-checksum-image.c
@@ -51,13 +51,20 @@
 
 #include "brasero-plugin-registration.h"
 #include "burn-job.h"
-#include "burn-checksum-image.h"
 #include "burn-volume.h"
 #include "brasero-drive.h"
 #include "brasero-track-disc.h"
 #include "brasero-track-image.h"
 #include "brasero-tags.h"
 
+
+#define BRASERO_TYPE_CHECKSUM_IMAGE		(brasero_checksum_image_get_type ())
+#define BRASERO_CHECKSUM_IMAGE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_CHECKSUM_IMAGE, BraseroChecksumImage))
+#define BRASERO_CHECKSUM_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_CHECKSUM_IMAGE, BraseroChecksumImageClass))
+#define BRASERO_IS_CHECKSUM_IMAGE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_CHECKSUM_IMAGE))
+#define BRASERO_IS_CHECKSUM_IMAGE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_CHECKSUM_IMAGE))
+#define BRASERO_CHECKSUM_GET_CLASS(o)		(G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_CHECKSUM_IMAGE, BraseroChecksumImageClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroChecksumImage, brasero_checksum_image, BRASERO_TYPE_JOB, BraseroJob);
 
 struct _BraseroChecksumImagePrivate {
diff --git a/plugins/dvdauthor/Makefile.am b/plugins/dvdauthor/Makefile.am
index b6eed21..3972efd 100644
--- a/plugins/dvdauthor/Makefile.am
+++ b/plugins/dvdauthor/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 dvdauthordir = $(libdir)/brasero/plugins
 dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
 
-libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c burn-dvdauthor.h
+libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c 
 libbrasero_dvdauthor_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_dvdauthor_la_LDFLAGS = -module -avoid-version
 
diff --git a/plugins/dvdauthor/burn-dvdauthor.c b/plugins/dvdauthor/burn-dvdauthor.c
index 095109e..5d8129a 100644
--- a/plugins/dvdauthor/burn-dvdauthor.c
+++ b/plugins/dvdauthor/burn-dvdauthor.c
@@ -49,10 +49,17 @@
 #include "brasero-plugin-registration.h"
 #include "burn-job.h"
 #include "burn-process.h"
-#include "burn-dvdauthor.h"
 #include "brasero-track-data.h"
 #include "brasero-track-stream.h"
 
+
+#define BRASERO_TYPE_DVD_AUTHOR             (brasero_dvd_author_get_type ())
+#define BRASERO_DVD_AUTHOR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_DVD_AUTHOR, BraseroDvdAuthor))
+#define BRASERO_DVD_AUTHOR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_DVD_AUTHOR, BraseroDvdAuthorClass))
+#define BRASERO_IS_DVD_AUTHOR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BRASERO_TYPE_DVD_AUTHOR))
+#define BRASERO_IS_DVD_AUTHOR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), BRASERO_TYPE_DVD_AUTHOR))
+#define BRASERO_DVD_AUTHOR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), BRASERO_TYPE_DVD_AUTHOR, BraseroDvdAuthorClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroDvdAuthor, brasero_dvd_author, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 typedef struct _BraseroDvdAuthorPrivate BraseroDvdAuthorPrivate;
diff --git a/plugins/dvdcss/Makefile.am b/plugins/dvdcss/Makefile.am
index 00559c4..dc58a1d 100644
--- a/plugins/dvdcss/Makefile.am
+++ b/plugins/dvdcss/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
 
 plugin_LTLIBRARIES = libbrasero-dvdcss.la
 
-libbrasero_dvdcss_la_SOURCES = burn-dvdcss.c burn-dvdcss.h \
+libbrasero_dvdcss_la_SOURCES = burn-dvdcss.c \
 	burn-dvdcss-private.h 
 libbrasero_dvdcss_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_dvdcss_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/dvdcss/burn-dvdcss.c b/plugins/dvdcss/burn-dvdcss.c
index 49ceed9..2d0b84e 100644
--- a/plugins/dvdcss/burn-dvdcss.c
+++ b/plugins/dvdcss/burn-dvdcss.c
@@ -48,13 +48,20 @@
 
 #include "burn-job.h"
 #include "brasero-plugin-registration.h"
-#include "burn-dvdcss.h"
 #include "burn-dvdcss-private.h"
 #include "burn-volume.h"
 #include "brasero-medium.h"
 #include "brasero-track-image.h"
 #include "brasero-track-disc.h"
 
+
+#define BRASERO_TYPE_DVDCSS         (brasero_dvdcss_get_type ())
+#define BRASERO_DVDCSS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_DVDCSS, BraseroDvdcss))
+#define BRASERO_DVDCSS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_DVDCSS, BraseroDvdcssClass))
+#define BRASERO_IS_DVDCSS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_DVDCSS))
+#define BRASERO_IS_DVDCSS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_DVDCSS))
+#define BRASERO_DVDCSS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_DVDCSS, BraseroDvdcssClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroDvdcss, brasero_dvdcss, BRASERO_TYPE_JOB, BraseroJob);
 
 struct _BraseroDvdcssPrivate {
diff --git a/plugins/growisofs/Makefile.am b/plugins/growisofs/Makefile.am
index 98cb6e3..a06cab2 100644
--- a/plugins/growisofs/Makefile.am
+++ b/plugins/growisofs/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 #growisofs
 growisofsdir = $(libdir)/brasero/plugins
 growisofs_LTLIBRARIES = libbrasero-growisofs.la
-libbrasero_growisofs_la_SOURCES = burn-growisofs.c burn-growisofs.h \
+libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
 	burn-growisofs-common.h 
 libbrasero_growisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
@@ -26,7 +26,7 @@ libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
 #dvdrwformat
 dvdrwformatdir = $(libdir)/brasero/plugins
 dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
-libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c burn-dvd-rw-format.h
+libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c 
 libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_dvdrwformat_la_LDFLAGS = -module -avoid-version
 
diff --git a/plugins/growisofs/burn-dvd-rw-format.c b/plugins/growisofs/burn-dvd-rw-format.c
index 6f5ae12..8470dc7 100644
--- a/plugins/growisofs/burn-dvd-rw-format.c
+++ b/plugins/growisofs/burn-dvd-rw-format.c
@@ -47,9 +47,16 @@
 #include "burn-job.h"
 #include "burn-process.h"
 #include "brasero-medium.h"
-#include "burn-dvd-rw-format.h"
 #include "burn-growisofs-common.h"
 
+
+#define BRASERO_TYPE_DVD_RW_FORMAT         (brasero_dvd_rw_format_get_type ())
+#define BRASERO_DVD_RW_FORMAT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_DVD_RW_FORMAT, BraseroDvdRwFormat))
+#define BRASERO_DVD_RW_FORMAT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_DVD_RW_FORMAT, BraseroDvdRwFormatClass))
+#define BRASERO_IS_DVD_RW_FORMAT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_DVD_RW_FORMAT))
+#define BRASERO_IS_DVD_RW_FORMAT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_DVD_RW_FORMAT))
+#define BRASERO_DVD_RW_FORMAT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_DVD_RW_FORMAT, BraseroDvdRwFormatClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroDvdRwFormat, brasero_dvd_rw_format, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 static GObjectClass *parent_class = NULL;
diff --git a/plugins/growisofs/burn-growisofs.c b/plugins/growisofs/burn-growisofs.c
index 51dbef3..556930f 100644
--- a/plugins/growisofs/burn-growisofs.c
+++ b/plugins/growisofs/burn-growisofs.c
@@ -51,11 +51,18 @@
 #include "burn-job.h"
 #include "burn-process.h"
 #include "brasero-drive.h"
-#include "burn-growisofs.h"
 #include "burn-growisofs-common.h"
 #include "brasero-track-data.h"
 #include "brasero-track-image.h"
 
+
+#define BRASERO_TYPE_GROWISOFS         (brasero_growisofs_get_type ())
+#define BRASERO_GROWISOFS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_GROWISOFS, BraseroGrowisofs))
+#define BRASERO_GROWISOFS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_GROWISOFS, BraseroGrowisofsClass))
+#define BRASERO_IS_GROWISOFS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_GROWISOFS))
+#define BRASERO_IS_GROWISOFS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_GROWISOFS))
+#define BRASERO_GROWISOFS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_GROWISOFS, BraseroGrowisofsClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroGrowisofs, brasero_growisofs, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 struct BraseroGrowisofsPrivate {
diff --git a/plugins/libburnia/Makefile.am b/plugins/libburnia/Makefile.am
index c2ece8c..f4ba47b 100644
--- a/plugins/libburnia/Makefile.am
+++ b/plugins/libburnia/Makefile.am
@@ -20,7 +20,6 @@ INCLUDES = \
 libburndir = $(libdir)/brasero/plugins
 libburn_LTLIBRARIES = libbrasero-libburn.la
 libbrasero_libburn_la_SOURCES = burn-libburn.c 		\
-				burn-libburn.h		\
 				burn-libburn-common.c	\
 				burn-libburn-common.h  \
 				burn-libburnia.h 
@@ -30,7 +29,7 @@ libbrasero_libburn_la_LDFLAGS = -module -avoid-version
 #libisofs (apparently libisofs needs one libburn function)
 libisofsdir = $(libdir)/brasero/plugins
 libisofs_LTLIBRARIES = libbrasero-libisofs.la
-libbrasero_libisofs_la_SOURCES = burn-libisofs.c burn-libisofs.h	\
+libbrasero_libisofs_la_SOURCES = burn-libisofs.c                       \
 	burn-libburn-common.c burn-libburn-common.h			\
 	burn-libburnia.h 
 libbrasero_libisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn.la
diff --git a/plugins/libburnia/burn-libburn.c b/plugins/libburnia/burn-libburn.c
index 502f318..ed6dfdc 100644
--- a/plugins/libburnia/burn-libburn.c
+++ b/plugins/libburnia/burn-libburn.c
@@ -52,10 +52,17 @@
 #include "brasero-plugin-registration.h"
 #include "burn-libburn-common.h"
 #include "burn-libburnia.h"
-#include "burn-libburn.h"
 #include "brasero-track-image.h"
 #include "brasero-track-stream.h"
 
+
+#define BRASERO_TYPE_LIBBURN         (brasero_libburn_get_type ())
+#define BRASERO_LIBBURN(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_LIBBURN, BraseroLibburn))
+#define BRASERO_LIBBURN_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_LIBBURN, BraseroLibburnClass))
+#define BRASERO_IS_LIBBURN(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_LIBBURN))
+#define BRASERO_IS_LIBBURN_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_LIBBURN))
+#define BRASERO_LIBBURN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_LIBBURN, BraseroLibburnClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroLibburn, brasero_libburn, BRASERO_TYPE_JOB, BraseroJob);
 
 #define BRASERO_PVD_SIZE	32ULL * 2048ULL
diff --git a/plugins/libburnia/burn-libisofs.c b/plugins/libburnia/burn-libisofs.c
index 0e9fb49..feb4ffb 100644
--- a/plugins/libburnia/burn-libisofs.c
+++ b/plugins/libburnia/burn-libisofs.c
@@ -48,7 +48,6 @@
 #include <libburn/libburn.h>
 
 #include "burn-libburnia.h"
-#include "burn-libisofs.h"
 #include "burn-job.h"
 #include "brasero-units.h"
 #include "brasero-plugin-registration.h"
@@ -56,6 +55,14 @@
 #include "brasero-track-data.h"
 #include "brasero-track-image.h"
 
+
+#define BRASERO_TYPE_LIBISOFS         (brasero_libisofs_get_type ())
+#define BRASERO_LIBISOFS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_LIBISOFS, BraseroLibisofs))
+#define BRASERO_LIBISOFS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_LIBISOFS, BraseroLibisofsClass))
+#define BRASERO_IS_LIBISOFS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_LIBISOFS))
+#define BRASERO_IS_LIBISOFS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_LIBISOFS))
+#define BRASERO_LIBISOFS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_LIBISOFS, BraseroLibisofsClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroLibisofs, brasero_libisofs, BRASERO_TYPE_JOB, BraseroJob);
 
 struct _BraseroLibisofsPrivate {
diff --git a/plugins/local-track/Makefile.am b/plugins/local-track/Makefile.am
index b6be195..09a92e7 100644
--- a/plugins/local-track/Makefile.am
+++ b/plugins/local-track/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
 local_trackdir = $(libdir)/brasero/plugins
 local_track_LTLIBRARIES = libbrasero-local-track.la
 
-libbrasero_local_track_la_SOURCES = burn-local-image.c burn-local-image.h
+libbrasero_local_track_la_SOURCES = burn-local-image.c 
 libbrasero_local_track_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_local_track_la_LDFLAGS = -module -avoid-version
 
@@ -27,7 +27,7 @@ libbrasero_local_track_la_LDFLAGS = -module -avoid-version
 burn_uridir = $(libdir)/brasero/plugins
 burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
 
-libbrasero_burn_uri_la_SOURCES = burn-uri.c burn-uri.h
+libbrasero_burn_uri_la_SOURCES = burn-uri.c 
 libbrasero_burn_uri_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_burn_uri_la_LDFLAGS = -module -avoid-version
 
diff --git a/plugins/local-track/burn-local-image.c b/plugins/local-track/burn-local-image.c
index 73fd19d..8a2729d 100644
--- a/plugins/local-track/burn-local-image.c
+++ b/plugins/local-track/burn-local-image.c
@@ -52,10 +52,17 @@
 
 #include "burn-job.h"
 #include "brasero-plugin-registration.h"
-#include "burn-local-image.h"
 #include "brasero-xfer.h"
 #include "brasero-track-image.h"
 
+
+#define BRASERO_TYPE_LOCAL_TRACK         (brasero_local_track_get_type ())
+#define BRASERO_LOCAL_TRACK(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_LOCAL_TRACK, BraseroLocalTrack))
+#define BRASERO_LOCAL_TRACK_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_LOCAL_TRACK, BraseroLocalTrackClass))
+#define BRASERO_IS_LOCAL_TRACK(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_LOCAL_TRACK))
+#define BRASERO_IS_LOCAL_TRACK_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_LOCAL_TRACK))
+#define BRASERO_LOCAL_TRACK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_LOCAL_TRACK, BraseroLocalTrackClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroLocalTrack, brasero_local_track, BRASERO_TYPE_JOB, BraseroJob);
 
 struct _BraseroLocalTrackPrivate {
diff --git a/plugins/local-track/burn-uri.c b/plugins/local-track/burn-uri.c
index 89a9766..00fadb4 100644
--- a/plugins/local-track/burn-uri.c
+++ b/plugins/local-track/burn-uri.c
@@ -44,12 +44,19 @@
 #include "brasero-units.h"
 #include "burn-job.h"
 #include "brasero-plugin-registration.h"
-#include "burn-uri.h"
 
 #include "brasero-track.h"
 #include "brasero-track-data.h"
 #include "brasero-track-image.h"
 
+
+#define BRASERO_TYPE_BURN_URI         (brasero_burn_uri_get_type ())
+#define BRASERO_BURN_URI(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_BURN_URI, BraseroBurnURI))
+#define BRASERO_BURN_URI_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_BURN_URI, BraseroBurnURIClass))
+#define BRASERO_IS_BURN_URI(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_BURN_URI))
+#define BRASERO_IS_BURN_URI_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_BURN_URI))
+#define BRASERO_BURN_URI_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_BURN_URI, BraseroBurnURIClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroBurnURI, brasero_burn_uri, BRASERO_TYPE_JOB, BraseroJob);
 
 struct _BraseroBurnURIPrivate {
diff --git a/plugins/transcode/Makefile.am b/plugins/transcode/Makefile.am
index 898e95b..83f4af3 100644
--- a/plugins/transcode/Makefile.am
+++ b/plugins/transcode/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 transcodedir = $(libdir)/brasero/plugins
 transcode_LTLIBRARIES = libbrasero-transcode.la
 
-libbrasero_transcode_la_SOURCES = burn-transcode.c burn-transcode.h burn-normalize.h
+libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h 
 libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_transcode_la_LDFLAGS = -module -avoid-version
 
@@ -32,7 +32,7 @@ libbrasero_normalize_la_LDFLAGS = -module -avoid-version
 vobdir = $(libdir)/brasero/plugins
 vob_LTLIBRARIES = libbrasero-vob.la
 
-libbrasero_vob_la_SOURCES = burn-vob.c burn-vob.h
+libbrasero_vob_la_SOURCES = burn-vob.c 
 libbrasero_vob_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_vob_la_LDFLAGS = -module -avoid-version
 
diff --git a/plugins/transcode/burn-normalize.c b/plugins/transcode/burn-normalize.c
index 94f5519..741f38d 100644
--- a/plugins/transcode/burn-normalize.c
+++ b/plugins/transcode/burn-normalize.c
@@ -43,8 +43,16 @@
 #include "brasero-tags.h"
 
 #include "burn-job.h"
-#include "brasero-plugin-registration.h"
 #include "burn-normalize.h"
+#include "brasero-plugin-registration.h"
+
+
+#define BRASERO_TYPE_NORMALIZE             (brasero_normalize_get_type ())
+#define BRASERO_NORMALIZE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_NORMALIZE, BraseroNormalize))
+#define BRASERO_NORMALIZE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_NORMALIZE, BraseroNormalizeClass))
+#define BRASERO_IS_NORMALIZE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BRASERO_TYPE_NORMALIZE))
+#define BRASERO_IS_NORMALIZE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), BRASERO_TYPE_NORMALIZE))
+#define BRASERO_NORMALIZE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), BRASERO_TYPE_NORMALIZE, BraseroNormalizeClass))
 
 BRASERO_PLUGIN_BOILERPLATE (BraseroNormalize, brasero_normalize, BRASERO_TYPE_JOB, BraseroJob);
 
diff --git a/plugins/transcode/burn-normalize.h b/plugins/transcode/burn-normalize.h
index 0b141bc..add4e51 100644
--- a/plugins/transcode/burn-normalize.h
+++ b/plugins/transcode/burn-normalize.h
@@ -31,19 +31,10 @@
 #ifndef _BRASERO_NORMALIZE_H_
 #define _BRASERO_NORMALIZE_H_
 
-#include <glib-object.h>
-
-#include "burn-job.h"
+#include <glib.h>
 
 G_BEGIN_DECLS
 
-#define BRASERO_TYPE_NORMALIZE             (brasero_normalize_get_type ())
-#define BRASERO_NORMALIZE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_NORMALIZE, BraseroNormalize))
-#define BRASERO_NORMALIZE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_NORMALIZE, BraseroNormalizeClass))
-#define BRASERO_IS_NORMALIZE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BRASERO_TYPE_NORMALIZE))
-#define BRASERO_IS_NORMALIZE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), BRASERO_TYPE_NORMALIZE))
-#define BRASERO_NORMALIZE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), BRASERO_TYPE_NORMALIZE, BraseroNormalizeClass))
-
 #define BRASERO_ALBUM_PEAK_VALUE	"peak_value"
 #define BRASERO_ALBUM_GAIN_VALUE	"gain_value"
 #define BRASERO_TRACK_PEAK_VALUE	"peak_value"
diff --git a/plugins/transcode/burn-transcode.c b/plugins/transcode/burn-transcode.c
index 8718b1a..5da8ce4 100644
--- a/plugins/transcode/burn-transcode.c
+++ b/plugins/transcode/burn-transcode.c
@@ -49,9 +49,16 @@
 #include "brasero-tags.h"
 #include "burn-job.h"
 #include "brasero-plugin-registration.h"
-#include "burn-transcode.h"
 #include "burn-normalize.h"
 
+
+#define BRASERO_TYPE_TRANSCODE         (brasero_transcode_get_type ())
+#define BRASERO_TRANSCODE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BRASERO_TYPE_TRANSCODE, BraseroTranscode))
+#define BRASERO_TRANSCODE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), BRASERO_TYPE_TRANSCODE, BraseroTranscodeClass))
+#define BRASERO_IS_TRANSCODE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BRASERO_TYPE_TRANSCODE))
+#define BRASERO_IS_TRANSCODE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), BRASERO_TYPE_TRANSCODE))
+#define BRASERO_TRANSCODE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_TRANSCODE, BraseroTranscodeClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroTranscode, brasero_transcode, BRASERO_TYPE_JOB, BraseroJob);
 
 static gboolean brasero_transcode_bus_messages (GstBus *bus,
diff --git a/plugins/transcode/burn-vob.c b/plugins/transcode/burn-vob.c
index 1192dd8..1070bcb 100644
--- a/plugins/transcode/burn-vob.c
+++ b/plugins/transcode/burn-vob.c
@@ -43,7 +43,14 @@
 #include "brasero-tags.h"
 #include "burn-job.h"
 #include "brasero-plugin-registration.h"
-#include "burn-vob.h"
+
+
+#define BRASERO_TYPE_VOB             (brasero_vob_get_type ())
+#define BRASERO_VOB(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_VOB, BraseroVob))
+#define BRASERO_VOB_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_VOB, BraseroVobClass))
+#define BRASERO_IS_VOB(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BRASERO_TYPE_VOB))
+#define BRASERO_IS_VOB_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), BRASERO_TYPE_VOB))
+#define BRASERO_VOB_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), BRASERO_TYPE_VOB, BraseroVobClass))
 
 BRASERO_PLUGIN_BOILERPLATE (BraseroVob, brasero_vob, BRASERO_TYPE_JOB, BraseroJob);
 
diff --git a/plugins/vcdimager/Makefile.am b/plugins/vcdimager/Makefile.am
index 243d0d6..696b058 100644
--- a/plugins/vcdimager/Makefile.am
+++ b/plugins/vcdimager/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 vcdimagerdir = $(libdir)/brasero/plugins
 vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
 
-libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c burn-vcdimager.h
+libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c 
 libbrasero_vcdimager_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn.la
 libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version
 
diff --git a/plugins/vcdimager/burn-vcdimager.c b/plugins/vcdimager/burn-vcdimager.c
index 041b06f..1fad061 100644
--- a/plugins/vcdimager/burn-vcdimager.c
+++ b/plugins/vcdimager/burn-vcdimager.c
@@ -50,9 +50,16 @@
 #include "brasero-plugin-registration.h"
 #include "burn-job.h"
 #include "burn-process.h"
-#include "burn-vcdimager.h"
 #include "brasero-track-stream.h"
 
+
+#define BRASERO_TYPE_VCD_IMAGER             (brasero_vcd_imager_get_type ())
+#define BRASERO_VCD_IMAGER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_VCD_IMAGER, BraseroVcdImager))
+#define BRASERO_VCD_IMAGER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_VCD_IMAGER, BraseroVcdImagerClass))
+#define BRASERO_IS_VCD_IMAGER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BRASERO_TYPE_VCD_IMAGER))
+#define BRASERO_IS_VCD_IMAGER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), BRASERO_TYPE_VCD_IMAGER))
+#define BRASERO_VCD_IMAGER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), BRASERO_TYPE_VCD_IMAGER, BraseroVcdImagerClass))
+
 BRASERO_PLUGIN_BOILERPLATE (BraseroVcdImager, brasero_vcd_imager, BRASERO_TYPE_PROCESS, BraseroProcess);
 
 typedef struct _BraseroVcdImagerPrivate BraseroVcdImagerPrivate;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]