Update of /cvsroot/pure-data/externals/pdogg In directory sc8-pr-cvs1:/tmp/cvs-serv17605

Modified Files: makefile pdogg.c readme Log Message: recommitting olaf's sources from 0.25

Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile 25 Sep 2003 23:02:14 -0000 1.3 --- makefile 4 Jan 2004 12:16:07 -0000 1.4 *************** *** 1,101 **** ! NAME=pdogg ! CSYM=pdogg ! ! current: pd_nt pd_darwin pd_linux ! ! # ----------------------- NT ----------------------- ! ! pd_nt: $(NAME).dll ! ! .SUFFIXES: .dll ! ! PDNTCFLAGS = /W3 /WX /MD /O2 /G6 /DNT /DPD /nologo ! VC = "C:\Programme\Microsoft Visual Studio\VC98" ! ! PDNTINCLUDE = /I. /Ic:\pd\tcl\include /Ic:\pd\src /I$(VC)\include /Iinclude ! ! PDNTLDIR = $(VC)\Lib ! PDNTLIB = $(PDNTLDIR)\msvcrt.lib \ ! $(PDNTLDIR)\oldnames.lib \ ! $(PDNTLDIR)\kernel32.lib \ ! $(PDNTLDIR)\user32.lib \ ! $(PDNTLDIR)\uuid.lib \ ! $(PDNTLDIR)\ws2_32.lib \ ! $(PDNTLDIR)\pthreadVC.lib \ ! lib\ogg_static.lib \ ! lib\vorbis_static.lib \ ! lib\vorbisenc_static.lib \ ! lib\vorbisfile_static.lib \ ! c:\pd\bin\pd.lib ! ! ! EXTERNALS = oggamp~.obj oggcast~.obj oggread~.obj oggwrite~.obj ! ! .c.dll: ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggamp~\oggamp~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggcast~\oggcast~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggread~\oggread~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggwrite~\oggwrite~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c ! link /dll /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib /export:$(CSYM)_setup $*.obj \ ! $(EXTERNALS) $(PDNTLIB) ! ! # ----------------------- Mac OS X ----------------------- ! ! pd_darwin: $(NAME).pd_darwin ! ! .SUFFIXES: .pd_darwin ! ! DARWINCFLAGS = -DPD -DUNIX -DMACOSX -O3 \ ! -Wall -W -Wshadow -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch ! ! # where is your m_pd.h ??? ! DARWININCLUDE = -I../../src -I. -Iinclude ! ! DARWINEXTERNALS = oggamp~.o oggcast~.o oggread~.o oggwrite~.o ! ! .c.pd_darwin: ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggamp~/oggamp~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggcast~/oggcast~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggread~/oggread~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggwrite~/oggwrite~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c $*.c ! cc -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o $(DARWINEXTERNALS) \ ! -Llib -lvorbisfile -lvorbisenc -lvorbis -logg ! rm -f $*.o ../$*.pd_darwin ! ln -s $*/$*.pd_darwin .. ! ! # ----------------------- LINUX i386 ----------------------- ! ! pd_linux: $(NAME).pd_linux ! ! .SUFFIXES: .pd_linux ! ! LINUXCFLAGS = -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointer \ ! -Wall -W -Wshadow -Wno-unused -Wno-parentheses -Wno-switch ! ! LINUXINCLUDE = -I../../src -I ../../pd/src ! ! LINUXEXTERNALS = oggamp~.o oggcast~.o oggread~.o oggwrite~.o ! ! .c.pd_linux: ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggamp~/oggamp~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggcast~/oggcast~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggread~/oggread~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggwrite~/oggwrite~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c $*.c ! ld -export_dynamic -shared -o $*.pd_linux $*.o $(LINUXEXTERNALS) -lc \ ! -lm -L/usr/local/lib -lvorbisfile -lvorbisenc -lvorbis -logg ! strip --strip-unneeded $*.pd_linux ! ! # ---------------------------------------------------------- ! ! PDDIR=/usr/lib/pd ! ! install: ! install -d $(PDDIR)/doc/5.reference/pdogg ! cp help-*.pd ../../doc/5.reference/pdogg ! ! clean: ! rm -f *.o *.pd_* so_locations --- 1,101 ---- ! NAME=pdogg ! CSYM=pdogg ! ! current: pd_nt pd_darwin pd_linux ! ! # ----------------------- NT ----------------------- ! ! pd_nt: $(NAME).dll ! ! .SUFFIXES: .dll ! ! PDNTCFLAGS = /W3 /WX /MD /O2 /G6 /DNT /DPD /nologo ! VC = "C:\Programme\Microsoft Visual Studio\VC98" ! ! PDNTINCLUDE = /I. /Ic:\pd\tcl\include /Ic:\pd\src /I$(VC)\include /Iinclude ! ! PDNTLDIR = $(VC)\Lib ! PDNTLIB = $(PDNTLDIR)\msvcrt.lib \ ! $(PDNTLDIR)\oldnames.lib \ ! $(PDNTLDIR)\kernel32.lib \ ! $(PDNTLDIR)\user32.lib \ ! $(PDNTLDIR)\uuid.lib \ ! $(PDNTLDIR)\ws2_32.lib \ ! $(PDNTLDIR)\pthreadVC.lib \ ! lib\ogg_static.lib \ ! lib\vorbis_static.lib \ ! lib\vorbisenc_static.lib \ ! lib\vorbisfile_static.lib \ ! c:\pd\bin\pd.lib ! ! ! EXTERNALS = oggamp~.obj oggcast~.obj oggread~.obj oggwrite~.obj ! ! .c.dll: ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggamp~\oggamp~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggcast~\oggcast~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggread~\oggread~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c oggwrite~\oggwrite~.c ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c ! link /dll /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib /export:$(CSYM)_setup $*.obj \ ! $(EXTERNALS) $(PDNTLIB) ! ! # ----------------------- Mac OS X ----------------------- ! ! pd_darwin: $(NAME).pd_darwin ! ! .SUFFIXES: .pd_darwin ! ! DARWINCFLAGS = -DPD -DUNIX -DMACOSX -O3 \ ! -Wall -W -Wshadow -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch ! ! # where is your m_pd.h ??? ! DARWININCLUDE = -I../../src -I. -Iinclude ! ! DARWINEXTERNALS = oggamp~.o oggcast~.o oggread~.o oggwrite~.o ! ! .c.pd_darwin: ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggamp~/oggamp~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggcast~/oggcast~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggread~/oggread~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c oggwrite~/oggwrite~.c ! cc $(DARWINCFLAGS) $(DARWININCLUDE) -c $*.c ! cc -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o $(DARWINEXTERNALS) \ ! -Llib -lvorbisfile -lvorbisenc -lvorbis -logg ! rm -f $*.o ../$*.pd_darwin ! ln -s $*/$*.pd_darwin .. ! ! # ----------------------- LINUX i386 ----------------------- ! ! pd_linux: $(NAME).pd_linux ! ! .SUFFIXES: .pd_linux ! ! LINUXCFLAGS = -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointer \ ! -Wall -W -Wshadow -Wno-unused -Wno-parentheses -Wno-switch ! ! LINUXINCLUDE = -I../../src -I ../../pd/src ! ! LINUXEXTERNALS = oggamp~.o oggcast~.o oggread~.o oggwrite~.o ! ! .c.pd_linux: ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggamp~/oggamp~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggcast~/oggcast~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggread~/oggread~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c oggwrite~/oggwrite~.c ! cc $(LINUXCFLAGS) $(LINUXINCLUDE) -c $*.c ! ld -export_dynamic -shared -o $*.pd_linux $*.o $(LINUXEXTERNALS) -lc \ ! -lm -L/usr/local/lib -lvorbisfile -lvorbisenc -lvorbis -logg ! strip --strip-unneeded $*.pd_linux ! ! # ---------------------------------------------------------- ! ! PDDIR=/usr/lib/pd ! ! install: ! install -d $(PDDIR)/doc/5.reference/pdogg ! cp help-*.pd ../../doc/5.reference/pdogg ! ! clean: ! rm -f *.o *.pd_* so_locations

