[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Graveman-cvs] Changes to graveman/current/src/matos.c
From: |
sylvain cresto |
Subject: |
[Graveman-cvs] Changes to graveman/current/src/matos.c |
Date: |
Thu, 31 Mar 2005 17:53:18 -0500 |
Index: graveman/current/src/matos.c
diff -u graveman/current/src/matos.c:1.26 graveman/current/src/matos.c:1.27
--- graveman/current/src/matos.c:1.26 Thu Mar 31 22:14:12 2005
+++ graveman/current/src/matos.c Thu Mar 31 22:53:12 2005
@@ -157,12 +157,10 @@
/* operation de copie */
gboolean burn_copy(Tgrave *Ag, GError **Aerror)
{
- GtkWidget *Llecteur = sc_grave_get_widget(Ag, "srccopycombo");
- GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstcopycombo");
+ Tdriveinfo *Lsource = get_drive_info(Ag, "srccopycombo");
+ Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstcopycombo");
GtkEntry *Llecteuriso = GTK_ENTRY(sc_grave_get_widget(Ag,
"srccopybtnvalue"));
GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag,
"dstcopybtnvalue"));
- gchar *Lsrc = get_combo_value(Llecteur);
- gchar *Ldst = get_combo_value(Lgraveur);
gchar *Ltxt;
gboolean Lstatus;
gboolean Loperationstatus = FALSE;
@@ -171,9 +169,9 @@
gchar Ltmpdir[MAXPATHLEN]="";
gchar Liso[MAXPATHLEN]="";
const gchar *Lptriso;
-_DEB("DEBUT COPIE !! 0");
+_DEB("DEBUT COPIE !!");
- if (!strcmp(Lsrc, "iso") && !strcmp(Ldst, "iso")) {
+ if (!Lsource && !Lgraveur) {
g_set_error(Aerror, GRAVEMAN_ERROR, _ERR_INAPPROPRIATE_MODE,
_("Cannot duplicate an iso image to an another iso image with graveman,
just copy this file !"));
return FALSE;
@@ -186,7 +184,7 @@
sc_grave_set_data(Ag, &Ltmpdir, "tmpdir"); /* repertoire temporraire */
sc_grave_set_data(Ag, Aerror, "gerror"); /* pointeur retour des erreurs */
- if (!strcmp(Lsrc, "iso")) {
+ if (!Lsource) {
/* copie d'une image vers un cd, on utilise cdrecord */
Lptriso = gtk_entry_get_text(Llecteuriso);
Ltxt = _FILENAME(Lptriso);
@@ -209,7 +207,7 @@
sc_grave_del_data(Ag, "iso");
}
g_free(Liso);
- } else if (!strcmp(Ldst, "iso")) {
+ } else if (!Lgraveur) {
/* copie d'un cd vers une image, on utilise readcd */
struct stat Lfstat;
Lptriso = gtk_entry_get_text(Lgraveuriso);
@@ -306,8 +304,6 @@
sc_grave_del_data(Ag, "tmpdir");
sc_grave_del_data(Ag, "gerror");
- g_free(Ldst);
- g_free(Lsrc);
return Lstatus;
}
@@ -317,10 +313,9 @@
gint Ltodo =
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag,
"nbrcddata")));
gboolean Lsimul =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag,
"datasimul")));
GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag,
"dstdatabtnvalue"));
- GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstdatacombo");
+ Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstdatacombo");
gboolean *Labort = sc_grave_get_data(Ag, "gabort");
gint Ldone = 1;
- gchar *Ldst = get_combo_value(Lgraveur);
gchar Ltmpdir[MAXPATHLEN] = "";
gchar *Lextrapara = NULL;
gchar Liso[MAXPATHLEN] = "";
@@ -338,8 +333,7 @@
* l'operation */
Lstatus = preparedata(Ag, Aerror);
- _DEB("i1ci LDST => %s\n", Ldst);
- if (strcmp(Ldst, "iso")) {
+ if (Lgraveur) {
g_snprintf(Liso, MAXPATHLEN-1, "%s.iso", Ltmpdir);
Ltodo+=(Lsimul ? 2 : 1); /* + 1 pour l'ecriture de l'image iso et 1 pour
la simulation */
} else {
@@ -356,7 +350,7 @@
Lstatus = make_iso(Ag, Aerror);
sc_grave_del_data(Ag, "extrapara");
g_free(Lextrapara);
- if (strcmp(Ldst, "iso") && Lstatus && *Labort==FALSE) {
+ if (Lgraveur && Lstatus && *Labort==FALSE) {
/* ici il faut appeler cdrecord ! */
Lextrapara = burn_data_getextrapara(Ag);
sc_grave_set_data(Ag, Lextrapara, "extrapara"); /* parametres
supplementaires */
@@ -368,7 +362,7 @@
unlink (Ltmpdir);
- if (strcmp(Ldst, "iso") && *Liso
+ if (Lgraveur && *Liso
&& g_file_test(Liso, G_FILE_TEST_EXISTS + G_FILE_TEST_IS_REGULAR)==TRUE)
{
unlink(Liso);
}
@@ -497,9 +491,8 @@
gint Ltodo =
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag,
"nbrdvddata")));
gboolean Lsimul =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag,
"dvddatasimul")));
GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag,
"dstdvddatabtnvalue"));
- GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstdvddatacombo");
+ Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstdvddatacombo");
gint Ldone = 1;
- gchar *Ldst = get_combo_value(Lgraveur);
gchar Ltmpdir[MAXPATHLEN] = "";
gchar *Lextrapara = NULL;
gchar *Ltmp;
@@ -516,12 +509,11 @@
/* on retourne dans ltmp le nom du repertoire temporraire utilise pour
* l'operation */
Lstatus = preparedata(Ag, Aerror);
-_DEB("ici 1LDST => %s\n", Ldst);
Lextrapara = make_image_getextrapara(Ag, "dvddata");
sc_grave_set_data(Ag, Lextrapara, "extrapara"); /* parametres
supplementaires */
- if (strcmp(Ldst, "iso")) {
+ if (Lgraveur) {
if (Lsimul) Ltodo++; /* 1 pour la simulation */
Lstatus = burn_dvd(Ag, Aerror);
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/01
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/03
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/11
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/20
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/21
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/27
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/28
- [Graveman-cvs] Changes to graveman/current/src/matos.c, sylvain cresto, 2005/03/31
- [Graveman-cvs] Changes to graveman/current/src/matos.c,
sylvain cresto <=