[Goodies-commits] r5548 - xfburn/trunk/xfburn
David Mohr
squisher at xfce.org
Fri Oct 10 04:45:44 CEST 2008
Author: squisher
Date: 2008-10-10 02:45:44 +0000 (Fri, 10 Oct 2008)
New Revision: 5548
Added:
xfburn/trunk/xfburn/xfburn-transcoder-basic.c
xfburn/trunk/xfburn/xfburn-transcoder-basic.h
Removed:
xfburn/trunk/xfburn/xfburn-transcoder.c
xfburn/trunk/xfburn/xfburn-transcoder.h
Modified:
xfburn/trunk/xfburn/Makefile.am
Log:
Renaming the transcoder in preparation for using two separate classes
Modified: xfburn/trunk/xfburn/Makefile.am
===================================================================
--- xfburn/trunk/xfburn/Makefile.am 2008-10-10 02:25:44 UTC (rev 5547)
+++ xfburn/trunk/xfburn/Makefile.am 2008-10-10 02:45:44 UTC (rev 5548)
@@ -17,7 +17,7 @@
xfburn-burn-data-cd-composition-dialog.h \
xfburn-burn-data-dvd-composition-dialog.h \
xfburn-burn-audio-cd-composition-dialog.h \
- xfburn-transcoder.h \
+ xfburn-transcoder-basic.h \
xfburn-burn-image-dialog.h \
xfburn-settings.h \
xfburn-composition.h \
@@ -52,7 +52,7 @@
xfburn-burn-data-cd-composition-dialog.c \
xfburn-burn-data-dvd-composition-dialog.c \
xfburn-burn-audio-cd-composition-dialog.c \
- xfburn-transcoder.c \
+ xfburn-transcoder-basic.c \
xfburn-burn-image-dialog.c \
xfburn-composition.c \
xfburn-compositions-notebook.c \
@@ -84,7 +84,7 @@
$(LIBXFCEGUI4_CFLAGS) \
$(EXO_CFLAGS) \
$(THUNAR_VFS_CFLAGS) \
- $(GSTREAMER_CFLAGS)
+ $(GST_CFLAGS)
xfburn_LDADD = \
$(GTHREAD_LIBS) \
@@ -93,7 +93,7 @@
$(LIBXFCEGUI4_LIBS) \
$(EXO_LIBS) \
$(THUNAR_VFS_LIBS) \
- $(GSTREAMER_LIBS)
+ $(GST_LIBS)
if HAVE_HAL
xfburn_CFLAGS += \
Copied: xfburn/trunk/xfburn/xfburn-transcoder-basic.c (from rev 5547, xfburn/trunk/xfburn/xfburn-transcoder.c)
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-basic.c (rev 0)
+++ xfburn/trunk/xfburn/xfburn-transcoder-basic.c 2008-10-10 02:45:44 UTC (rev 5548)
@@ -0,0 +1,126 @@
+/* $Id$ */
+/*
+ * Copyright (c) 2005-2006 Jean-François Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008 David Mohr (dmohr at mcbf.net)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* !HAVE_CONFIG_H */
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include <libxfce4util/libxfce4util.h>
+#include <libxfcegui4/libxfcegui4.h>
+
+#include "xfburn-global.h"
+
+#include "xfburn-transcoder-basic.h"
+
+static void xfburn_transcoder_basic_class_init (XfburnTranscoderClass * klass);
+static void xfburn_transcoder_basic_init (XfburnTranscoder * obj);
+static void xfburn_transcoder_basic_finalize (GObject * object);
+
+#define XFBURN_TRANSCODER_BASIC_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_TRANSCODER, XfburnTranscoderPrivate))
+
+enum {
+ LAST_SIGNAL,
+};
+
+typedef struct {
+ gboolean dummy;
+} XfburnTranscoderPrivate;
+
+/*********************/
+/* class declaration */
+/*********************/
+static GObject *parent_class = NULL;
+//static guint signals[LAST_SIGNAL];
+
+GtkType
+xfburn_transcoder_basic_get_type ()
+{
+ static GtkType type = 0;
+
+ if (type == 0) {
+ static const GTypeInfo our_info = {
+ sizeof (XfburnTranscoderClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) xfburn_transcoder_basic_class_init,
+ NULL,
+ NULL,
+ sizeof (XfburnTranscoder),
+ 0,
+ (GInstanceInitFunc) xfburn_transcoder_basic_init,
+ NULL
+ };
+
+ type = g_type_register_static (G_TYPE_OBJECT, "XfburnTranscoder", &our_info, 0);
+ }
+
+ return type;
+}
+
+static void
+xfburn_transcoder_basic_class_init (XfburnTranscoderClass * klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (XfburnTranscoderPrivate));
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->finalize = xfburn_transcoder_basic_finalize;
+
+/*
+ signals[VOLUME_CHANGED] = g_signal_new ("volume-changed", XFBURN_TYPE_TRANSCODER, G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (XfburnTranscoderClass, volume_changed),
+ NULL, NULL, g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+*/
+}
+
+static void
+xfburn_transcoder_basic_init (XfburnTranscoder * obj)
+{
+ //XfburnTranscoderPrivate *priv = XFBURN_TRANSCODER_BASIC_GET_PRIVATE (obj);
+}
+
+static void
+xfburn_transcoder_basic_finalize (GObject * object)
+{
+ //XfburnTranscoderPrivate *priv = XFBURN_TRANSCODER_BASIC_GET_PRIVATE (object);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+/* */
+/* internals */
+/* */
+
+/* */
+/* public */
+/* */
+
+GObject *
+xfburn_transcoder_basic_new ()
+{
+ return g_object_new (XFBURN_TYPE_TRANSCODER, NULL);
+}
Property changes on: xfburn/trunk/xfburn/xfburn-transcoder-basic.c
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: xfburn/trunk/xfburn/xfburn-transcoder-basic.h (from rev 5547, xfburn/trunk/xfburn/xfburn-transcoder.h)
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-basic.h (rev 0)
+++ xfburn/trunk/xfburn/xfburn-transcoder-basic.h 2008-10-10 02:45:44 UTC (rev 5548)
@@ -0,0 +1,58 @@
+/* $Id$ */
+/*
+ * Copyright (c) 2005-2006 Jean-François Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008 David Mohr (david at mcbf.net)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __XFBURN_TRANSCODER_BASIC_BASIC_H__
+#define __XFBURN_TRANSCODER_BASIC_BASIC_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* !HAVE_CONFIG_H */
+
+#include <gtk/gtk.h>
+
+#include "xfburn-progress-dialog.h"
+#include "xfburn-device-list.h"
+
+G_BEGIN_DECLS
+
+#define XFBURN_TYPE_TRANSCODER (xfburn_transcoder_basic_get_type ())
+#define XFBURN_TRANSCODER_BASIC(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFBURN_TYPE_TRANSCODER, XfburnTranscoder))
+#define XFBURN_TRANSCODER_BASIC_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), XFBURN_TYPE_TRANSCODER, XfburnTranscoderClass))
+#define XFBURN_IS_TRANSCODER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFBURN_TYPE_TRANSCODER))
+#define XFBURN_IS_TRANSCODER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XFBURN_TYPE_TRANSCODER))
+#define XFBURN_TRANSCODER_BASIC_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XFBURN_TYPE_TRANSCODER, XfburnTranscoderClass))
+
+typedef struct
+{
+ GObject parent;
+} XfburnTranscoder;
+
+typedef struct
+{
+ GObject parent_class;
+
+} XfburnTranscoderClass;
+
+GtkType xfburn_transcoder_basic_get_type ();
+GObject *xfburn_transcoder_basic_new ();
+
+G_END_DECLS
+
+#endif /* XFBURN_TRANSCODER_BASIC_BASIC_H */
Property changes on: xfburn/trunk/xfburn/xfburn-transcoder-basic.h
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Deleted: xfburn/trunk/xfburn/xfburn-transcoder.c
Deleted: xfburn/trunk/xfburn/xfburn-transcoder.h
More information about the Goodies-commits
mailing list