Index: pdogg.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/pdogg.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pdogg.c 23 Apr 2003 10:36:25 -0000 1.2 --- pdogg.c 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,46 **** ! #ifndef VERSION ! #define VERSION "0.23" ! #endif ! ! #include <m_pd.h> ! ! ! #ifndef __DATE__ ! #define __DATE__ "without using a gnu compiler" ! #endif ! ! typedef struct _pdogg ! { ! t_object x_obj; ! } t_pdogg; ! ! static t_class* pdogg_class; ! ! // tilde objects ! void oggamp_tilde_setup(); ! void oggcast_tilde_setup(); ! void oggread_tilde_setup(); ! void oggwrite_tilde_setup(); ! ! static void* pdogg_new(t_symbol* s) { ! t_pdogg *x = (t_pdogg *)pd_new(pdogg_class); ! return (x); ! } ! ! void pdogg_setup(void) ! { ! pdogg_class = class_new(gensym("pdogg"), (t_newmethod)pdogg_new, 0, ! sizeof(t_pdogg), 0,0); ! ! oggamp_tilde_setup(); ! oggcast_tilde_setup(); ! oggread_tilde_setup(); ! oggwrite_tilde_setup(); ! ! post("\n pdogg :: Ogg Vorbis library for pure-data"); ! post(" written by Olaf Matthes olaf.matthes@gmx.de"); ! post(" version: "VERSION); ! post(" compiled: "__DATE__", using Ogg Vorbis library 1.0"); ! post(" home: http://www.akustische-kunst.org/puredata/pdogg/"); ! post(" including: oggamp~0.2f, oggcast~0.2h, oggread~0.2c, oggwrite~0.1c\n"); ! } --- 1,46 ---- ! #ifndef VERSION ! #define VERSION "0.25" ! #endif ! ! #include <m_pd.h> ! ! ! #ifndef __DATE__ ! #define __DATE__ "without using a gnu compiler" ! #endif ! ! typedef struct _pdogg ! { ! t_object x_obj; ! } t_pdogg; ! ! static t_class* pdogg_class; ! ! // tilde objects ! void oggamp_tilde_setup(); ! void oggcast_tilde_setup(); ! void oggread_tilde_setup(); ! void oggwrite_tilde_setup(); ! ! static void* pdogg_new(t_symbol* s) { ! t_pdogg *x = (t_pdogg *)pd_new(pdogg_class); ! return (x); ! } ! ! void pdogg_setup(void) ! { ! pdogg_class = class_new(gensym("pdogg"), (t_newmethod)pdogg_new, 0, ! sizeof(t_pdogg), 0,0); ! ! oggamp_tilde_setup(); ! oggcast_tilde_setup(); ! oggread_tilde_setup(); ! oggwrite_tilde_setup(); ! ! post("\n pdogg :: Ogg Vorbis library for pure-data"); ! post(" written by Olaf Matthes olaf.matthes@gmx.de"); ! post(" version: "VERSION); ! post(" compiled: "__DATE__", using Ogg Vorbis library 1.0"); ! post(" home: http://www.akustische-kunst.org/puredata/pdogg/"); ! post(" including: oggamp~0.2f, oggcast~0.2h, oggread~0.2c, oggwrite~0.1c\n"); ! }

Index: readme =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/readme,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme 23 Apr 2003 10:36:25 -0000 1.2 --- readme 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,79 **** ! 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! --- 1,79 ---- ! 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!