Who changed all the file lay out so I can no longer fix bugs?
Cssound4 is supposed to be frozen except for bugs.  That means that
nothing should change except to fix bugs.  A bug is a manifestation of
broken code, not a manifestation of something you do not like.

So what should I do?  Not fix the bugs?

==John ffitch

jpff@codemist.co.uk writes:

> Who changed all the file lay out so I can no longer fix bugs?

The only change I made is the one you have already heard about, the
files used to build the csound library and the csound executable have
been moved into their own directory.  If the change I made is
preventing you from fixing bugs, please describe in what way it does
so.  

John

I fixed some bugs, went "cvs update" and all my files disappeared --
deleted.  So I have abandoned the csound4 cvs as I do not have the
time to reconstruct the entire tree again.  The fixed files are in the
release, and I did attempt to add them back, but that failed.
==John ffitch

jpff@codemist.co.uk writes:

> I fixed some bugs, went "cvs update" and all my files disappeared --
> deleted.

You must do "cvs update -d".  This will give you the new directories.
You'll then be good to go.

John

But my files were still deleted.  I cannot live with that kind of uncertainty
==John ffitch

jpff@codemist.co.uk writes:

> But my files were still deleted.  I cannot live with that kind of
> uncertainty.

When I find myself with a stale CVS sandbox, I often simply rename or
delete it, and use a fresh check out.  Be sure to tag any specific
collection of files you want to retrieve as a group.  Then you can
always get back that collection using the -r option.  Finally, anyone
on the mailing list saying something about changing or adding
directories is implicitly asking you to do a "cvs up -d".

John

>>>>> "John" == John D Ramsdell  writes:

 John>                                                       Finally, anyone
 John> on the mailing list saying something about changing or adding
 John> directories is implicitly asking you to do a "cvs up -d".

But not explicitly; how many hours did you lose on 1 Jan because your
files were deleted?

Feel free to add the changed files to your archive if you want the
fixes.

==John ffitch

  -rwxr-xr-x    1 jpff     jpff        47131 Jan  1 19:24 musmon.c
  -rwxr-xr-x    1 jpff     jpff         9893 Jan  1 17:22 repluck.c
  -rwxr-xr-x    1 jpff     jpff         6706 Jan  1 16:18 wavegde.c
  -rwxr-xr-x    1 jpff     jpff       197305 Jan  1 16:01 ChangeLog
  -rwxr-xr-x    1 jpff     jpff         7157 Jan  1 16:01 pluck.c
  -rwxr-xr-x    1 jpff     jpff         4244 Jan  1 15:30 wavegde.h
  -rw-r--r--    1 jpff     jpff         7344 Jan  1 10:57 all_files
  -rw-rw-r--    1 jpff     jpff        10730 Jan  1 10:20 flanger.c
  -rw-r--r--    1 jpff     jpff         1636 Jan  1 10:05 version.h
  -rw-r--r--    1 jpff     jpff        28957 Jan  1 10:02 OSC-sock.c
  -rw-rw-r--    1 jpff     jpff         6002 Jan  1 10:01 metro.c

jpff@codemist.co.uk writes:

> >>>>> "John" == John D Ramsdell  writes:
> 
>  John>                                                       Finally, anyone
>  John> on the mailing list saying something about changing or adding
>  John> directories is implicitly asking you to do a "cvs up -d".
> 
> But not explicitly; how many hours did you lose on 1 Jan because your
> files were deleted?

Actually, I was explicit.  I found this note in the archive from
November. 

---------------------------

To: Csound Developers Discussion List  
Subject: [CSOUND-DEV:3586] csound directory reorganized 
From: ramsdell@mitre.org (John D. Ramsdell) 
Date: 29 Nov 2003 14:25:21 -0500 

The files in the csound module have been reorganized.  Many of the
files at top-level are now in the csound directory.  The makefiles for
Linux, Iris, Solaris, and MacOS have been modified to reflect the new
structure, and the Linux makefile has been tested.  The only
modifications I had to make to the current Makefile.lnx was to change the
alignment flags and add a line telling where my FLTK headers are
stored.

To get the new system, be sure to update with the -d switch.  To
retrieve the files just before the reorg, use the tag csound-4_23a2.

John

---------------------------

> Feel free to add the changed files to your archive if you want the
> fixes.

I hope you think of the archive as ours.  It's not just me who might
like the changes, but all the Cygwin users, and the others using the
configure-based Csound 4.23 distribution.

