[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Graveman-cvs] Changes to graveman/current/src/cdrdao.c
From: |
sylvain cresto |
Subject: |
[Graveman-cvs] Changes to graveman/current/src/cdrdao.c |
Date: |
Sun, 22 May 2005 07:20:47 -0400 |
Index: graveman/current/src/cdrdao.c
diff -u graveman/current/src/cdrdao.c:1.15 graveman/current/src/cdrdao.c:1.16
--- graveman/current/src/cdrdao.c:1.15 Tue May 17 01:16:34 2005
+++ graveman/current/src/cdrdao.c Sun May 22 11:20:41 2005
@@ -103,6 +103,12 @@
}
Lbuffer[Llu]=0;
_DEB("===>%s", Lbuffer);
+ if ((f=strstr(Lbuffer, CDRDAO_LENGTH))) {
+ /* longueur total du cd */
+ f=f+strlen(CDRDAO_LENGTH);
+ *Llength = get_2time(f);
+ if (*Llength < 0) *Llength = 0;
+ }
if ((f=strstr(Lbuffer, CDRDAO_WROTE))) {
/* copie en cours */
@@ -177,6 +183,15 @@
g_snprintf(Lsbuf, sizeof(Lsbuf)-1, _("Reading track %s at %s..."), f,
Latspeed);
gtk_label_set_text(Ltitle, Lsbuf);
}
+ } else if ((f=strstr(Lbuffer, CDRDAO_ATSPEED))) {
+ /* vitesse reel operation */
+ f=f+strlen(CDRDAO_ATSPEED);
+ e=f;
+ for (e=f; isdigit(*e); e++) ;
+ *e=0;
+ if (*f) {
+ g_snprintf(Latspeed, _BUF_SIZE-1, "%sx", f);
+ }
} else if ((strchr(Lbuffer, 13))) {
/* operation lecture d'une piste en cours */
glong Lcur = get_2time(Lbuffer);
@@ -189,20 +204,6 @@
Ltava = (1.0/ (*Ltodo)) * ((*Ldone)-1+Lpct);
maj_progress(Lprogressbar, Ltava);
}
- } else if ((f=strstr(Lbuffer, CDRDAO_LENGTH))) {
- /* longueur total du cd */
- f=f+strlen(CDRDAO_LENGTH);
- *Llength = get_2time(f);
- if (*Llength < 0) *Llength = 0;
- } else if ((f=strstr(Lbuffer, CDRDAO_ATSPEED))) {
- /* vitesse reel operation */
- f=f+strlen(CDRDAO_ATSPEED);
- e=f;
- for (e=f; isdigit(*e); e++) ;
- *e=0;
- if (*f) {
- g_snprintf(Latspeed, _BUF_SIZE-1, "%sx", f);
- }
} else if ((f=strstr(Lbuffer, CDRDAO_ANALYZING))) {
/* mise a jour du titre analyse de la piste en cours */
f=f+strlen(CDRDAO_ANALYZING);
@@ -354,7 +355,8 @@
* 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 */
+ /* try to umount devices before access */
+ matos_umount_device(Lsource, NULL);
matos_umount_device(Lgraveur, NULL);
/* if (Lonfly || Ldosimul || Lcurcd == 1) {