--- ./src/io.c Thu May 29 09:14:42 2003 +++ ../xcdroast-0.98alpha14/./src/io.c Tue Jun 17 13:36:55 2003 @@ -5507,7 +5507,11 @@ } /* build command line */ - get_wrap_path_cdrecord(tmp3); + if (curset.isProDVD) { + get_wrap_path("CDRECORDPRODVD", tmp3); + } else { + get_wrap_path("CDRECORD", tmp3); + } g_snprintf(line,MAXLINE,"%s %s -atip 2>&1", tmp3,tmp); @@ -5518,6 +5522,11 @@ g_error("popen error\n"); } + /* syntax for dvd-atip is different */ + if (is_dvdwriter(curset.writer_devnr)) { + found_atip = 1; + } + errcount = 0; for (;;) { if (fgets(line,MAXLINE,fpin) == NULL) @@ -6605,7 +6614,7 @@ read_output_ctrl = 4; } /* check Medium error/buffer underrun */ - if (strncmp(tmp2,"Input/output error",18)) { + if (strncmp(tmp2,"Input/output error",18) == 0) { read_output_ctrl = 5; } } --- ./src/Makefile.in Mon May 19 15:41:48 2003 +++ ../xcdroast-0.98alpha14/./src/Makefile.in Tue Jun 17 14:32:13 2003 @@ -133,7 +133,7 @@ xcdroast_CFLAGS = $(GNUCFLAGS) $(GDK_PIXBUF_CFLAGS) $(EXTRA_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" xcdroast_LDFLAGS = $(EXTRA_LDFLAGS) -xcdroast_LDADD = @LIBINTL@ @ALLOCA@ $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(AUDIO_LIBS) +xcdroast_LDADD = $(LIBINTL) @ALLOCA@ $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(AUDIO_LIBS) wavplay_SOURCES = wavplay.c wav_id.c tools.c largefile.h xcdroast.h wavplay_CFLAGS = $(GNUCFLAGS) $(EXTRA_CFLAGS) --- ./src/xtools.c Mon May 26 14:19:11 2003 +++ ../xcdroast-0.98alpha14/./src/xtools.c Tue Jun 17 13:36:55 2003 @@ -2240,9 +2240,8 @@ if (int1 > int2) { int3 = int1; - GPOINTER_TO_INT(list1->data) = - GPOINTER_TO_INT(list2->data); - GPOINTER_TO_INT(list2->data) = int3; + list1->data = list2->data; + list2->data = GINT_TO_POINTER(int3); } } }