reorganized 'pdogg' for template Makefile and easy packaging

svn path=/trunk/externals/pdogg/; revision=13380

22 files changed, 847 insertions, 445 deletions

diff --git a/oggcast~/HISTORY b/HISTORY
index 04a7528..0b8f999 100644
--- a/oggcast~/HISTORY
+++ b/HISTORY
@@ -1,3 +1,48 @@
+Version history of oggamp~ external for pure-data

+

+v 0.3 (2nd january 2004):

+- removed the crappy resampling to get rid of audio clicks

+- multichannel support

+

+v 0.2f (20st july 2002):

+- recompiled with the final 1.0 release of Ogg Vorbis

+

+v 0.2e (21st june 2002 - stable release):

+- added downsamling

+- cleaned up code a bit

+- added some more info-printout

+- fixed some bugs to make it work correctly on Linux

+  thanks to Oliver Thuns at radiostudio.org

+- now disconnects correctly at end-of-stream (when no

+  chained stream follows)

+- KNOWN BUG: graphic buffer status display might cause ugly

+  printout of Tcl/Tk commands to console window on Linux

+  under some circumstances (e.g. in case server dies)

+

+v 0.2d (12th june 2002):

+- added upsamling

+- finally fixed the End-Of-Stream bug: it's now 

+  possible to listen to a playlist with correct

+  update of stream information

+

+v 0.2c (10th june 2002):

+- fixed some bugs, introduced some new ones...

+

+v 0.2a (11th mar. 2002):

+- introduced child thread for connect: now pd

+  does no longer 'stop' audio; as a side effect it

+  is now possible to connect to an oggcast~ stream

+  from the same instance of pd

+- threads now use pthreads libraray on Win to have 

+  things compatible with UNIX

+- fixed a small bug that made 'old' audio appear on 

+  the beginning of 'new' one after reconnecting

+

+v 0.1c (19th feb. 2002):

+- first (sort of) stable release

+

+************************************************************************

+

 Version history of oggcast~ external for pure-data

 

 v 0.2k (29th Sept. 2003):

@@ -80,4 +125,4 @@ v 0.1b (not released):
   is running (no need to disconnect), seems to be unstable 

   on linux (with JRoar)

 

