[Goodies-commits] r7502 - xfburn/trunk/xfburn
David Mohr
squisher at xfce.org
Mon Jun 8 07:33:30 CEST 2009
Author: squisher
Date: 2009-06-08 05:33:29 +0000 (Mon, 08 Jun 2009)
New Revision: 7502
Modified:
xfburn/trunk/xfburn/Makefile.am
xfburn/trunk/xfburn/xfburn-audio-composition.c
xfburn/trunk/xfburn/xfburn-audio-composition.h
xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
xfburn/trunk/xfburn/xfburn-transcoder-gst.c
xfburn/trunk/xfburn/xfburn-transcoder-gst.h
xfburn/trunk/xfburn/xfburn-transcoder.h
Log:
Converting audiotracks to GBoxedType - memory leaks probably remain
Modified: xfburn/trunk/xfburn/Makefile.am
===================================================================
--- xfburn/trunk/xfburn/Makefile.am 2009-06-08 01:13:03 UTC (rev 7501)
+++ xfburn/trunk/xfburn/Makefile.am 2009-06-08 05:33:29 UTC (rev 7502)
@@ -1,5 +1,5 @@
INCLUDES = \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DEXO_API_SUBJECT_TO_CHANGE \
-DEXO_DISABLE_DEPRECATED \
-DDATADIR=\"$(datadir)\" \
@@ -18,9 +18,11 @@
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-transcoder-gst.h \
+ xfburn-transcoder.h \
+ xfburn-audio-track.h \
+ xfburn-transcoder-basic.h \
+ xfburn-transcoder-gst.h \
+ xfburn-audio-track-gst.h \
xfburn-burn-image-dialog.h \
xfburn-settings.h \
xfburn-composition.h \
@@ -45,10 +47,10 @@
xfburn-stock.h \
xfburn-utils.h \
xfburn-main.h
-
+
xfburn_SOURCES = \
$(xfburn_headers) \
- xfburn-error.c \
+ xfburn-error.c \
xfburn-adding-progress.c \
xfburn-blank-dialog.c \
xfburn-perform-burn.c \
@@ -56,9 +58,11 @@
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-transcoder-gst.c \
+ xfburn-transcoder.c \
+ xfburn-audio-track.c \
+ xfburn-transcoder-basic.c \
+ xfburn-transcoder-gst.c \
+ xfburn-audio-track-gst.c \
xfburn-burn-image-dialog.c \
xfburn-composition.c \
xfburn-compositions-notebook.c \
@@ -67,21 +71,21 @@
xfburn-device-box.c \
xfburn-device-list.c \
xfburn-progress-dialog.c \
- xfburn-main.c \
+ xfburn-main.c \
xfburn-main-window.c \
xfburn-notebook-tab.c \
xfburn-file-browser.c \
- xfburn-welcome-tab.c \
- xfburn-data-composition.c \
- xfburn-audio-composition.c \
+ xfburn-welcome-tab.c \
+ xfburn-data-composition.c \
+ xfburn-audio-composition.c \
xfburn-disc-usage.c \
xfburn-data-disc-usage.c \
xfburn-audio-disc-usage.c \
- xfburn-fs-browser.c \
+ xfburn-fs-browser.c \
xfburn-directory-browser.c \
xfburn-preferences-dialog.c \
xfburn-stock.c \
- xfburn-utils.c
+ xfburn-utils.c
xfburn_CFLAGS = \
$(GTHREAD_CFLAGS) \
@@ -90,7 +94,7 @@
$(LIBXFCEGUI4_CFLAGS) \
$(EXO_CFLAGS) \
$(THUNAR_VFS_CFLAGS) \
- $(GST_CFLAGS) \
+ $(GST_CFLAGS) \
$(GST_PBUTILS_CFLAGS)
xfburn_LDADD = \
@@ -101,7 +105,7 @@
$(LIBXFCEGUI4_LIBS) \
$(EXO_LIBS) \
$(THUNAR_VFS_LIBS) \
- $(GST_LIBS) \
+ $(GST_LIBS) \
$(GST_PBUTILS_LIBS)
if HAVE_HAL
@@ -126,3 +130,5 @@
xfburn-create-iso-progress-dialog.c
EXTRA_DIST = $(missing_files)
+
+# vi:set ts=8 sw=8 noet ai nocindent softtabstop=0 list listchars=tab\:>-:
Modified: xfburn/trunk/xfburn/xfburn-audio-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-audio-composition.c 2009-06-08 01:13:03 UTC (rev 7501)
+++ xfburn/trunk/xfburn/xfburn-audio-composition.c 2009-06-08 05:33:29 UTC (rev 7502)
@@ -119,6 +119,7 @@
static void xfburn_audio_composition_init (XfburnAudioComposition *dc);
static void xfburn_audio_composition_finalize (GObject * object);
+/* internals */
static void show_custom_controls (XfburnComposition *composition);
static void hide_custom_controls (XfburnComposition *composition);
static void load_from_file (XfburnComposition *composition, const gchar *file);
@@ -382,8 +383,8 @@
priv->content = exo_tree_view_new ();
model = gtk_tree_store_new (AUDIO_COMPOSITION_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING,
- G_TYPE_UINT64, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_POINTER);
-
+ G_TYPE_UINT64, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, XFBURN_TYPE_AUDIO_TRACK);
+
/*
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model), AUDIO_COMPOSITION_COLUMN_POS,
song_tree_sortfunc, NULL, NULL);
@@ -502,8 +503,6 @@
}
}
- /* FIXME: free XfburnAudioTracks */
-
g_object_unref (priv->trans);
priv->trans = NULL;
Modified: xfburn/trunk/xfburn/xfburn-audio-composition.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-audio-composition.h 2009-06-08 01:13:03 UTC (rev 7501)
+++ xfburn/trunk/xfburn/xfburn-audio-composition.h 2009-06-08 05:33:29 UTC (rev 7502)
@@ -54,7 +54,7 @@
AUDIO_COMPOSITION_DND_TARGET_TEXT_URI_LIST,
};
-GtkType xfburn_audio_composition_get_type (void);
+GType xfburn_audio_composition_get_type (void);
GtkWidget *xfburn_audio_composition_new (void);
void xfburn_audio_composition_add_files (XfburnAudioComposition *content, int filec, char **filenames);
Modified: xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c 2009-06-08 01:13:03 UTC (rev 7501)
+++ xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c 2009-06-08 05:33:29 UTC (rev 7502)
@@ -83,10 +83,10 @@
/* globals */
static XfceTitledDialogClass *parent_class = NULL;
-GtkType
+GType
xfburn_burn_audio_cd_composition_dialog_get_type ()
{
- static GtkType type = 0;
+ static GType type = 0;
if (type == 0) {
static const GTypeInfo our_info = {
@@ -428,8 +428,6 @@
g_free (tracks);
g_free (track_sectors);
- for (track_list = params->tracks; track_list; track_list = g_slist_next (track_list))
- xfburn_transcoder_free_burning_resources (trans, (XfburnAudioTrack *) track_list->data, NULL);
g_object_unref (trans);
burn_session_free (session);
Modified: xfburn/trunk/xfburn/xfburn-transcoder-gst.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-gst.c 2009-06-08 01:13:03 UTC (rev 7501)
+++ xfburn/trunk/xfburn/xfburn-transcoder-gst.c 2009-06-08 05:33:29 UTC (rev 7502)
@@ -49,6 +49,8 @@
#include "xfburn-settings.h"
#include "xfburn-transcoder-gst.h"
+#include "xfburn-audio-track.h"
+#include "xfburn-audio-track-gst.h"
/*
@@ -81,7 +83,6 @@
static gboolean prepare (XfburnTranscoder *trans, GError **error);
static gboolean transcode_next_track (XfburnTranscoderGst *trans, GError **error);
static void finish (XfburnTranscoder *trans);
-static gboolean free_burning_resources (XfburnTranscoder *trans, XfburnAudioTrack *atrack, GError **error);
static gboolean is_initialized (XfburnTranscoder *trans, GError **error);
@@ -127,12 +128,6 @@
} XfburnTranscoderGstPrivate;
-typedef struct {
- int fd_in;
- off_t size;
-} XfburnAudioTrackGst;
-
-
/* constants */
#define SIGNAL_WAIT_TIMEOUT_MICROS 1500000
@@ -249,7 +244,7 @@
iface->is_initialized = is_initialized;
iface->get_audio_track = get_audio_track;
iface->create_burn_track = create_burn_track;
- iface->free_burning_resources = free_burning_resources;
+ /* free_burning_resources is not needed */
iface->finish = finish;
iface->prepare = prepare;
}
@@ -823,6 +818,7 @@
gtrack = g_new0 (XfburnAudioTrackGst, 1);
atrack->data = (gpointer) gtrack;
+ atrack->type = XFBURN_TYPE_AUDIO_TRACK_GST;
gtrack->size = size;
@@ -830,7 +826,7 @@
}
-
+/* initialize the XfburnAudioTrack */
static struct burn_track *
create_burn_track (XfburnTranscoder *trans, XfburnAudioTrack *atrack, GError **error)
{
@@ -1010,23 +1006,7 @@
recreate_pipeline (gst);
}
-static gboolean
-free_burning_resources (XfburnTranscoder *trans, XfburnAudioTrack *atrack, GError **error)
-{
- /*
- XfburnTranscoderGst *gst = XFBURN_TRANSCODER_GST (trans);
- XfburnTranscoderGstPrivate *priv= XFBURN_TRANSCODER_GST_GET_PRIVATE (gst);
- */
-
- XfburnAudioTrackGst *gtrack = XFBURN_AUDIO_TRACK_GET_GST (atrack);
-
- g_free (gtrack);
- atrack->data = NULL;
- return TRUE;
-}
-
-
static gboolean
is_initialized (XfburnTranscoder *trans, GError **error)
{
Modified: xfburn/trunk/xfburn/xfburn-transcoder-gst.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-gst.h 2009-06-08 01:13:03 UTC (rev 7501)
+++ xfburn/trunk/xfburn/xfburn-transcoder-gst.h 2009-06-08 05:33:29 UTC (rev 7502)
@@ -51,7 +51,7 @@
} XfburnTranscoderGstClass;
-GtkType xfburn_transcoder_gst_get_type ();
+GType xfburn_transcoder_gst_get_type ();
GObject *xfburn_transcoder_gst_new ();
G_END_DECLS
Modified: xfburn/trunk/xfburn/xfburn-transcoder.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder.h 2009-06-08 01:13:03 UTC (rev 7501)
+++ xfburn/trunk/xfburn/xfburn-transcoder.h 2009-06-08 05:33:29 UTC (rev 7502)
@@ -26,8 +26,9 @@
#include <glib.h>
#include <glib-object.h>
-#include <libburn.h>
+#include "xfburn-audio-track.h"
+
G_BEGIN_DECLS
#define XFBURN_TYPE_TRANSCODER (xfburn_transcoder_get_type ())
@@ -36,23 +37,6 @@
//#define XFBURN_IS_TRANSCODER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XFBURN_TYPE_TRANSCODER))
#define XFBURN_TRANSCODER_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), XFBURN_TYPE_TRANSCODER, XfburnTranscoderInterface))
-typedef struct
-{
- gchar *inputfile;
- gint pos;
- gchar *artist;
- gchar *title;
- gboolean swap;
-
- gint length;
-
- int sectors;
- int fd;
- struct burn_source *src;
-
- gpointer data; /* implementations will add extra data here */
-} XfburnAudioTrack;
-
#define XFBURN_AUDIO_TRACK_DELETE_DATA(atrack) { g_free (atrack->data); atrack->data = NULL; }
typedef struct {} XfburnTranscoder; /* dummy struct */
More information about the Goodies-commits
mailing list