[Graveman-cvs] Changes to graveman/current/src/audio.c

[sylvain cresto]

Index: graveman/current/src/audio.c
diff -u graveman/current/src/audio.c:1.8 graveman/current/src/audio.c:1.9
--- graveman/current/src/audio.c:1.8    Sat Feb 19 17:49:08 2005
+++ graveman/current/src/audio.c        Sun Feb 20 17:45:02 2005
@@ -28,8 +28,8 @@
 gboolean foreachtracks(GtkTreeModel *Amodel, GtkTreePath *Apath, GtkTreeIter 
*Aiter, gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *) Adata;
-  GtkLabel *LTitle = GTK_LABEL(sc_grave_get_widget(Lg, "gravetitle"));
-  gchar **Ltmpdir = (gchar **) sc_grave_get_data(Lg, "tmpdir");
+  GtkLabel *LTitle = GTK_LABEL(sc_grave_get_data(Lg, "gravetitle"));
+  gchar *Ltmpdir = (gchar *) sc_grave_get_data(Lg, "tmpdir");
   gint *Ldone = (gint *) sc_grave_get_data(Lg, "done");  
   gint *Lcont = (gint *) sc_grave_get_data(Lg, "cont");
   GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror");  
@@ -54,7 +54,7 @@
   gtk_label_set_text(LTitle, Lutf8);
   g_free(Lutf8);
 
-  Lvers = g_strdup_printf("%s/piste_%d.cdr", *Ltmpdir, (*Ldone)++);
+  Lvers = g_strdup_printf("%s/piste_%d.cdr", Ltmpdir, (*Ldone)++);
   
   /* conversion pistes audio en piste cdr pour la gravure */ 
   Lreturn = (SoundToCdr(Lg, Lfichierlcl, Lvers, Lerreur) == TRUE ? FALSE : 
TRUE);
@@ -84,24 +84,22 @@
 }
   
 gboolean preparetrack(Tgrave *Ag, GError **Aerror) {
-  gchar **Ltmpdir = (gchar **)sc_grave_get_data(Ag, "tmpdir");
+  gchar *Ltmpdir = (gchar *)sc_grave_get_data(Ag, "tmpdir");
   gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
   gint *Lcont = (gint *)sc_grave_get_data(Ag, "cont");
-  gchar *Lnamedir;
   GtkTreeModel *Ltreemodel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(sc_grave_get_widget(Ag, "LISTEAUDIO")));
-  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, 
"pb_step"));
+  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_data(Ag, 
"pb_step"));
   g_assert(GTK_IS_TREE_MODEL(Ltreemodel));
 
-  Lnamedir = g_strdup_printf("%s/%s", conf_get_string_def("tmpdir", "/tmp"), 
"gravemanXXXXXX");
+  g_snprintf(Ltmpdir, MAXPATHLEN -1, "%s/%s", conf_get_string_def("tmpdir", 
"/tmp"), "gravemanXXXXXX");
 
-  if (!mkdtemp(Lnamedir)) {
+  if (!mkdtemp(Ltmpdir)) {
     g_set_error(Aerror, G_FILE_ERROR, g_file_error_from_errno(errno), "%s %s: 
%s",
-      _("Cannot create directory"), Lnamedir, g_strerror(errno));
-    g_free(Lnamedir);
+      _("Cannot create directory"), Ltmpdir, g_strerror(errno));
+    *Ltmpdir = 0;
     return FALSE;
   }
 
-  *Ltmpdir = Lnamedir;
 
   *Lcont = 2;
   g_timeout_add(500, encours_callback, Ag);
@@ -118,9 +116,8 @@
 
   if (*Labort==TRUE) return FALSE;
   if ((GError *)*Aerror) {
-    deltempdir(Lnamedir);
-    *Ltmpdir = NULL;
-    g_free(Lnamedir);
+    deltempdir(Ltmpdir);
+    *Ltmpdir = 0;
     return FALSE;
   }