John

John ffitch,

When I reorganized the module containing the Csound 4.23 sources, my
goal was to ensure the new organization supported both the traditional
method of building the sources and the configure-based method I was
constructing.  I took great care to make sure the original makefiles
continue to build the sources, however, our recent mail exchanges
causes me to guess the directory structure is giving you problems.
Therefore, I added the file jpff.mk into the top-level directory.  If
you type

    $ make -f jpff.mk

the source files in the csound directory will be moved up one level.
Please let me know if this solves any problems you have with the new
directory organization.

John

I exported the version of csound tagged as csound-4.23a2, the last
tagged version in the csound module before top-level source files were
moved into the csound directory.  I the performed a diff with the
contents of csound_4.23f08.  Without compiling, I noticed some
problems.

1. The file entry2.c includes chosc.h, but a find in the
   csound_4.23f08 directory does not print a path with this file name.

2. The ChangeLog includes:

+	* OSC-sock.c: 
+	* metro.c: Add casts to avoid warnings

but the diff detected no changes to that file.

I also moved widget.cpp into the csound directory of an up-to-date
csound sandbox, added "#include " to the beginning of
the files, and then compiled.  Here is what happened on RH 9.

--------------------------

[ramsdell@couch csound]$ ./configure
....
Configuration Summary
----------------------
Real-Time Audio Support: rtlinux.lo LINUXaudio.lo
Windowing Support: FLTK
Audio Formats suported: WAV  AIFF  IRCAM
[ramsdell@couch csound]$ make 
Making all in csound
....
source='widgets.cpp' object='widgets.o' libtool=no \
depfile='.deps/widgets.Po' tmpdepfile='.deps/widgets.TPo' \
depmode=gcc3 /bin/sh ../depcomp \
g++ -DHAVE_CONFIG_H -I. -I. -I.    -fno-exceptions -fno-rtti -g -O2 -Wall -I/home/ramsdell/opt/fltk/include -I/usr/X11R6/include -c -o widgets.o `test -f 'widgets.cpp' || echo './'`widgets.cpp
In file included from /usr/include/c++/3.2.2/backward/strstream:51,
                 from widgets.cpp:52:
/usr/include/c++/3.2.2/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the  header for the  header for C++ includes, or  instead of the deprecated header . To disable this warning use -Wno-deprecated.
widgets.cpp: In function `void fl_callbackExponentialSlider(Fl_Valuator*, 
   void*)':
widgets.cpp:1798: choosing `double pow(double, double)' over `float 
   std::pow(float, float)'
widgets.cpp:1798:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp:1798: choosing `double pow(double, double)' over `float 
   std::pow(float, int)'
widgets.cpp:1798:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp: In function `void fl_callbackExponentialSliderBank(Fl_Valuator*, 
   void*)':
widgets.cpp:1833: choosing `double pow(double, double)' over `float 
   std::pow(float, float)'
widgets.cpp:1833:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp:1833: choosing `double pow(double, double)' over `float 
   std::pow(float, int)'
widgets.cpp:1833:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp: In function `void fl_callbackJoystick(Fl_Widget*, void*)':
widgets.cpp:1867: choosing `double pow(double, double)' over `float 
   std::pow(float, float)'
widgets.cpp:1867:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp:1867: choosing `double pow(double, double)' over `float 
   std::pow(float, int)'
widgets.cpp:1867:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp:1887: choosing `double pow(double, double)' over `float 
   std::pow(float, float)'
widgets.cpp:1887:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp:1887: choosing `double pow(double, double)' over `float 
   std::pow(float, int)'
widgets.cpp:1887:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp: In function `void fl_callbackExponentialRoller(Fl_Valuator*, 
   void*)':
widgets.cpp:1916: choosing `double pow(double, double)' over `float 
   std::pow(float, float)'
widgets.cpp:1916:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp:1916: choosing `double pow(double, double)' over `float 
   std::pow(float, int)'
widgets.cpp:1916:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp: In function `void fl_callbackExponentialKnob(Fl_Valuator*, 
   void*)':
widgets.cpp:1949: choosing `double pow(double, double)' over `float 
   std::pow(float, float)'
widgets.cpp:1949:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp:1949: choosing `double pow(double, double)' over `float 
   std::pow(float, int)'
widgets.cpp:1949:   because worst conversion for the former is better than 
   worst conversion for the latter
