[Goodies-commits] r5547 - in xfburn/trunk: . xfburn

[David Mohr]

Author: squisher
Date: 2008-10-10 02:25:44 +0000 (Fri, 10 Oct 2008)
New Revision: 5547

Modified:
   xfburn/trunk/configure.in.in
   xfburn/trunk/xfburn/xfburn-main.c
   xfburn/trunk/xfburn/xfburn-transcoder.c
   xfburn/trunk/xfburn/xfburn-transcoder.h
Log:
Cleanup of transcoder base

Modified: xfburn/trunk/configure.in.in
===================================================================
--- xfburn/trunk/configure.in.in	2008-10-09 22:21:32 UTC (rev 5546)
+++ xfburn/trunk/configure.in.in	2008-10-10 02:25:44 UTC (rev 5547)
@@ -80,7 +80,7 @@
 dnl **************************************
 dnl (based on xfce4-mixer (trunk at 27735)
 dnl XDT_CHECK_OPTIONAL_PACKAGE([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10], [0.10.2])
-XDT_CHECK_OPTIONAL_PACKAGE([GSTREAMER], [gstreamer-0.10], [0.10.2], [gstreamer], [GStreamer support for burning audio])
+XDT_CHECK_OPTIONAL_PACKAGE([GST], [gstreamer-0.10], [0.10.2], [gstreamer], [GStreamer support for burning audio])
 
 
 dnl check for debugging support

Modified: xfburn/trunk/xfburn/xfburn-main.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.c	2008-10-09 22:21:32 UTC (rev 5546)
+++ xfburn/trunk/xfburn/xfburn-main.c	2008-10-10 02:25:44 UTC (rev 5547)
@@ -36,7 +36,7 @@
 #include <thunar-vfs/thunar-vfs.h>
 #endif
 
-#ifdef HAVE_GSTREAMER
+#ifdef HAVE_GST
 #include <gst/gst.h>
 #endif
 
@@ -168,7 +168,7 @@
     }
   }
 
-#ifdef HAVE_GSTREAMER
+#ifdef HAVE_GST
   if (!gst_init_check (&argc, &argv, &error)) {
     g_warning ("Failed to initialize gstreamer!");
     /* later make this a soft failure, and just disable gstreamer functionality */
@@ -177,7 +177,7 @@
 #endif
 
   if (show_version) {
-#ifdef HAVE_GSTREAMER
+#ifdef HAVE_GST
     const char *nano_str;
     guint gst_major, gst_minor, gst_micro, gst_nano;
 #endif
@@ -186,7 +186,7 @@
     g_print ("\tbuilt with GTK+-%d.%d.%d, ", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
     g_print ("linked with GTK+-%d.%d.%d.\n", gtk_major_version, gtk_minor_version, gtk_micro_version);
 
-#ifdef HAVE_GSTREAMER
+#ifdef HAVE_GST
     gst_version (&gst_major, &gst_minor, &gst_micro, &gst_nano);
 
     if (gst_nano == 1)

Modified: xfburn/trunk/xfburn/xfburn-transcoder.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder.c	2008-10-09 22:21:32 UTC (rev 5546)
+++ xfburn/trunk/xfburn/xfburn-transcoder.c	2008-10-10 02:25:44 UTC (rev 5547)
@@ -22,8 +22,6 @@
 #include <config.h>
 #endif /* !HAVE_CONFIG_H */
 
-#ifdef HAVE_GSTREAMER
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -39,38 +37,21 @@
 static void xfburn_transcoder_init (XfburnTranscoder * obj);
 static void xfburn_transcoder_finalize (GObject * object);
 
-/*
-static void hal_finalize (LibHalContext  *hal_context);
-static void cb_device_added (LibHalContext *ctx, const char *udi);
-static void cb_device_removed (LibHalContext *ctx, const char *udi);
-static void cb_prop_modified (LibHalContext *ctx, const char *udi, const char *key,
-                              dbus_bool_t is_removed, dbus_bool_t is_added);
-*/
-
 #define XFBURN_TRANSCODER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_TRANSCODER, XfburnTranscoderPrivate))
 
 enum {
-//  VOLUME_CHANGED,
   LAST_SIGNAL,
 }; 
 
 typedef struct {
-/*
-  LibHalContext  *hal_context;
-  DBusConnection *dbus_connection;
-  gchar *error;
-
-#ifdef HAVE_THUNAR_VFS
-  ThunarVfsVolumeManager *thunar_volman;
-#endif
-*/
+  gboolean dummy;
 } XfburnTranscoderPrivate;
 
 /*********************/
 /* class declaration */
 /*********************/
-static XfburnProgressDialogClass *parent_class = NULL;
-//static guint signals[LAST_SIGNAL];
+static GObject *parent_class = NULL;
+static guint signals[LAST_SIGNAL];
 
 GtkType
 xfburn_transcoder_get_type ()
@@ -143,5 +124,3 @@
 {
   return g_object_new (XFBURN_TYPE_TRANSCODER, NULL);
 }
-
-#endif /* HAVE_GSTREAMER */

Modified: xfburn/trunk/xfburn/xfburn-transcoder.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder.h	2008-10-09 22:21:32 UTC (rev 5546)
+++ xfburn/trunk/xfburn/xfburn-transcoder.h	2008-10-10 02:25:44 UTC (rev 5547)
@@ -21,8 +21,6 @@
 #ifndef __XFBURN_TRANSCODER_H__
 #define __XFBURN_TRANSCODER_H__
 
-#ifdef HAVE_GSTREAMER
-
 #ifdef	HAVE_CONFIG_H
 #include <config.h>
 #endif /* !HAVE_CONFIG_H */
@@ -57,6 +55,4 @@
 
 G_END_DECLS
 
-#endif /* HAVE_GSTREAMER */
-
 #endif /* XFBURN_TRANSCODER_H */