[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Graveman-cvs] Changes to graveman/current/src/cdrecord.c
From: |
sylvain cresto |
Subject: |
[Graveman-cvs] Changes to graveman/current/src/cdrecord.c |
Date: |
Sun, 15 May 2005 13:37:22 -0400 |
Index: graveman/current/src/cdrecord.c
diff -u graveman/current/src/cdrecord.c:1.28
graveman/current/src/cdrecord.c:1.29
--- graveman/current/src/cdrecord.c:1.28 Mon Apr 4 01:37:42 2005
+++ graveman/current/src/cdrecord.c Sun May 15 17:37:21 2005
@@ -67,6 +67,7 @@
/* definition de tous les type de bus */
Tsearchdrive listesearchdrives[] = {
+ { "", "", "SCSI", 110 }, /* scsi (sg) */
#if LINUX_IDE /* pure ide devices with linux */
{ "dev=/dev/hda", "/dev/hda", "IDE", 100 },
{ "dev=/dev/hdb", "/dev/hdb", "IDE", 100 },
@@ -80,15 +81,29 @@
{ "dev=/dev/hdj", "/dev/hdj", "IDE", 100 },
#endif
#if LINUX_SCSI /* SCSI alias with linux */
- { "dev=/dev/scd0", "/dev/scd0", "DSCSI", 90 },
- { "dev=/dev/scd1", "/dev/scd1", "DSCSI", 90 },
- { "dev=/dev/scd2", "/dev/scd2", "DSCSI", 90 },
- { "dev=/dev/scd3", "/dev/scd3", "DSCSI", 90 },
- { "dev=/dev/scd4", "/dev/scd4", "DSCSI", 90 },
- { "dev=/dev/scd5", "/dev/scd5", "DSCSI", 90 },
- { "dev=/dev/scd6", "/dev/scd6", "DSCSI", 90 },
+ { "dev=/dev/scd0", "/dev/scd0", "SCSID", 90 },
+ { "dev=/dev/scd1", "/dev/scd1", "SCSID", 90 },
+ { "dev=/dev/scd2", "/dev/scd2", "SCSID", 90 },
+ { "dev=/dev/scd3", "/dev/scd3", "SCSID", 90 },
+ { "dev=/dev/scd4", "/dev/scd4", "SCSID", 90 },
+ { "dev=/dev/scd5", "/dev/scd5", "SCSID", 90 },
+ { "dev=/dev/scd6", "/dev/scd6", "SCSID", 90 },
+ { "dev=/dev/sr0", "/dev/sr0", "SCSIS", 92 },
+ { "dev=/dev/sr1", "/dev/sr1", "SCSIS", 92 },
+ { "dev=/dev/sr2", "/dev/sr2", "SCSIS", 92 },
+ { "dev=/dev/sr3", "/dev/sr3", "SCSIS", 92 },
+ { "dev=/dev/sr4", "/dev/sr4", "SCSIS", 92 },
+ { "dev=/dev/sr5", "/dev/sr5", "SCSIS", 92 },
+ { "dev=/dev/sr6", "/dev/sr6", "SCSIS", 92 },
+ { "dev=/dev/sg0", "/dev/sg0", "SCSIG", 94 },
+ { "dev=/dev/sg1", "/dev/sg1", "SCSIG", 94 },
+ { "dev=/dev/sg2", "/dev/sg2", "SCSIG", 94 },
+ { "dev=/dev/sg3", "/dev/sg3", "SCSIG", 94 },
+ { "dev=/dev/sg4", "/dev/sg4", "SCSIG", 94 },
+ { "dev=/dev/sg5", "/dev/sg5", "SCSIG", 94 },
+ { "dev=/dev/sg6", "/dev/sg6", "SCSIG", 94 },
+
#endif
- { "", "", "SCSI", 80 }, /* scsi (sg) */
{ "dev=ATA:", "ATA:", "ATA", 60 }, /* ide sg */
{ "dev=ATAPI:", "ATAPI:", "ATAPI", 40 }, /* ide */
{ NULL, NULL, NULL, 0}
@@ -188,7 +203,7 @@
}
/* scan des lecteurs */
-gboolean scan_for_drives(Tgrave *Ag, GError **Aerror)
+gboolean cdrecord_scan_for_drives(Tgrave *Ag, GError **Aerror)
{
gchar **Lcmd;
gchar *Lcommandline;
@@ -244,7 +259,7 @@
}
/* mise a jour capacité du lecteur */
-gboolean maj_drive_info(Tdriveinfo *Adrive, gchar *Adev, GError **Aerror)
+gboolean cdrecord_maj_drive_info(Tdriveinfo *Adrive, gchar *Adev, GError
**Aerror)
{
gchar *Lcommandline, *Lout = NULL, *Lerr = NULL;
gchar *scd = NULL, *sdvd = NULL, *f;
@@ -293,7 +308,7 @@
if (!scd) return FALSE;
- Adrive->type = Ltype; /* type: lecteur ou graveur */
+ Adrive->type += Ltype; /* type: lecteur ou graveur */
Adrive->vitesse = atoi(scd); /* vitesse de lecture ou de gravure maximum */
Adrive->vitessedvd = sdvd ? atoi(sdvd) : -1;
_DEB("== le type => %d\n", Ltype);
@@ -375,7 +390,7 @@
g_snprintf(Lgravident, sizeof(Lgravident)-1, "dst%scombo", Aop);
- Ldevice = get_drive_info(Ag, Lgravident);
+ Ldevice = matos_get_drive_info(Ag, Lgravident);
Lbufvitesse = get_combo_value(Lvitesse);
@@ -770,7 +785,7 @@
gint g_out, g_err, Lnbrarg;
gboolean Lstatus = FALSE;
gchar *Lbufvitesse;
- Tdriveinfo *Ldevice = get_drive_info(Ag, "dstaudiocombo");
+ Tdriveinfo *Ldevice = matos_get_drive_info(Ag, "dstaudiocombo");
gboolean Lsimul =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag,
"audiosimul")));
gboolean Lnotfix =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag,
"audionotfix")));
gboolean Ldaomode =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag,
"audiodao")));
@@ -1006,7 +1021,7 @@
guint Lcomevent, Lcomerrevent;
gint g_out, g_err, Lnbrarg;
gint *Lcont = sc_grave_get_data(Ag, "cont");
- Tdriveinfo *Ldevice = get_drive_info(Ag, "dstothercombo");
+ Tdriveinfo *Ldevice = matos_get_drive_info(Ag, "dstothercombo");
/* pid de cdrecord */
gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
@@ -1085,7 +1100,7 @@
guint Lcomevent, Lcomerrevent;
gint g_out, g_err, Lnbrarg;
gint *Lcont = sc_grave_get_data(Ag, "cont");
- Tdriveinfo *Ldevice = get_drive_info(Ag, "dstothercombo");
+ Tdriveinfo *Ldevice = matos_get_drive_info(Ag, "dstothercombo");
gboolean *Lfastblank = sc_grave_get_data(Ag, "usefastblank");
/* pid de cdrecord */
- [Graveman-cvs] Changes to graveman/current/src/cdrecord.c,
sylvain cresto <=