-v 0.1: first public release
\ No newline at end of file
+v 0.1: first public release

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..eb685a5
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,481 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+                    675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a49c584
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,273 @@
+## Pd library template version 1.0
+# For instructions on how to use this template, see:
+#  http://puredata.info/docs/developer/MakefileTemplate
+LIBRARY_NAME = pdogg
+
+# add your .c source files to the SOURCES variable, help files will be
+# included automatically
+SOURCES = oggamp~.c oggcast~.c oggread~.c oggwrite~.c
+
+# For objects that only build on certain platforms, add those to the SOURCES
+# line for the right platforms.
+SOURCES_android = 
+SOURCES_cygwin = 
+SOURCES_macosx = 
+SOURCES_iphoneos = 
+SOURCES_linux = 
+SOURCES_windows = 
+
+# list all pd objects (i.e. myobject.pd) files here, and their helpfiles will
+# be included automatically
+PDOBJECTS = 
+
+# example patches and related files, in the 'examples' subfolder
+EXAMPLES = 
+
+# manuals and related files, in the 'manual' subfolder
+MANUAL = 
+
+# if you want to include any other files in the source and binary tarballs,
+# list them here.  This can be anything from header files, example patches,
+# documentation, etc.  README.txt and LICENSE.txt are required and therefore
+# automatically included
+EXTRA_DIST = pdogg.c makefile.msvc HISTORY
+
+
+
+#------------------------------------------------------------------------------#
+#
+# you shouldn't need to edit anything below here, if we did it right :)
+#
+#------------------------------------------------------------------------------#
+
+# get library version from meta file
+LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd)
+
+# where Pd lives
+PD_PATH = ../../pd
+# where to install the library
+prefix = /usr/local
+libdir = $(prefix)/lib
+pkglibdir = $(libdir)/pd-externals
+objectsdir = $(pkglibdir)
+
+
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p -m 644
+INSTALL_DIR     = $(INSTALL) -p -m 755 -d
+
+CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g
+LDFLAGS =  
+LIBS = -logg -lvorbis -lvorbisenc -lvorbisfile
+ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \
+	         $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows)
+
+UNAME := $(shell uname -s)
+ifeq ($(UNAME),Darwin)
+  CPU := $(shell uname -p)
+  ifeq ($(CPU),arm) # iPhone/iPod Touch
+    SOURCES += $(SOURCES_macosx)
+    EXTENSION = pd_darwin
+    OS = iphoneos
+    IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
+    CC=$(IPHONE_BASE)/gcc
+    CPP=$(IPHONE_BASE)/cpp
+    CXX=$(IPHONE_BASE)/g++
+    ISYSROOT = -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk
+    IPHONE_CFLAGS = -miphoneos-version-min=3.0 $(ISYSROOT) -arch armv6
+    OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer
+	CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) \
+      -I/Applications/Pd-extended.app/Contents/Resources/include
+    LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT)
+    LIBS += -lc 
+    STRIP = strip -x
+    DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
+    DISTBINDIR=$(DISTDIR)-$(OS)
+  else # Mac OS X
+    SOURCES += $(SOURCES_macosx)
+    EXTENSION = pd_darwin
+    OS = macosx
+    OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast
+    FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4
+    CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \
+      -I/Applications/Pd-extended.app/Contents/Resources/include
+    LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
+    # if the 'pd' binary exists, check the linking against it to aid with stripping
+    LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
+    LIBS += -lc 
+    STRIP = strip -x
+    DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
+    DISTBINDIR=$(DISTDIR)-$(OS)
+  endif
+endif
+ifeq ($(UNAME),Linux)
+  SOURCES += $(SOURCES_linux)
+  EXTENSION = pd_linux
+  OS = linux
+  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
+  CFLAGS += -fPIC
+  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
+  LIBS += -lc
+  STRIP = strip --strip-unneeded -R .note -R .comment
+  DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
+  DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
+endif
+ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+  SOURCES += $(SOURCES_cygwin)
+  EXTENSION = dll
+  OS = cygwin
+  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
+  CFLAGS += 
+  LDFLAGS += -Wl,--export-dynamic -shared -L$(PD_PATH)/src
+  LIBS += -lc -lpd
+  STRIP = strip --strip-unneeded -R .note -R .comment
+  DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
+  DISTBINDIR=$(DISTDIR)-$(OS)
+endif
+ifeq (MINGW,$(findstring MINGW,$(UNAME)))
+  SOURCES += $(SOURCES_windows)
+  EXTENSION = dll
+  OS = windows
+  OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4
+  CFLAGS += -mms-bitfields
+  LDFLAGS += -s -shared -Wl,--enable-auto-import
+  LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32
+  STRIP = strip --strip-unneeded -R .note -R .comment
+  DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
+  DISTBINDIR=$(DISTDIR)-$(OS)
+endif
+
+CFLAGS += $(OPT_CFLAGS)
+
+
+.PHONY = install libdir_install single_install install-doc install-exec install-examples install-manual clean dist etags
+
+all: $(SOURCES:.c=.$(EXTENSION))
+
+%.o: %.c
+	$(CC) $(CFLAGS) -o "$*.o" -c "$*.c"
+
+%.$(EXTENSION): %.o
+	$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o"  $(LIBS)
+	chmod a-x "$*.$(EXTENSION)"
+
+# this links everything into a single binary file
+$(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o
+	$(CC) $(LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(LIBS)
+	chmod a-x $(LIBRARY_NAME).$(EXTENSION)
+
+
+install: libdir_install
+
+# The meta and help files are explicitly installed to make sure they are
+# actually there.  Those files are not optional, then need to be there.
+libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples install-manual
+	$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	$(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd \
+		$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	test -z "$(strip $(SOURCES))" || (\
+		$(INSTALL_FILE) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \
+		$(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION))))
+	test -z "$(strip $(PDOBJECTS))" || \
+		$(INSTALL_FILE) $(PDOBJECTS) \
+			$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+
+# install library linked as single binary
+single_install: $(LIBRARY_NAME) install-doc install-exec
+	$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	$(INSTALL_FILE) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	$(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION)
+
+install-doc:
+	$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	test -z "$(strip $(SOURCES))" || \
+		$(INSTALL_FILE) $(SOURCES:.c=-help.pd) \
+			$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	test -z "$(strip $(PDOBJECTS))" || \
+		$(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) \
+			$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	$(INSTALL_FILE) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt
+	$(INSTALL_FILE) LICENSE.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt
+
+install-examples:
+	test -z "$(strip $(EXAMPLES))" || \
+		$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples && \
+		for file in $(EXAMPLES); do \
+			$(INSTALL_FILE) examples/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples; \
+		done
+
+install-manual:
+	test -z "$(strip $(MANUAL))" || \
+		$(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual && \
+		for file in $(MANUAL); do \
+			$(INSTALL_FILE) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \
+		done
+
+
+clean:
+	-rm -f -- $(SOURCES:.c=.o)
+	-rm -f -- $(SOURCES:.c=.$(EXTENSION))
+	-rm -f -- $(LIBRARY_NAME).$(EXTENSION)
+
+distclean: clean
+	-rm -f -- $(DISTBINDIR).tar.gz
+	-rm -rf -- $(DISTBINDIR)
+	-rm -f -- $(DISTDIR).tar.gz
+	-rm -rf -- $(DISTDIR)
+
+
+$(DISTBINDIR):
+	$(INSTALL_DIR) $(DISTBINDIR)
+
+libdir: all $(DISTBINDIR)
+	$(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd  $(DISTBINDIR)
+	$(INSTALL_FILE) $(SOURCES)  $(DISTBINDIR)
+	$(INSTALL_FILE) $(SOURCES:.c=-help.pd) $(DISTBINDIR)
+	test -z "$(strip $(EXTRA_DIST))" || \
+		$(INSTALL_FILE) $(EXTRA_DIST)    $(DISTBINDIR)
+#	tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR)
+
+$(DISTDIR):
+	$(INSTALL_DIR) $(DISTDIR)
+
+dist: $(DISTDIR)
+	$(INSTALL_FILE) Makefile  $(DISTDIR)
+	$(INSTALL_FILE) README.txt $(DISTDIR)
+	$(INSTALL_FILE) LICENSE.txt $(DISTDIR)
+	$(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd  $(DISTDIR)
+	test -z "$(strip $(ALLSOURCES))" || \
+		$(INSTALL_FILE) $(ALLSOURCES)  $(DISTDIR)
+	test -z "$(strip $(ALLSOURCES))" || \
+		$(INSTALL_FILE) $(ALLSOURCES:.c=-help.pd) $(DISTDIR)
+	test -z "$(strip $(PDOBJECTS))" || \
+		$(INSTALL_FILE) $(PDOBJECTS)  $(DISTDIR)
+	test -z "$(strip $(PDOBJECTS))" || \
+		$(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) $(DISTDIR)
+	test -z "$(strip $(EXTRA_DIST))" || \
+		$(INSTALL_FILE) $(EXTRA_DIST)    $(DISTDIR)
+	test -z "$(strip $(EXAMPLES))" || \
+		$(INSTALL_DIR) $(DISTDIR)/examples && \
+		for file in $(EXAMPLES); do \
+			$(INSTALL_FILE) examples/$$file $(DISTDIR)/examples; \
+		done
+	test -z "$(strip $(MANUAL))" || \
+		$(INSTALL_DIR) $(DISTDIR)/manual && \
+		for file in $(MANUAL); do \
+			$(INSTALL_FILE) manual/$$file $(DISTDIR)/manual; \
+		done
+	tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR)
+
+
+etags:
+	etags *.h $(SOURCES) ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h
+
+showsetup:
+	@echo "PD_PATH: $(PD_PATH)"
+	@echo "objectsdir: $(objectsdir)"
+	@echo "LIBRARY_NAME: $(LIBRARY_NAME)"
+	@echo "LIBRARY_VERSION: $(LIBRARY_VERSION)"
+	@echo "SOURCES: $(SOURCES)"
+	@echo "PDOBJECTS: $(PDOBJECTS)"
+	@echo "ALLSOURCES: $(ALLSOURCES)"
+	@echo "UNAME: $(UNAME)"
+	@echo "CPU: $(CPU)"
diff --git a/oggcast~/readme b/README.txt
index b3090ec..b2c476d 100644
--- a/oggcast~/readme
+++ b/README.txt
@@ -1,17 +1,23 @@
-Version 0.2

-copyright (c) 2002 by Olaf Matthes

+Version 0.25

+copyright (c) 2002-2004 by Olaf Matthes

 

-oggcast~ is a ogg/vorbis streaming external for pd (by Miller 

-Puckette) that connects to an IceCast2 server.

+pdogg~ is a collection of ogg/vorbis externals for pd (by Miller 

+Puckette).

 

+It includes:

+- oggamp~   : streaming client

+- oggcast~  : streamer (for Icecast2)

+- oggread~  : reads files from disk

+- oggwrite~ : writes files to disk

 

-To run oggcast~ place the file oggcast~.dll for win or oggcast~.pd_linux 

-in the directory of our patch or start pd with '-lib oggcast~' flag. 

+To use pdogg start pd with '-lib path\to\pdogg' flag. 

+On Win32 systems Pd 0.35 test 17 or later is necessary to get it working!

 

-To compile oggcast~ on Linux get the ogg/vorbice library from 

-http://www.vorbis.com/.

+To compile pdogg~ you need the ogg/vorbis library from 

+http://www.vorbis.com/ and under win additionally Pthreads-win32 from

+http://sources.redhat.com/pthreads-win32/.

 You have to modify the makefile to make it point to the place where the

-ogg/vorbis library is.

+libraries can be found on your system.

 

 

 This software is published under LGPL terms.

@@ -22,44 +28,39 @@ due to a bug or for other reasons.
 

 *****************************************************************************

 

-oggcast~ uses the ogg/vorbice library to encode audio data.

-The latest version of ogg/vorbis can be found at http://www.vorbice.com/

+pdogg~ uses the ogg/vorbis library to encode audio data.

+The latest version of ogg/vorbis can be found at http://www.vorbis.com/

 

-Below is the original copyright information taken from the ogg/vorbis library:

-

-

-Copyright (c) 2001, Xiphophorus

+The original version was found at:

+http://www.akustische-kunst.de/puredata/

 

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

+Please report any bugs to olaf.matthes@gmx.de!

 

-- Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

+*****************************************************************************

 

-- Redistributions in binary form must reproduce the above copyright

-notice, this list of conditions and the following disclaimer in the

-documentation and/or other materials provided with the distribution.

+oggamp~ Usage:

 

-- Neither the name of the Xiphophorus nor the names of its contributors

-may be used to endorse or promote products derived from this software

-without specific prior written permission.

+To run oggamp~ innormal mode, just use [oggamp~] or, to get the buffer status

+displayed, use [oggamp~ 1].

 

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR

-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+Message "connect <host> <mountpoint> <port>" connects to an IceCast2 server.

+Note that no response about succesfull connection is send by the server. All

+messages in the pd console window about connection status depend on the ability

+to receive data from the server.

+Use "connecturl <url>" to use url-like server adresses (like http://host:post/

+stream.ogg).

+

+Known bugs and other things:

+- pd halts for a moment when oggamp~ connects to the server. This results in a

+  short audio drop out of sound currently played back.

+- resampling not jet supported

+- playback does not stop on a buffer underrun

+- oggamp~ disconnects at end of stream, i.e. it is not possible to play back

+  files streamed one after another without manual reconnect

 

 *****************************************************************************

 

-Usage:

+oggcast~ Usage:

 

 Use message "vbr <samplerate> <channels> <quality>" to set the vorbis

 encoding parameters. Resampling is currently not supported, so 'samplerate' 

@@ -107,10 +108,3 @@ To play back the stream just open lacation http://<server>:<port>/<mountpoint>.
 

 Note that changing encoding parameters or header comments while oggcast~ is

 streaming to the server might result in audible dropouts.

-

-

-

-Latest version can be found at:

-http://www.akustische-kunst.de/puredata/

-

-Please report any bugs to olaf.matthes@gmx.de!
\ No newline at end of file
diff --git a/oggamp~/oggamp~-help.pd b/oggamp~-help.pd
index 9f30cb8..9f30cb8 100644
--- a/oggamp~/oggamp~-help.pd
+++ b/oggamp~-help.pd
diff --git a/oggamp~/oggamp~.c b/oggamp~.c
index a9ff78b..a9ff78b 100644
--- a/oggamp~/oggamp~.c
+++ b/oggamp~.c
diff --git a/oggamp~/HISTORY b/oggamp~/HISTORY
deleted file mode 100644
index f800e80..0000000
--- a/oggamp~/HISTORY
+++ /dev/null
@@ -1,44 +0,0 @@
-Version history of oggamp~ external for pure-data

-

-v 0.3 (2nd january 2004):

-- removed the crappy resampling to get rid of audio clicks

-- multichannel support

-

-v 0.2f (20st july 2002):

-- recompiled with the final 1.0 release of Ogg Vorbis

-

-v 0.2e (21st june 2002 - stable release):

-- added downsamling

-- cleaned up code a bit

-- added some more info-printout

-- fixed some bugs to make it work correctly on Linux

-  thanks to Oliver Thuns at radiostudio.org

-- now disconnects correctly at end-of-stream (when no

-  chained stream follows)

-- KNOWN BUG: graphic buffer status display might cause ugly

-  printout of Tcl/Tk commands to console window on Linux

-  under some circumstances (e.g. in case server dies)

-

-v 0.2d (12th june 2002):

-- added upsamling

-- finally fixed the End-Of-Stream bug: it's now 

-  possible to listen to a playlist with correct

-  update of stream information

-

-v 0.2c (10th june 2002):

-- fixed some bugs, introduced some new ones...

-

-v 0.2a (11th mar. 2002):

-- introduced child thread for connect: now pd

-  does no longer 'stop' audio; as a side effect it

-  is now possible to connect to an oggcast~ stream

-  from the same instance of pd

-- threads now use pthreads libraray on Win to have 

-  things compatible with UNIX

-- fixed a small bug that made 'old' audio appear on 

-  the beginning of 'new' one after reconnecting

-

-v 0.1c (19th feb. 2002):

-- first (sort of) stable release

-

-

diff --git a/oggamp~/oggamp~.libs b/oggamp~/oggamp~.libs
deleted file mode 100644
index f944930..0000000
--- a/oggamp~/oggamp~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis
diff --git a/oggamp~/readme b/oggamp~/readme
deleted file mode 100644
index 4e7d8b7..0000000
--- a/oggamp~/readme
+++ /dev/null
@@ -1,87 +0,0 @@
-Version 0.2

-copyright (c) 2002 by Olaf Matthes

-

-oggamp~ is an ogg/vorbis streaming client external for pd (by Miller 

-Puckette) that connects to an IceCast2 server.

-Graphical buffer status display written by Yves Degoyon (ydegoyon@free.fr).

-

-

-To run oggamp~ place the file oggamp~.dll for win or oggamp~.pd_linux 

-in the directory of our patch or start pd with '-lib oggamp~' flag. 

-

-To compile oggamp~ on Linux get the ogg/vorbice library from 

-http://www.vorbis.com/.

-You have to modify the makefile to make it point to the place where the

-ogg/vorbis library is.

-

-

-This software is published under LGPL terms.

-

-This is software with ABSOLUTELY NO WARRANTY.

-Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing

-due to a bug or for other reasons. 

-

-*****************************************************************************

-

-oggamp~ uses the ogg/vorbice library to encode audio data.

-The latest version of ogg/vorbis can be found at http://www.vorbice.com/

-

-Below is the original copyright information taken from the ogg/vorbis library:

-

-

-Copyright (c) 2001, Xiphophorus

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-- Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

-

-- Redistributions in binary form must reproduce the above copyright

-notice, this list of conditions and the following disclaimer in the

-documentation and/or other materials provided with the distribution.

-

-- Neither the name of the Xiphophorus nor the names of its contributors

-may be used to endorse or promote products derived from this software

-without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR

-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-*****************************************************************************

-

-Usage:

-

-To run oggamp~ innormal mode, just use [oggamp~] or, to get the buffer status

-displayed, use [oggamp~ 1].

-

-Message "connect <host> <mountpoint> <port>" connects to an IceCast2 server.

-Note that no response about succesfull connection is send by the server. All

-messages in the pd console window about connection status depend on the ability

-to receive data from the server.

-Use "connecturl <url>" to use url-like server adresses (like http://host:post/

-stream.ogg).

-

-Known bugs and other things:

-- pd halts for a moment when oggamp~ connects to the server. This results in a

-  short audio drop out of sound currently played back.

-- resampling not jet supported

-- playback does not stop on a buffer underrun

-- oggamp~ disconnects at end of stream, i.e. it is not possible to play back

-  files streamed one after another without manual reconnect

-

-

-Latest version can be found at:

-http://www.akustische-kunst.de/puredata/

-

-Please report any bugs to olaf.matthes@gmx.de!
\ No newline at end of file
diff --git a/oggcast~/oggcast~-help.pd b/oggcast~-help.pd
index 17c0999..17c0999 100644
--- a/oggcast~/oggcast~-help.pd
+++ b/oggcast~-help.pd
diff --git a/oggcast~/oggcast~.c b/oggcast~.c
index ebd21a1..ebd21a1 100644
--- a/oggcast~/oggcast~.c
+++ b/oggcast~.c
diff --git a/oggcast~/oggcast~.libs b/oggcast~/oggcast~.libs
deleted file mode 100644
index 28114c5..0000000
--- a/oggcast~/oggcast~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis -lvorbisenc -lvorbisfile
diff --git a/oggread~/oggread~-help.pd b/oggread~-help.pd
index 4d353f7..4d353f7 100644
--- a/oggread~/oggread~-help.pd
+++ b/oggread~-help.pd
diff --git a/oggread~/oggread~.c b/oggread~.c
index af1a3a0..af1a3a0 100644
--- a/oggread~/oggread~.c
+++ b/oggread~.c
diff --git a/oggread~/oggread~.libs b/oggread~/oggread~.libs
deleted file mode 100644
index 28114c5..0000000
--- a/oggread~/oggread~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis -lvorbisenc -lvorbisfile
diff --git a/oggread~/readme b/oggread~/readme
deleted file mode 100644
index 149af81..0000000
--- a/oggread~/readme
+++ /dev/null
@@ -1,75 +0,0 @@
-oggread~ version 0.2c

-copyright (c) 2002 by Olaf Matthes

-

-oggread~ is an ogg/vorbis file player external for pd (by Miller 

-Puckette).

-

-

-To run oggread~ place the file oggread~.dll for win or oggread~.pd_linux 

-in the directory of our patch or start pd with '-lib oggread~' flag. 

-

-To compile oggread~ on Linux get the ogg/vorbice library from 

-http://www.vorbis.com/.

-You have to modify the makefile to make it point to the place where the

-ogg/vorbis library is.

-

-

-This software is published under LGPL terms.

-

-This is software with ABSOLUTELY NO WARRANTY.

-Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing

-due to a bug or for other reasons. 

-

-*****************************************************************************

-

-oggread~ uses the ogg/vorbice library to encode audio data.

-The latest version of ogg/vorbis can be found at http://www.vorbice.com/

-

-Below is the original copyright information taken from the ogg/vorbis library:

-

-

-Copyright (c) 2001, Xiphophorus

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-- Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

-

-- Redistributions in binary form must reproduce the above copyright

-notice, this list of conditions and the following disclaimer in the

-documentation and/or other materials provided with the distribution.

-

-- Neither the name of the Xiphophorus nor the names of its contributors

-may be used to endorse or promote products derived from this software

-without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR

-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-*****************************************************************************

-

-Listening to it:

-

-To listen to ogg/vorbis encoded audio files many player need an extra plug-in.

-Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your

-player.

-

-

-

-

-

-Latest version can be found at:

-http://www.akustische-kunst.de/puredata/

-

-Please report any bugs to olaf.matthes@gmx.de!
\ No newline at end of file
diff --git a/oggwrite~/oggwrite~-help.pd b/oggwrite~-help.pd
index 86bbd91..86bbd91 100644
--- a/oggwrite~/oggwrite~-help.pd
+++ b/oggwrite~-help.pd
diff --git a/oggwrite~/oggwrite~.c b/oggwrite~.c
index 8f91c7f..8f91c7f 100644
--- a/oggwrite~/oggwrite~.c
+++ b/oggwrite~.c
diff --git a/oggwrite~/oggwrite~.libs b/oggwrite~/oggwrite~.libs
deleted file mode 100644
index 28114c5..0000000
--- a/oggwrite~/oggwrite~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis -lvorbisenc -lvorbisfile
diff --git a/oggwrite~/readme b/oggwrite~/readme
deleted file mode 100644
index 4945d0d..0000000
--- a/oggwrite~/readme
+++ /dev/null
@@ -1,110 +0,0 @@
-oggwrite~ version 0.1b

-copyright (c) 2002 by Olaf Matthes

-

-oggwrite~ is an ogg/vorbis file writing external for pd (by Miller 

-Puckette).

-

-

-To run oggwrite~ place the file oggwrite~.dll for win or oggwrite~.pd_linux 

-in the directory of our patch or start pd with '-lib oggwrite~' flag. 

-

-To compile oggwrite~ on Linux get the ogg/vorbice library from 

-http://www.vorbis.com/.

-You have to modify the makefile to make it point to the place where the

-ogg/vorbis library is.

-

-

-This software is published under LGPL terms.

-

-This is software with ABSOLUTELY NO WARRANTY.

-Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing

-due to a bug or for other reasons. 

-

-*****************************************************************************

-

-oggwrite~ uses the ogg/vorbice library to encode audio data.

-The latest version of ogg/vorbis can be found at http://www.vorbice.com/

-

-Below is the original copyright information taken from the ogg/vorbis library:

-

-

-Copyright (c) 2001, Xiphophorus

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-- Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

-

-- Redistributions in binary form must reproduce the above copyright

-notice, this list of conditions and the following disclaimer in the

-documentation and/or other materials provided with the distribution.

-

-- Neither the name of the Xiphophorus nor the names of its contributors

-may be used to endorse or promote products derived from this software

-without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR

-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-*****************************************************************************

-

-Usage:

-

-Use message "vbr <samplerate> <channels> <quality>" to set the vorbis

-encoding parameters. Resampling is currently not supported, so 'samplerate' 

-should be the one pd is running at. 'channels' specyfies the number of channels 

-to stream. This can be set to 2 (default) or 1 which means mono stream taking

-the leftmost audio input only. 'quality' can be a value between 0.0 and 1.0 

-giving the quality of the stream. 0.4 (default) results in a stream that's 

-about 128kbps. 

-

-Since Vorbis uses VBR encoding, bitrates vary depending on the type of audio

-signal to be encoded. A pure sine [osc~] results in the smalest stream, com-

-plex audio signals will increase this value significantly. To test the maximum 

-bitrate that might occur for a quality setting use noise~ as signal input.

-

-Use message "vorbis <samplerate> <channels> <maximum bitrate> <nominal bit-

-rate> <minimal bitrate>" to set encoding quality on the basis of bitrates.

-When setting all three bitrate parameters to the same value one gets a

-constant bitrate stream. Values are in kbps!

-

-Message "open <filename>" opens an existing file. In case the file does not

-exist oggwrite~ will create it. Previously opened files will be closed. To

-determine how data should be written to the file choose "append" (default) 

-or "truncate" (in case you want to overwrite data in your file).

-

-To set the comment tags in the ogg/vorbis header (which can be displayed by

-the receiving client) use message "<NAMEOFTAG> <comment>". Supported tags are:

-TITLE, ARTIST, GENRE, PERFORMER, LOCATION, COPYRIGHT, CONTACT, DESCRIPTION and

-DATE (which is automatically set to the date/time the broadcast started). To

-get spaces use '=' instead.

-

-Note that changing encoding parameters or header comments while oggwrite~ is

-recording to file might result in audible dropouts.

-

-

-Listening to it:

-

-To listen to ogg/vorbis encoded audio files many player need an extra plug-in.

-Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your

-player.

-

-

-

-

-

-Latest version can be found at:

-http://www.akustische-kunst.de/puredata/

-

-Please report any bugs to olaf.matthes@gmx.de!
\ No newline at end of file
diff --git a/pdogg-meta.pd b/pdogg-meta.pd
new file mode 100644
index 0000000..7295eb9
--- /dev/null
+++ b/pdogg-meta.pd
@@ -0,0 +1,8 @@
+#N canvas 10 10 200 200 10;
+#N canvas 20 20 420 300 META 0;
+#X text 10 30 NAME pdogg;
+#X text 10 50 AUTHOR Olaf Matthes;
+#X text 10 70 DESCRIPTION objects for reading, writing, and streaming ogg;
+#X text 10 90 LICENSE LGPL;
+#X text 10 110 VERSION 0.25;
+#X restore 10 10 pd META;
diff --git a/readme b/readme
deleted file mode 100644
index 03a6f59..0000000
--- a/readme
+++ /dev/null
@@ -1,79 +0,0 @@
-Version 0.2

-copyright (c) 2002 by Olaf Matthes

-

-pdogg~ is a collection of ogg/vorbis externals for pd (by Miller 

-Puckette).

-

-It includes:

-- oggamp~   : streaming client

-- oggcast~  : streamer (for Icecast2)

-- oggread~  : reads files from disk

-- oggwrite~ : writes files to disk

-

-

-To use pdogg~ start pd with '-lib path\to\pdogg' flag. 

-On Win32 systems Pd 0.35 test 17 or later is necessary to get it working!

-

-To compile pdogg~ you need the ogg/vorbice library from 

-http://www.vorbis.com/ and under win additionally Pthreads-win32 from

-http://sources.redhat.com/pthreads-win32/.

-You have to modify the makefile to make it point to the place where the

-libraries can be found on your system.

-

-

-This software is published under LGPL terms.

-

-This is software with ABSOLUTELY NO WARRANTY.

-Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing

-due to a bug or for other reasons. 

-

-*****************************************************************************

-

-pdogg~ uses the ogg/vorbice library to encode audio data.

-The latest version of ogg/vorbis can be found at http://www.vorbice.com/

-

-Below is the original copyright information taken from the ogg/vorbis library:

-

-

-Copyright (c) 2001, Xiphophorus

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-- Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

-

-- Redistributions in binary form must reproduce the above copyright

-notice, this list of conditions and the following disclaimer in the

-documentation and/or other materials provided with the distribution.

-

-- Neither the name of the Xiphophorus nor the names of its contributors

-may be used to endorse or promote products derived from this software

-without specific prior written permission.

-

-

-Below the copyright notice for Pthreads-win32:

-

-    Pthreads-win32 is open 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 version 2.1 of the

-    License.

-    Pthreads-win32 is several binary link libraries, several modules,

-    associated interface definition files and scripts used to control

-    its compilation and installation.

-    Pthreads-win32 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.

-

-*****************************************************************************

-

-For information about the included externals see the README files provided

-in the subdirectories.

-

-

-Latest version can be found at:

-http://www.akustische-kunst.de/puredata/

-

-Please report any bugs to olaf.matthes@gmx.de!
\ No newline at end of file