head 1.10; access; symbols pkgsrc-2013Q2:1.10.0.52 pkgsrc-2013Q2-base:1.10 pkgsrc-2012Q4:1.10.0.50 pkgsrc-2012Q4-base:1.10 pkgsrc-2011Q4:1.10.0.48 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q2:1.10.0.46 pkgsrc-2011Q2-base:1.10 pkgsrc-2009Q4:1.10.0.44 pkgsrc-2009Q4-base:1.10 pkgsrc-2008Q4:1.10.0.42 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.40 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.38 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.36 pkgsrc-2008Q2-base:1.10 pkgsrc-2008Q1:1.10.0.34 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.32 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.30 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.28 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.26 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.10.0.24 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.10.0.22 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.20 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.10.0.18 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.10.0.16 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.10.0.14 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.12 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.10 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.8 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.6 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.10.0.4 pkgsrc-2004Q2-base:1.10 pkgsrc-2004Q1:1.10.0.2 pkgsrc-2004Q1-base:1.10 pkgsrc-2003Q4:1.9.0.2 pkgsrc-2003Q4-base:1.9 netbsd-1-6-1:1.7.0.2 netbsd-1-6-1-base:1.7 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.2; locks; strict; comment @# @; 1.10 date 2003.12.28.19.29.21; author jmmv; state dead; branches; next 1.9; 1.9 date 2003.06.07.14.37.02; author cjep; state Exp; branches; next 1.8; 1.8 date 2003.06.05.16.15.48; author drochner; state Exp; branches; next 1.7; 1.7 date 2002.12.02.20.29.49; author drochner; state Exp; branches; next 1.6; 1.6 date 2002.10.27.21.46.12; author martin; state Exp; branches; next 1.5; 1.5 date 2002.10.26.17.05.30; author frueauf; state Exp; branches; next 1.4; 1.4 date 2002.09.26.12.29.56; author jlam; state Exp; branches; next 1.3; 1.3 date 2001.08.07.11.27.35; author drochner; state Exp; branches; next 1.2; 1.2 date 2001.03.11.11.04.20; author drochner; state Exp; branches; next 1.1; 1.1 date 2001.03.10.10.31.33; author drochner; state Exp; branches; next ; desc @@ 1.10 log @Update to 0.98alpha15: * GTK2 support. * updated lot of translations, added romanian, latvian and albanian. * numerous bug fixes. * included a contrib-directory with the sources with some useful stuff sent to me by X-CD-Roast users. @ text @$NetBSD: patch-ac,v 1.9 2003/06/07 14:37:02 cjep Exp $ --- src/io.c.orig 2003-05-29 15:14:42.000000000 +0200 +++ src/io.c 2003-06-05 17:56:20.000000000 +0200 @@@@ -24,6 +24,14 @@@@ #include #include #include +#ifdef __NetBSD__ +# include +# ifdef HAVE_OSS +# include +# else +# include +# endif +#endif #if defined(linux) || defined(__FreeBSD__) # include # include @@@@ -1690,22 +1698,22 @@@@ struct stat buf; #endif -#if defined(sun) || defined(aix) || defined(__OpenBSD__) +#if defined(sun) || defined(aix) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS)) gchar *audiodev; #endif dsp = NULL; -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS)) /* for linux check if /dev/dsp or /dev/dsp1 exist */ - if (stat("/dev/dsp",&buf) == 0) { - dsp = g_list_append(dsp,"/dev/dsp"); + if (stat("@@DEVOSSAUDIO@@",&buf) == 0) { + dsp = g_list_append(dsp,"@@DEVOSSAUDIO@@"); } if (stat("/dev/dsp1",&buf) == 0) { dsp = g_list_append(dsp,"/dev/dsp1"); } #endif -#if defined(sun) || defined(__OpenBSD__) +#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS)) /* check if the user has any special audio-hardware running, which set the AUDIODEV-environment-variable */ audiodev = getenv("AUDIODEV"); @@@@ -1814,15 +1822,15 @@@@ struct stat buf; # endif #endif -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS)) gchar tmp2[MAXLINE]; #endif strcpy(ret,""); -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS)) - if (strncmp(dsp,"/dev/dsp",8) == 0) { + if (strncmp(dsp,"@@DEVOSSAUDIO@@",8) == 0) { strcpy(tmp,dsp+8); g_snprintf(tmp2,MAXLINE,"/dev/mixer%s",tmp); @@@@ -1832,7 +1840,7 @@@@ } } #endif -#if defined(sun) || defined(__OpenBSD__) +#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS)) g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl"); @@@@ -3573,10 +3581,10 @@@@ #if !(defined(__MACH__) && defined(__APPLE__)) gint mix; #endif -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS)) gint val; #endif -#if defined(sun) || defined(__OpenBSD__) +#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS)) audio_info_t ainfo; #endif #ifdef hpux @@@@ -3591,7 +3599,7 @@@@ return -1; } -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS)) dodebug(10,"quering mixer %s\n", setupdata.mix_device); mix = open(setupdata.mix_device, O_RDWR); @@@@ -3611,7 +3619,7 @@@@ return ((val & 0x7f) + ((val >> 8) & 0x7f))/2; #endif -#if defined(sun) || defined(__OpenBSD__) +#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS)) dodebug(10,"quering mixer %s\n", setupdata.mix_device); mix = open(setupdata.mix_device, O_RDONLY); @@@@ -3699,7 +3707,7 @@@@ #if !(defined(__MACH__) && defined(__APPLE__)) gint mix; #endif -#if defined(sun) || defined(__OpenBSD__) +#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS)) audio_info_t ainfo; #endif #ifdef aix @@@@ -3717,7 +3725,7 @@@@ return -1; } -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS)) dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val); mix = open(setupdata.mix_device, O_RDWR); @@@@ -3735,7 +3743,7 @@@@ close(mix); #endif -#if defined(sun) || defined(__OpenBSD__) +#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS)) dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val); mix = open(setupdata.mix_device, O_WRONLY); @@@@ -5507,7 +5515,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 +5530,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 +6622,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; } } @ 1.9 log @Add NetBSD RCS tags. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @update to 0.98a14 changes: full drag&drop support (rearrange tracks or add files to master from KDE/Gnome). completely new non-root-mode which does not require any group or a change of modes on the cdrtools. complete rewrite of internal device handling. Up to 64 devices can be independently configured and used. Devices are no longer scanned at each startup, support for remote-scsi (networked devices), Linux kernel-2.5.x devices and any other cdrecord supports. improved Mac OS X support with automatic autodiskmount daemon handling. support copy of audio-CDs on-the-fly. save window positions and sizes. display progress of reading/writing in window title. even more integration of cdrecord-ProDVD. Full support of DVD-R/RW and DVD+R/RW with newest ProDVD-versions. added greek and ukrainian translations, updated most others. a helpful HTML-manual in doc/manual (online: http://www.xcdroast.org/manual) numerous usage improvements and bug fixes. @ text @d1 1 @ 1.7 log @update to 0.98alpha11. There is a major restructuring of the sources, more than to be expected from the subminor version change. Still needs some finetuning... Most notable change: multisession support. @ text @d1 3 a3 5 $NetBSD$ --- src/io.c.orig Sun Nov 24 20:02:58 2002 +++ src/io.c Mon Dec 2 20:21:20 2002 @@@@ -19,6 +19,14 @@@@ d18 1 a18 1 @@@@ -1200,22 +1208,22 @@@@ d46 1 a46 1 @@@@ -1297,15 +1305,15 @@@@ d65 1 a65 1 @@@@ -1315,7 +1323,7 @@@@ d74 1 a74 1 @@@@ -2795,10 +2803,10 @@@@ d87 1 a87 1 @@@@ -2813,7 +2821,7 @@@@ d96 1 a96 1 @@@@ -2833,7 +2841,7 @@@@ d105 1 a105 1 @@@@ -2921,7 +2929,7 @@@@ d114 1 a114 1 @@@@ -2939,7 +2947,7 @@@@ d123 1 a123 1 @@@@ -2957,7 +2965,7 @@@@ d132 34 @ 1.6 log @Backout previous. Casting NULL to (void*) for variadic functions of course does not make any difference on 64 bit platforms - as long as a valid prototype has been seen, which is the case here - io.c includes unistd.h. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2002/09/26 12:29:56 jlam Exp $ d3 3 a5 3 --- io.c.orig Tue Jul 17 12:39:11 2001 +++ io.c @@@@ -16,6 +16,14 @@@@ d20 1 a20 3 @@@@ -996,22 +1004,22 @@@@ GList *get_dsp_devices() { GList *dsp; GList *loop; d22 4 a25 2 -#ifdef sun +#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS)) d43 2 a44 2 -#ifdef sun +#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS)) d48 1 a48 3 @@@@ -1066,15 +1074,15 @@@@ gchar *audiodev; gchar *gen_mix_from_dspdev(gchar *dsp, gchar *ret) { gchar tmp[MAXLINE]; d50 2 d67 1 a67 1 @@@@ -1084,7 +1092,7 @@@@ gchar tmp2[MAXLINE]; d71 2 a72 2 -#ifdef sun +#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS)) d76 2 a77 3 @@@@ -2362,10 +2370,10 @@@@ gint count; gint query_mixer() { d79 1 d84 2 a85 2 -#ifdef sun +#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS)) d89 1 a89 1 @@@@ -2380,7 +2388,7 @@@@ struct audio_gains again; d98 1 a98 1 @@@@ -2400,7 +2408,7 @@@@ struct audio_gains again; d102 2 a103 2 -#ifdef sun +#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS)) d107 2 a108 3 @@@@ -2450,7 +2458,7 @@@@ struct audio_gains again; gint set_mixer(gint val) { d110 3 a112 2 -#ifdef sun +#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS)) d115 2 a116 2 #ifdef hpux @@@@ -2464,7 +2472,7 @@@@ struct audio_gains again; d125 1 a125 1 @@@@ -2482,7 +2490,7 @@@@ struct audio_gains again; d129 2 a130 2 -#ifdef sun +#if defined(sun) || (defined(__NetBSD__) && !defined(HAVE_OSS)) a133 10 @@@@ -3275,6 +3283,9 @@@@ gint ret,found; /* got the message that no medium is present? in this case, ignore return code */ if (strstr(line,"medium not present")) { + found = 1; + } + if (strstr(line,"Device not ready")) { found = 1; } } @ 1.5 log @According to Avon Barksdale , the casting of NULL to (void *) in the execl call is to make sure it is 64 bit on 64 bit archs. Not verified by myself since I have no 64bit arch to test on. Patch provided in private email. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- io.c.orig Tue Jul 17 21:39:11 2001 +++ io.c Sat Oct 26 18:44:59 2002 d20 1 a20 1 @@@@ -996,22 +1004,22 @@@@ d48 1 a48 1 @@@@ -1066,15 +1074,15 @@@@ d67 1 a67 1 @@@@ -1084,7 +1092,7 @@@@ d76 1 a76 10 @@@@ -1991,7 +1999,7 @@@@ } /* startup child */ - if (execl("/bin/sh", "sh", "-c", cmd ,NULL) < 0) { + if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) { g_error("execl error\n"); } @@@@ -2362,10 +2370,10 @@@@ d89 1 a89 1 @@@@ -2380,7 +2388,7 @@@@ d98 1 a98 1 @@@@ -2400,7 +2408,7 @@@@ d107 1 a107 1 @@@@ -2450,7 +2458,7 @@@@ d116 1 a116 1 @@@@ -2464,7 +2472,7 @@@@ d125 1 a125 1 @@@@ -2482,7 +2490,7 @@@@ d134 1 a134 1 @@@@ -3275,6 +3283,9 @@@@ @ 1.4 log @* Use buildlink2. * Install some documentation. * Honor PKG_SYSCONFDIR (and warn user that the config file directory may have changed). * Allow for compiling with OSS support on NetBSD, though it is currently commented out. @ text @d3 2 a4 2 --- io.c.orig Tue Jul 17 12:39:11 2001 +++ io.c d20 1 a20 1 @@@@ -996,22 +1004,22 @@@@ GList *get_dsp_devices() { d48 1 a48 1 @@@@ -1066,15 +1074,15 @@@@ gchar *audiodev; d67 1 a67 1 @@@@ -1084,7 +1092,7 @@@@ gchar tmp2[MAXLINE]; d76 10 a85 1 @@@@ -2362,10 +2370,10 @@@@ gint count; d98 1 a98 1 @@@@ -2380,7 +2388,7 @@@@ struct audio_gains again; d107 1 a107 1 @@@@ -2400,7 +2408,7 @@@@ struct audio_gains again; d116 1 a116 1 @@@@ -2450,7 +2458,7 @@@@ struct audio_gains again; d125 1 a125 1 @@@@ -2464,7 +2472,7 @@@@ struct audio_gains again; d134 1 a134 1 @@@@ -2482,7 +2490,7 @@@@ struct audio_gains again; d143 1 a143 1 @@@@ -3275,6 +3283,9 @@@@ gint ret,found; @ 1.3 log @update to 0.98 alpha 9 Changes: 17.07.01: * update the writeable flag in HD setup * final touches to non-root wrapper 16.07.01: * add CDRTOOLS_PREFIX in Makefile for more flexible installation * show image-list in verify tracks menu even when no CD is loaded * check if image directories are writeable 15.07.01: * set permissions of /etc/xcdroast.conf to 644 after first start when old version found * remove -r commandline option for security reasons * make wrapper checking allowed users and hosts * make process windows wider to avoid cut-off labels * make "minimaly blank" mode default * allow verifying of self-mastered or external iso tracks 14.07.01: * first version of non-root wrapper useable * set correct filemodes on saved text-outputs * create the configuration directory at startup * fix bug in non-root-mode when you can cancel out of setup without setting image directories * check for common "cannot open new session" errors in cdrecord output and advise user to switch to TAO * handle dos format textfile format 13.07.01: * first tests with the non-root wrapper * add -n switch to commandline help 12.07.01: * dont set tooltip color manually - it screws up multibyte fonts 11.07.01: * added japanese translation 10.07.01: * added option in setup to save a default write mode setting 08.07.01: * added galician translation * added new dialog in master-menu which does the redirection stuff when adding directories automatically 28.06.01: * fix problem when copying an unpadded CD-R. (last sectors got lost) 27.06.01: * manual scanbus override should work now. I am interested in feedback. 26.06.01: * new commandline option to give a list of devices, instead of using -scanbus. Very useful on AIX and OpenBSD systems. 24.06.01: * dont expand ~/ in logfile setting (broke in non-root-mode) * add startup-message in logfile * workaround for crash caused by eazel-gtk-theme (mandrake 8.0) * fix a lot of cursor leaks * fix crash when writing a toc file on solaris * use sectors on mkisofs tsize option 23.06.01: * integrate joliet charsets into the master-menu (Also thanks to Georgy Salnikov for the idea) * dont crash on unknown group-ids 22.06.01: * query joliet charsets from mkisofs 21.06.01: * reworked verifying code. (Thanks to Georgy Salnikov ) * verifying of padded CDs works now fine. 20.06.01: * make cdrtools-1.10 default 19.06.01: * had other stuff to do. Got back to work at X-CD-Roast * update translations for brasilian portuguese, estonian, slovak and french * added translations for finnish, bulgarian and czech. * allow image-directories with space in their name * sort the image-list display alphabetically * merged AIX and HP-UX audio patches from Stefan Benke * fixed possible crash when a CD-Extra is inserted * corrected tons of typos in the documentation 25.12.00: * fix wav-file detection code (Thanks to Mark Bratcher ) 01.12.00: * fix some compiler warnings 29.11.00: * fix cdrecord scanbus parser crash on HP-UX @ text @d3 15 a17 3 --- io.c.orig Tue Jul 17 21:39:11 2001 +++ io.c Mon Aug 6 12:18:41 2001 @@@@ -20,7 +20,8 @@@@ d20 1 a20 8 #endif -#ifdef sun +#if defined(sun) || defined(__NetBSD__) +#include # include #endif #ifdef hpux @@@@ -996,7 +997,7 @@@@ d25 1 a25 1 +#if defined(sun) || defined(__NetBSD__) d29 11 a39 1 @@@@ -1011,7 +1012,7 @@@@ d44 1 a44 1 +#if defined(sun) || defined(__NetBSD__) d48 20 a67 1 @@@@ -1084,7 +1085,7 @@@@ d72 1 a72 1 +#if defined(sun) || defined(__NetBSD__) d76 6 a81 2 @@@@ -2365,7 +2366,7 @@@@ #if defined(linux) || defined(__FreeBSD__) d85 1 a85 1 +#if defined(sun) || defined(__NetBSD__) d89 10 a98 1 @@@@ -2400,7 +2401,7 @@@@ d103 1 a103 1 +#if defined(sun) || defined(__NetBSD__) d107 1 a107 1 @@@@ -2450,7 +2451,7 @@@@ d112 1 a112 1 +#if defined(sun) || defined(__NetBSD__) d116 10 a125 1 @@@@ -2482,7 +2483,7 @@@@ d130 1 a130 1 +#if defined(sun) || defined(__NetBSD__) d134 1 a134 1 @@@@ -3275,6 +3276,9 @@@@ @ 1.2 log @recognize "Device not ready" in addition to "medium not present" as empty CD drive, avoids endless hang in my case (may be ATAPI specific) @ text @d3 2 a4 2 --- io.c.orig Sun Nov 26 13:55:57 2000 +++ io.c Sat Mar 10 16:34:38 2001 d6 2 a7 2 #include #include d12 1 a12 1 #include d15 1 a15 1 @@@@ -782,7 +783,7 @@@@ d24 1 a24 1 @@@@ -797,7 +798,7 @@@@ d33 1 a33 1 @@@@ -863,7 +864,7 @@@@ d42 1 a42 1 @@@@ -2130,7 +2131,7 @@@@ d51 1 a51 1 @@@@ -2163,7 +2164,7 @@@@ d60 1 a60 1 @@@@ -2211,7 +2212,7 @@@@ d69 1 a69 1 @@@@ -2241,7 +2242,7 @@@@ d78 1 a78 1 @@@@ -3026,6 +3027,9 @@@@ @ 1.1 log @make sample playing via /dev/audio work @ text @d3 2 a4 2 --- io.c~ Sun Nov 26 13:55:57 2000 +++ io.c Fri Mar 9 21:43:07 2001 d78 10 @