Index: graveman/current/src/cdrdao.c
diff -u graveman/current/src/cdrdao.c:1.14 graveman/current/src/cdrdao.c:1.15
--- graveman/current/src/cdrdao.c:1.14 Wed May 4 01:31:06 2005
+++ graveman/current/src/cdrdao.c Tue May 17 01:16:34 2005
@@ -118,24 +118,24 @@
/* champ deja grave */
f=f+strlen(CDRDAO_WROTE);
Lde = atof(f);
- if ((f=next_no_numeric(f))) {
+ if ((f=tools_next_no_numeric(f))) {
*(f++)=0;
if ((f=strstr(f, CDRDAO_OF))) {
f=f+strlen(CDRDAO_OF);
La = atof(f);
- if ((f=next_no_numeric(f))) {
+ if ((f=tools_next_no_numeric(f))) {
*(f++)=0;
if ((f=strstr(f, CDRDAO_BUFFERS))) {
f=f+strlen(CDRDAO_BUFFERS);
e=ltrim(f);
Lgbuf = atof(e);
- if ((f=next_putzero(e, '%'))) {
+ if ((f=tools_next_putzero(e, '%'))) {
e=ltrim(f);
Lfifo = atof(e);
- if (next_putzero(e, '%')) Lok = TRUE;
+ if (tools_next_putzero(e, '%')) Lok = TRUE;
}
}
}
@@ -206,7 +206,7 @@
} else if ((f=strstr(Lbuffer, CDRDAO_ANALYZING))) {
/* mise a jour du titre analyse de la piste en cours */
f=f+strlen(CDRDAO_ANALYZING);
- if ((e=next_no_numeric(f))) {
+ if ((e=tools_next_no_numeric(f))) {
*e=0;
g_snprintf(Lsbuf, sizeof(Lsbuf)-1, _("Analyzing track %s at %s..."), f,
Latspeed);
gtk_label_set_text(Ltitle, Lsbuf);
@@ -214,7 +214,7 @@
} else if ((f=strstr(Lbuffer, CDRDAO_WRITING_TRACK))) {
/* mise a jour du titre ecriture de la piste en cours */
f=f+strlen(CDRDAO_WRITING_TRACK);
- if ((e=next_no_numeric(f))) {
+ if ((e=tools_next_no_numeric(f))) {
gboolean *Lsimul = (gboolean *) sc_grave_get_data(Lg, "simul"); /*
simulation */
*e=0;
@@ -230,7 +230,7 @@
} else if ((f=strstr(Lbuffer, CDRDAO_COPYING_TRACK))) {
/* mise a jour du titre ecriture de la piste en cours */
f=f+strlen(CDRDAO_COPYING_TRACK);
- if ((e=next_no_numeric(f))) {
+ if ((e=tools_next_no_numeric(f))) {
*e=0;
g_snprintf(Llasttrack, _BUF_SIZE-1, "%s", f);
g_snprintf(Lsbuf, sizeof(Lsbuf)-1, _("Reading track %s at %s..."), f,
Latspeed);
@@ -265,8 +265,8 @@
gboolean copycd(Tgrave *Ag, GError **Aerror) {
GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_data(Ag, "window_burn"));
GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstcopyspeed");
- Tdriveinfo *Lsource = get_drive_info(Ag, "srccopycombo");
- Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstcopycombo");
+ Tdriveinfo *Lsource = matos_get_drive_info(Ag, "srccopycombo");
+ Tdriveinfo *Lgraveur = matos_get_drive_info(Ag, "dstcopycombo");
gchar *Lrepertoire = (gchar *)sc_grave_get_data(Ag, "tmpdir");
gchar *Liso = (gchar *)sc_grave_get_data(Ag, "iso");
gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Ag,
"operationstatus");
@@ -354,6 +354,9 @@
* si il faut realiser d'autre gravure sur d'autres CD-R */
Leject = ((Lcurcd > 1 && (Lwanteject || Lcurcd<Lnbrgravure)) || (Lcurcd ==
1 && !Ldosimul && Lwanteject));
+ /* try to umount device before device access */
+ matos_umount_device(Lgraveur, NULL);
+
/* if (Lonfly || Ldosimul || Lcurcd == 1) {
* copie a la volé, ou simulation, ou cd numero 1, on n'utilise pas
l'image sauvé
* lors de la precedente operation */
_______________________________________________
Graveman-cvs mailing list
Graveman-cvs@nongnu.org
http://lists.nongnu.org/mailman/listinfo/graveman-cvs