widgets.cpp: At top level:
widgets.cpp:1713: warning: `void fltkKeybRun(void*)' defined but not used
make[2]: *** [widgets.o] Error 1
make[2]: Leaving directory `/home/ramsdell/backup/csound/csound'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/ramsdell/backup/csound/csound'
make: *** [all-recursive] Error 1
[ramsdell@couch csound]$ 

--------------------------

In case it is not obvious, the way to produce a distribution that uses
the traditional makefiles from the current csound module is to export
the sources, remove the extraneous top-level directories, and then tar
up the result.  Here is one way to do that.

  $ cvs export -D now csound
  $ cd csound
  $ rm -rf CsoundVST CsoundVSTWin pyrun # and whatever...
  $ cd ..
  $ mv csound csound-4.23f08
  $ tar czf csound-4.23f08.tar.gz csound-4.23f08

John

>>>>> "John" == John D Ramsdell  writes:

 John> I exported the version of csound tagged as csound-4.23a2, the last
 John> tagged version in the csound module before top-level source files were
 John> moved into the csound directory.  I the performed a diff with the
 John> contents of csound_4.23f08.  Without compiling, I noticed some
 John> problems.

 John> 1. The file entry2.c includes chosc.h, but a find in the
 John>    csound_4.23f08 directory does not print a path with this file name.

chosc.h is experimental code and I guess I should have not included
it.  But all it says is

------------------------------------------------------------------------
typedef struct	{
	OPDS	h;
        MYFLT	*ar, *X0, *C;	/* The parameters */
        MYFLT   prev;
} SCHOSC;


typedef struct	{
	OPDS	h;
        MYFLT	*ar, *X0, *X1, *a, *b, *d, *C, *L;	/* The parameters */
        AUXCH	delay;		/* Buffer for old values */
	int	point;		/* Pointer to old values */
} CHOSC;
------------------------------------------------------------------------

 John> 2. The ChangeLog includes:

 John> +	* OSC-sock.c: 
 John> +	* metro.c: Add casts to avoid warnings

 John> but the diff detected no changes to that file.

Odd; the files have chnaged on my disk.  
------------------------------------------------------------------------
/*  
    OS-sock.c:

    Copyright (C) 2001, 2003 Nicola Bernadino, Stefan Kersten, John ffitch

    This file is part of Csound.

    The Csound Library is free software; you can redistribute it
    and/or modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    Csound is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with Csound; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA
*/

<<<<<

typedef struct {
	OPDS	h;
	MYFLT	*sr, *xcps, *iphs;
	double	curphs;
	int flag;
} METRO;

<<<<<<<<<<<<<<<<<<<<<<< Sniped bit <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
#define S       sizeof

static OENTRY localops[] = {
  { "metro",  S(METRO),	  3,      "k",   "ko",	  (SUBR)metro_set, (SUBR)metro   },
  { "splitrig",	S(SPLIT_TRIG), 3, "",	 "kkiiz", (SUBR)split_trig_set, (SUBR)split_trig },
  { "timedseq",S(TIMEDSEQ),    3, "k", "kiz",   (SUBR)timeseq_set, (SUBR)timeseq }
};

long opcode_size(void)
{
    return sizeof(localops);
}

OENTRY *opcode_init(GLOBALS *xx)
{
    pcglob = xx;
    return localops;
}
------------------------------------------------------------------------

==John ffitch

I downloaded Csound_423f09.tar.gz to a Linux laptop, but could not
unarchive the file.  Here is the message I got:

$ tar xzf ~/dist/Csound_423f09.tar.gz
tar: Skipping to next header
tar: Archive contains obsolescent base-64 headers
 
gzip: stdin: invalid compressed data--format violated
tar: Child returned status 1
tar: Error exit delayed from previous errors
$ file Csound_423f09.tar.gz
Csound_423f09.tar.gz: gzip compressed data, from Unix
$ gunzip Csound_423f09.tar.gz

gunzip: Csound_423f09.tar.gz: invalid compressed data--format violated
$

There seems to be something wrong the compression step.

John

I'll build and release a Csound 4.23f09 GNU Build System tagged as
csound-4_23f09gbs_0 if provided with what is needed to incorporate
4.23f9 sources into the csound module.  I've update some of the makef
files, and I've updated flanger.c, insert.c, and ugrw1.c.  I'm not
sure what other changes are needed to build an "official" 4.230f09
system.  Please enlighten me.

John