diff options
| author | musil <tmusil@users.sourceforge.net> | 2005-03-09 17:16:00 +0000 |
|---|---|---|
| committer | musil <tmusil@users.sourceforge.net> | 2005-03-09 17:16:00 +0000 |
| commit | 8724ea74a1936886a6507bfa2d8989d82bf066bf (patch) | |
| tree | 4965f3155b23d411a7bc49f037d7c8253a14c852 /src | |
| parent | 577ac6e80ff4f436fbd054291ed7dddbc31bd49a (diff) | |
sync with last iem 1.15 !
svn path=/trunk/externals/iemlib/; revision=2611
Diffstat (limited to 'src')
28 files changed, 711 insertions, 709 deletions
diff --git a/src/iem_mp3/iem_mp3.dsp b/src/iem_mp3/iem_mp3.dsp index 9fe129d..796189b 100644 --- a/src/iem_mp3/iem_mp3.dsp +++ b/src/iem_mp3/iem_mp3.dsp @@ -1,85 +1,85 @@ -# Microsoft Developer Studio Project File - Name="iem_mp3" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=iem_mp3 - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "iem_mp3.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "iem_mp3.mak" CFG="iem_mp3 - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "iem_mp3 - Win32 Release" (basierend auf "Win32 (x86) External Target") -!MESSAGE "iem_mp3 - Win32 Debug" (basierend auf "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "iem_mp3 - Win32 Release" - -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iem_mp3.exe" -# PROP Bsc_Name "iem_mp3.bsc" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "iem_mp3 - Win32 Debug" - -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iem_mp3.exe" -# PROP Bsc_Name "iem_mp3.bsc" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "iem_mp3 - Win32 Release" -# Name "iem_mp3 - Win32 Debug" - -!IF "$(CFG)" == "iem_mp3 - Win32 Release" - -!ELSEIF "$(CFG)" == "iem_mp3 - Win32 Debug" - -!ENDIF - -# Begin Source File - -SOURCE=.\makefile_win -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="iem_mp3" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=iem_mp3 - Win32 Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE
+!MESSAGE NMAKE /f "iem_mp3.mak".
+!MESSAGE
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE
+!MESSAGE NMAKE /f "iem_mp3.mak" CFG="iem_mp3 - Win32 Debug"
+!MESSAGE
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE
+!MESSAGE "iem_mp3 - Win32 Release" (basierend auf "Win32 (x86) External Target")
+!MESSAGE "iem_mp3 - Win32 Debug" (basierend auf "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "iem_mp3 - Win32 Release"
+
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iem_mp3.exe"
+# PROP Bsc_Name "iem_mp3.bsc"
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "iem_mp3 - Win32 Debug"
+
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iem_mp3.exe"
+# PROP Bsc_Name "iem_mp3.bsc"
+# PROP Target_Dir ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "iem_mp3 - Win32 Release"
+# Name "iem_mp3 - Win32 Debug"
+
+!IF "$(CFG)" == "iem_mp3 - Win32 Release"
+
+!ELSEIF "$(CFG)" == "iem_mp3 - Win32 Debug"
+
+!ENDIF
+
+# Begin Source File
+
+SOURCE=.\makefile_win
+# End Source File
+# End Target
+# End Project
diff --git a/src/iem_mp3/iem_mp3.dsw b/src/iem_mp3/iem_mp3.dsw index f352ffa..f885c80 100644 --- a/src/iem_mp3/iem_mp3.dsw +++ b/src/iem_mp3/iem_mp3.dsw @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN! - -############################################################################### - -Project: "iem_mp3"=.\iem_mp3.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
+
+###############################################################################
+
+Project: "iem_mp3"=.\iem_mp3.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/src/iem_mp3/makefile b/src/iem_mp3/makefile index 601a96f..9994415 100644 --- a/src/iem_mp3/makefile +++ b/src/iem_mp3/makefile @@ -2,14 +2,14 @@ current: all .SUFFIXES: .pd_linux -INCLUDE = -I. -I/usr/local/src/pd-0.36-0/src +INCLUDE = -I. -I/usr/local/src/pd-0.37-4/src LDFLAGS = -export-dynamic -shared LIB = -ldl -lm -lpthread #select either the DBG and OPT compiler flags below: -CFLAGS = -DPD -DUNIX -Wall -W -Werror -Wno-unused \ +CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \ -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer \ -DDL_OPEN diff --git a/src/iem_mp3/makefile_win b/src/iem_mp3/makefile_win index d6b7fa1..71ab182 100644 --- a/src/iem_mp3/makefile_win +++ b/src/iem_mp3/makefile_win @@ -1,38 +1,38 @@ - -all: ..\..\lib\iem_mp3.dll - -VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98" - -PD_INST_PATH = "C:\Programme\pd" - -PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include - -PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN - -PD_WIN_L_FLAGS = /nologo - -PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \ - $(VIS_CPP_PATH)\lib\libc.lib \ - $(VIS_CPP_PATH)\lib\oldnames.lib \ - $(VIS_CPP_PATH)\lib\kernel32.lib \ - $(VIS_CPP_PATH)\lib\wsock32.lib \ - $(VIS_CPP_PATH)\lib\winmm.lib \ - $(PD_INST_PATH)\bin\pthreadVC.lib \ - $(PD_INST_PATH)\bin\pd.lib - - -SRC = sigmp3play.c \ - iem_mp3.c - - -OBJ = $(SRC:.c=.obj) - -.c.obj: - cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c - -..\..\lib\iem_mp3.dll: $(OBJ) - link $(PD_WIN_L_FLAGS) /dll /export:iem_mp3_setup \ - /out:..\..\lib\iem_mp3.dll $(OBJ) $(PD_WIN_LIB) - -clean: - del *.obj +
+all: ..\..\lib\iem_mp3.dll
+
+VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"
+
+PD_INST_PATH = "C:\Programme\pd-0.37-3"
+
+PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include
+
+PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN
+
+PD_WIN_L_FLAGS = /nologo
+
+PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \
+ $(VIS_CPP_PATH)\lib\libc.lib \
+ $(VIS_CPP_PATH)\lib\oldnames.lib \
+ $(VIS_CPP_PATH)\lib\kernel32.lib \
+ $(VIS_CPP_PATH)\lib\wsock32.lib \
+ $(VIS_CPP_PATH)\lib\winmm.lib \
+ $(PD_INST_PATH)\bin\pthreadVC.lib \
+ $(PD_INST_PATH)\bin\pd.lib
+
+
+SRC = sigmp3play.c \
+ iem_mp3.c
+
+
+OBJ = $(SRC:.c=.obj)
+
+.c.obj:
+ cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
+
+..\..\lib\iem_mp3.dll: $(OBJ)
+ link $(PD_WIN_L_FLAGS) /dll /export:iem_mp3_setup \
+ /out:..\..\lib\iem_mp3.dll $(OBJ) $(PD_WIN_LIB)
+
+clean:
+ del *.obj
diff --git a/src/iem_t3_lib/iem_t3_lib.dsp b/src/iem_t3_lib/iem_t3_lib.dsp index e6a61be..ab0a094 100644 --- a/src/iem_t3_lib/iem_t3_lib.dsp +++ b/src/iem_t3_lib/iem_t3_lib.dsp @@ -1,85 +1,85 @@ -# Microsoft Developer Studio Project File - Name="iem_t3_lib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=iem_t3_lib - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "iem_t3_lib.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "iem_t3_lib.mak" CFG="iem_t3_lib - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "iem_t3_lib - Win32 Release" (basierend auf "Win32 (x86) External Target") -!MESSAGE "iem_t3_lib - Win32 Debug" (basierend auf "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "iem_t3_lib - Win32 Release" - -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iem_t3_lib.exe" -# PROP Bsc_Name "iem_t3_lib.bsc" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "iem_t3_lib - Win32 Debug" - -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iem_t3_lib.exe" -# PROP Bsc_Name "iem_t3_lib.bsc" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "iem_t3_lib - Win32 Release" -# Name "iem_t3_lib - Win32 Debug" - -!IF "$(CFG)" == "iem_t3_lib - Win32 Release" - -!ELSEIF "$(CFG)" == "iem_t3_lib - Win32 Debug" - -!ENDIF - -# Begin Source File - -SOURCE=.\makefile_win -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="iem_t3_lib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=iem_t3_lib - Win32 Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE
+!MESSAGE NMAKE /f "iem_t3_lib.mak".
+!MESSAGE
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE
+!MESSAGE NMAKE /f "iem_t3_lib.mak" CFG="iem_t3_lib - Win32 Debug"
+!MESSAGE
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE
+!MESSAGE "iem_t3_lib - Win32 Release" (basierend auf "Win32 (x86) External Target")
+!MESSAGE "iem_t3_lib - Win32 Debug" (basierend auf "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "iem_t3_lib - Win32 Release"
+
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iem_t3_lib.exe"
+# PROP Bsc_Name "iem_t3_lib.bsc"
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "iem_t3_lib - Win32 Debug"
+
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iem_t3_lib.exe"
+# PROP Bsc_Name "iem_t3_lib.bsc"
+# PROP Target_Dir ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "iem_t3_lib - Win32 Release"
+# Name "iem_t3_lib - Win32 Debug"
+
+!IF "$(CFG)" == "iem_t3_lib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "iem_t3_lib - Win32 Debug"
+
+!ENDIF
+
+# Begin Source File
+
+SOURCE=.\makefile_win
+# End Source File
+# End Target
+# End Project
diff --git a/src/iem_t3_lib/iem_t3_lib.dsw b/src/iem_t3_lib/iem_t3_lib.dsw index 2b4e202..6c2a29b 100644 --- a/src/iem_t3_lib/iem_t3_lib.dsw +++ b/src/iem_t3_lib/iem_t3_lib.dsw @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN! - -############################################################################### - -Project: "iem_t3_lib"=.\iem_t3_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
+
+###############################################################################
+
+Project: "iem_t3_lib"=.\iem_t3_lib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/src/iem_t3_lib/makefile b/src/iem_t3_lib/makefile index 34d19d6..9a177a7 100644 --- a/src/iem_t3_lib/makefile +++ b/src/iem_t3_lib/makefile @@ -2,14 +2,14 @@ current: all .SUFFIXES: .pd_linux -INCLUDE = -I. -I/usr/local/src/pd/src +INCLUDE = -I. -I/usr/local/src/pd-0.37-4/src LDFLAGS = -export-dynamic -shared LIB = -ldl -lm -lpthread #select either the DBG and OPT compiler flags below: -CFLAGS = -DPD -DUNIX -Wall -W -Werror -Wno-unused \ +CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \ -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer \ -DDL_OPEN diff --git a/src/iem_t3_lib/makefile_win b/src/iem_t3_lib/makefile_win index 6f31894..80ca974 100644 --- a/src/iem_t3_lib/makefile_win +++ b/src/iem_t3_lib/makefile_win @@ -1,43 +1,43 @@ - -all: ..\..\lib\iem_t3_lib.dll - -VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98" - -PD_INST_PATH = "C:\Programme\pd" - -PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include - -PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN - -PD_WIN_L_FLAGS = /nologo - -PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \ - $(VIS_CPP_PATH)\lib\libc.lib \ - $(VIS_CPP_PATH)\lib\oldnames.lib \ - $(VIS_CPP_PATH)\lib\kernel32.lib \ - $(VIS_CPP_PATH)\lib\wsock32.lib \ - $(VIS_CPP_PATH)\lib\winmm.lib \ - $(PD_INST_PATH)\bin\pthreadVC.lib \ - $(PD_INST_PATH)\bin\pd.lib - - -SRC = sigt3_line.c \ - sigt3_sig.c \ - t3_bpe.c \ - t3_delay.c \ - t3_metro.c \ - t3_timer.c \ - iem_t3_lib.c - - -OBJ = $(SRC:.c=.obj) - -.c.obj: - cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c - -..\..\lib\iem_t3_lib.dll: $(OBJ) - link $(PD_WIN_L_FLAGS) /dll /export:iem_t3_lib_setup \ - /out:..\..\lib\iem_t3_lib.dll $(OBJ) $(PD_WIN_LIB) - -clean: - del *.obj +
+all: ..\..\lib\iem_t3_lib.dll
+
+VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"
+
+PD_INST_PATH = "C:\Programme\pd-0.37-3"
+
+PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include
+
+PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN
+
+PD_WIN_L_FLAGS = /nologo
+
+PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \
+ $(VIS_CPP_PATH)\lib\libc.lib \
+ $(VIS_CPP_PATH)\lib\oldnames.lib \
+ $(VIS_CPP_PATH)\lib\kernel32.lib \
+ $(VIS_CPP_PATH)\lib\wsock32.lib \
+ $(VIS_CPP_PATH)\lib\winmm.lib \
+ $(PD_INST_PATH)\bin\pthreadVC.lib \
+ $(PD_INST_PATH)\bin\pd.lib
+
+
+SRC = sigt3_line.c \
+ sigt3_sig.c \
+ t3_bpe.c \
+ t3_delay.c \
+ t3_metro.c \
+ t3_timer.c \
+ iem_t3_lib.c
+
+
+OBJ = $(SRC:.c=.obj)
+
+.c.obj:
+ cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
+
+..\..\lib\iem_t3_lib.dll: $(OBJ)
+ link $(PD_WIN_L_FLAGS) /dll /export:iem_t3_lib_setup \
+ /out:..\..\lib\iem_t3_lib.dll $(OBJ) $(PD_WIN_LIB)
+
+clean:
+ del *.obj
diff --git a/src/iemlib1/biquad_freq_resp.c b/src/iemlib1/biquad_freq_resp.c index 3ebe25d..aea72b5 100644 --- a/src/iemlib1/biquad_freq_resp.c +++ b/src/iemlib1/biquad_freq_resp.c @@ -89,4 +89,4 @@ void biquad_freq_resp_setup(void) class_addfloat(biquad_freq_resp_class, biquad_freq_resp_float); class_addlist(biquad_freq_resp_class, (t_method)biquad_freq_resp_list); class_sethelpsymbol(biquad_freq_resp_class, gensym("iemhelp/help-biquad_freq_resp")); -}
\ No newline at end of file +} diff --git a/src/iemlib1/iemlib.h b/src/iemlib1/iemlib.h index cc882b1..ac31936 100644 --- a/src/iemlib1/iemlib.h +++ b/src/iemlib1/iemlib.h @@ -95,4 +95,6 @@ union tabfudge int32 tf_i[2]; }; +#define IEM_DENORMAL(f) !(*(unsigned int*)&(f))&0x60000000 + #endif diff --git a/src/iemlib1/iemlib1.dsp b/src/iemlib1/iemlib1.dsp index 7d63ad2..9018881 100644 --- a/src/iemlib1/iemlib1.dsp +++ b/src/iemlib1/iemlib1.dsp @@ -1,85 +1,85 @@ -# Microsoft Developer Studio Project File - Name="iemlib1" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=iemlib1 - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "iemlib1.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "iemlib1.mak" CFG="iemlib1 - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "iemlib1 - Win32 Release" (basierend auf "Win32 (x86) External Target") -!MESSAGE "iemlib1 - Win32 Debug" (basierend auf "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "iemlib1 - Win32 Release" - -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iemlib1.exe" -# PROP Bsc_Name "iemlib1.bsc" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "iemlib1 - Win32 Debug" - -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iemlib1.exe" -# PROP Bsc_Name "iemlib1.bsc" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "iemlib1 - Win32 Release" -# Name "iemlib1 - Win32 Debug" - -!IF "$(CFG)" == "iemlib1 - Win32 Release" - -!ELSEIF "$(CFG)" == "iemlib1 - Win32 Debug" - -!ENDIF - -# Begin Source File - -SOURCE=.\makefile_win -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="iemlib1" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=iemlib1 - Win32 Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE
+!MESSAGE NMAKE /f "iemlib1.mak".
+!MESSAGE
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE
+!MESSAGE NMAKE /f "iemlib1.mak" CFG="iemlib1 - Win32 Debug"
+!MESSAGE
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE
+!MESSAGE "iemlib1 - Win32 Release" (basierend auf "Win32 (x86) External Target")
+!MESSAGE "iemlib1 - Win32 Debug" (basierend auf "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "iemlib1 - Win32 Release"
+
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iemlib1.exe"
+# PROP Bsc_Name "iemlib1.bsc"
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "iemlib1 - Win32 Debug"
+
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iemlib1.exe"
+# PROP Bsc_Name "iemlib1.bsc"
+# PROP Target_Dir ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "iemlib1 - Win32 Release"
+# Name "iemlib1 - Win32 Debug"
+
+!IF "$(CFG)" == "iemlib1 - Win32 Release"
+
+!ELSEIF "$(CFG)" == "iemlib1 - Win32 Debug"
+
+!ENDIF
+
+# Begin Source File
+
+SOURCE=.\makefile_win
+# End Source File
+# End Target
+# End Project
diff --git a/src/iemlib1/iemlib1.dsw b/src/iemlib1/iemlib1.dsw index c8260a7..0fed87a 100644 --- a/src/iemlib1/iemlib1.dsw +++ b/src/iemlib1/iemlib1.dsw @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN! - -############################################################################### - -Project: "iemlib1"=.\iemlib1.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
+
+###############################################################################
+
+Project: "iemlib1"=.\iemlib1.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/src/iemlib1/makefile b/src/iemlib1/makefile index c8148cf..0fe9c68 100644 --- a/src/iemlib1/makefile +++ b/src/iemlib1/makefile @@ -2,14 +2,14 @@ current: all .SUFFIXES: .pd_linux -INCLUDE = -I. -I/usr/local/src/pd/src +INCLUDE = -I. -I/usr/local/src/pd-0.37-4/src LDFLAGS = -export-dynamic -shared LIB = -ldl -lm -lpthread #select either the DBG and OPT compiler flags below: -CFLAGS = -DPD -DUNIX -Wall -W -Werror -Wno-unused \ +CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \ -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer \ -DDL_OPEN diff --git a/src/iemlib1/makefile_win b/src/iemlib1/makefile_win index 8ab353c..332cc8d 100644 --- a/src/iemlib1/makefile_win +++ b/src/iemlib1/makefile_win @@ -1,61 +1,61 @@ - -all: ..\..\lib\iemlib1.dll - -VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98" - -PD_INST_PATH = "C:\Programme\pd" - -PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include - -PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN - -PD_WIN_L_FLAGS = /nologo - -PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \ - $(VIS_CPP_PATH)\lib\libc.lib \ - $(VIS_CPP_PATH)\lib\oldnames.lib \ - $(VIS_CPP_PATH)\lib\kernel32.lib \ - $(VIS_CPP_PATH)\lib\wsock32.lib \ - $(VIS_CPP_PATH)\lib\winmm.lib \ - $(PD_INST_PATH)\bin\pthreadVC.lib \ - $(PD_INST_PATH)\bin\pd.lib - - -SRC = biquad_freq_resp.c \ - db2v.c \ - f2note.c \ - forpp.c \ - gate.c \ - sigfilter.c \ - sigFIR.c \ - sighml_shelf.c \ - sigiem_cot4.c \ - sigiem_delay.c \ - sigiem_sqrt4.c \ - sigiem_pow4.c \ - siglp1_t.c \ - sigmov_avrg_kern.c \ - sigpara_bp2.c \ - sigpeakenv.c \ - sigprvu.c \ - sigpvu.c \ - sigrvu.c \ - sigsin_phase.c \ - sigvcf_filter.c \ - soundfile_info.c \ - split.c \ - v2db.c \ - iemlib1.c - - -OBJ = $(SRC:.c=.obj) - -.c.obj: - cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c - -..\..\lib\iemlib1.dll: $(OBJ) - link $(PD_WIN_L_FLAGS) /dll /export:iemlib1_setup \ - /out:..\..\lib\iemlib1.dll $(OBJ) $(PD_WIN_LIB) - -clean: - del *.obj +
+all: ..\..\lib\iemlib1.dll
+
+VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"
+
+PD_INST_PATH = "C:\Programme\pd-0.37-3"
+
+PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include
+
+PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN
+
+PD_WIN_L_FLAGS = /nologo
+
+PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \
+ $(VIS_CPP_PATH)\lib\libc.lib \
+ $(VIS_CPP_PATH)\lib\oldnames.lib \
+ $(VIS_CPP_PATH)\lib\kernel32.lib \
+ $(VIS_CPP_PATH)\lib\wsock32.lib \
+ $(VIS_CPP_PATH)\lib\winmm.lib \
+ $(PD_INST_PATH)\bin\pthreadVC.lib \
+ $(PD_INST_PATH)\bin\pd.lib
+
+
+SRC = biquad_freq_resp.c \
+ db2v.c \
+ f2note.c \
+ forpp.c \
+ gate.c \
+ sigfilter.c \
+ sigFIR.c \
+ sighml_shelf.c \
+ sigiem_cot4.c \
+ sigiem_delay.c \
+ sigiem_sqrt4.c \
+ sigiem_pow4.c \
+ siglp1_t.c \
+ sigmov_avrg_kern.c \
+ sigpara_bp2.c \
+ sigpeakenv.c \
+ sigprvu.c \
+ sigpvu.c \
+ sigrvu.c \
+ sigsin_phase.c \
+ sigvcf_filter.c \
+ soundfile_info.c \
+ split.c \
+ v2db.c \
+ iemlib1.c
+
+
+OBJ = $(SRC:.c=.obj)
+
+.c.obj:
+ cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
+
+..\..\lib\iemlib1.dll: $(OBJ)
+ link $(PD_WIN_L_FLAGS) /dll /export:iemlib1_setup \
+ /out:..\..\lib\iemlib1.dll $(OBJ) $(PD_WIN_LIB)
+
+clean:
+ del *.obj
diff --git a/src/iemlib1/sigfilter.c b/src/iemlib1/sigfilter.c index 6a05206..5f2ec07 100644 --- a/src/iemlib1/sigfilter.c +++ b/src/iemlib1/sigfilter.c @@ -351,9 +351,9 @@ static t_int *sigfilter_perform_2o(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn2)) + if(IEM_DENORMAL(wn2)) wn2 = 0.0f; - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->wn1 = wn1; @@ -406,9 +406,9 @@ static t_int *sigfilter_perf8_2o(t_int *w) wn[1] = wn[9]; } /* NAN protect */ - if(PD_BADFLOAT(wn[0])) + if(IEM_DENORMAL(wn[0])) wn[0] = 0.0f; - if(PD_BADFLOAT(wn[1])) + if(IEM_DENORMAL(wn[1])) wn[1] = 0.0f; x->wn1 = wn[1]; @@ -434,7 +434,7 @@ static t_int *sigfilter_perform_1o(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->wn1 = wn1; @@ -474,7 +474,7 @@ static t_int *sigfilter_perf8_1o(t_int *w) wn[0] = wn[8]; } /* NAN protect */ - if(PD_BADFLOAT(wn[0])) + if(IEM_DENORMAL(wn[0])) wn[0] = 0.0f; x->wn1 = wn[0]; diff --git a/src/iemlib1/sighml_shelf.c b/src/iemlib1/sighml_shelf.c index ef209d1..eb182bd 100644 --- a/src/iemlib1/sighml_shelf.c +++ b/src/iemlib1/sighml_shelf.c @@ -288,9 +288,9 @@ static t_int *sighml_shelf_perform(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn2)) + if(IEM_DENORMAL(wn2)) wn2 = 0.0f; - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->wn1 = wn1; @@ -343,9 +343,9 @@ static t_int *sighml_shelf_perf8(t_int *w) wn[1] = wn[9]; } /* NAN protect */ - if(PD_BADFLOAT(wn[0])) + if(IEM_DENORMAL(wn[0])) wn[0] = 0.0f; - if(PD_BADFLOAT(wn[1])) + if(IEM_DENORMAL(wn[1])) wn[1] = 0.0f; x->wn1 = wn[1]; diff --git a/src/iemlib1/siglp1_t.c b/src/iemlib1/siglp1_t.c index 060d988..349b3fa 100644 --- a/src/iemlib1/siglp1_t.c +++ b/src/iemlib1/siglp1_t.c @@ -77,7 +77,7 @@ static t_int *siglp1_t_perform(t_int *w) yn1 = yn0; } /* NAN protect */ - if(PD_BADFLOAT(yn1)) + if(IEM_DENORMAL(yn1)) yn1 = 0.0f; x->yn1 = yn1; return(w+5); @@ -115,7 +115,7 @@ static t_int *siglp1_t_perf8(t_int *w) yn[0] = yn[8]; } /* NAN protect */ - if(PD_BADFLOAT(yn[0])) + if(IEM_DENORMAL(yn[0])) yn[0] = 0.0f; x->yn1 = yn[0]; diff --git a/src/iemlib1/sigpara_bp2.c b/src/iemlib1/sigpara_bp2.c index 871191e..bc6fe49 100644 --- a/src/iemlib1/sigpara_bp2.c +++ b/src/iemlib1/sigpara_bp2.c @@ -176,9 +176,9 @@ static t_int *sigpara_bp2_perform(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn2)) + if(IEM_DENORMAL(wn2)) wn2 = 0.0f; - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->wn1 = wn1; @@ -231,9 +231,9 @@ static t_int *sigpara_bp2_perf8(t_int *w) wn[1] = wn[9]; } /* NAN protect */ - if(PD_BADFLOAT(wn[0])) + if(IEM_DENORMAL(wn[0])) wn[0] = 0.0f; - if(PD_BADFLOAT(wn[1])) + if(IEM_DENORMAL(wn[1])) wn[1] = 0.0f; x->wn1 = wn[1]; @@ -302,7 +302,7 @@ static void sigpara_bp2_print(t_sigpara_bp2 *x) x->x_at[2].a_w.w_float = x->a0; x->x_at[3].a_w.w_float = x->a1; x->x_at[4].a_w.w_float = x->a2; - outlet_list(x->x_debug_outlet, &s_list, 5, x->x_at); post("fb1 = %g, fb2 = %g, ff1 = %g, ff2 = %g, ff3 = %g", x->b1, x->b2, x->a0, x->a1, x->a2); + outlet_list(x->x_debug_outlet, &s_list, 5, x->x_at); } static void sigpara_bp2_dsp(t_sigpara_bp2 *x, t_signal **sp) diff --git a/src/iemlib1/sigpeakenv.c b/src/iemlib1/sigpeakenv.c index a16638e..4ced863 100644 --- a/src/iemlib1/sigpeakenv.c +++ b/src/iemlib1/sigpeakenv.c @@ -62,7 +62,7 @@ static t_int *sigpeakenv_perform(t_int *w) *out++ = peak; } /* NAN protect */ - if(PD_BADFLOAT(peak)) + if(IEM_DENORMAL(peak)) peak = 0.0f; x->x_old_peak = peak; return(w+5); diff --git a/src/iemlib1/sigprvu.c b/src/iemlib1/sigprvu.c index bb4b72a..07c4cff 100644 --- a/src/iemlib1/sigprvu.c +++ b/src/iemlib1/sigprvu.c @@ -160,7 +160,7 @@ static void sigprvu_tick_metro(t_sigprvu *x) x->x_old_peak *= c1; /* NAN protect */ - if(PD_BADFLOAT(x->x_old_peak)) + if(IEM_DENORMAL(x->x_old_peak)) x->x_old_peak = 0.0f; if(x->x_cur_peak > x->x_old_peak) @@ -191,7 +191,7 @@ static void sigprvu_tick_metro(t_sigprvu *x) cur_rms = (1.0f - c1)*x->x_sum_rms*x->x_rcp + c1*x->x_old_rms; /* NAN protect */ - if(PD_BADFLOAT(cur_rms)) + if(IEM_DENORMAL(cur_rms)) cur_rms = 0.0f; if(cur_rms <= 0.0000000001f) diff --git a/src/iemlib1/sigpvu.c b/src/iemlib1/sigpvu.c index 5dd4ea4..8ffbda3 100644 --- a/src/iemlib1/sigpvu.c +++ b/src/iemlib1/sigpvu.c @@ -129,7 +129,7 @@ static void sigpvu_tick(t_sigpvu *x) x->x_old_peak *= x->x_c1; /* NAN protect */ - if(PD_BADFLOAT(x->x_old_peak)) + if(IEM_DENORMAL(x->x_old_peak)) x->x_old_peak = 0.0f; if(x->x_cur_peak > x->x_old_peak) diff --git a/src/iemlib1/sigrvu.c b/src/iemlib1/sigrvu.c index 70b9cd7..fac370e 100644 --- a/src/iemlib1/sigrvu.c +++ b/src/iemlib1/sigrvu.c @@ -119,7 +119,7 @@ static void sigrvu_tick_metro(t_sigrvu *x) cur_rms = (1.0f - c1)*x->x_sum_rms*x->x_rcp + c1*x->x_old_rms; /* NAN protect */ - if(PD_BADFLOAT(cur_rms)) + if(IEM_DENORMAL(cur_rms)) cur_rms = 0.0f; if(cur_rms <= 0.0000000001f) diff --git a/src/iemlib1/sigvcf_filter.c b/src/iemlib1/sigvcf_filter.c index ec14306..a491c50 100644 --- a/src/iemlib1/sigvcf_filter.c +++ b/src/iemlib1/sigvcf_filter.c @@ -110,9 +110,9 @@ static t_int *sigvcf_filter_perform_lp2(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn2)) + if(IEM_DENORMAL(wn2)) wn2 = 0.0f; - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->x_wn1 = wn1; @@ -165,9 +165,9 @@ static t_int *sigvcf_filter_perform_bp2(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn2)) + if(IEM_DENORMAL(wn2)) wn2 = 0.0f; - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->x_wn1 = wn1; @@ -220,9 +220,9 @@ static t_int *sigvcf_filter_perform_rbp2(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn2)) + if(IEM_DENORMAL(wn2)) wn2 = 0.0f; - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->x_wn1 = wn1; @@ -275,9 +275,9 @@ static t_int *sigvcf_filter_perform_hp2(t_int *w) wn1 = wn0; } /* NAN protect */ - if(PD_BADFLOAT(wn2)) + if(IEM_DENORMAL(wn2)) wn2 = 0.0f; - if(PD_BADFLOAT(wn1)) + if(IEM_DENORMAL(wn1)) wn1 = 0.0f; x->x_wn1 = wn1; diff --git a/src/iemlib1/split.c b/src/iemlib1/split.c index 0a3bcff..7716054 100644 --- a/src/iemlib1/split.c +++ b/src/iemlib1/split.c @@ -51,4 +51,4 @@ void split_setup(void) sizeof(t_split), 0, A_DEFFLOAT, 0); class_addfloat(split_class, split_float); class_sethelpsymbol(split_class, gensym("iemhelp/help-split")); -}
\ No newline at end of file +} diff --git a/src/iemlib2/iemlib2.dsp b/src/iemlib2/iemlib2.dsp index d8c2966..0eee8d0 100644 --- a/src/iemlib2/iemlib2.dsp +++ b/src/iemlib2/iemlib2.dsp @@ -1,85 +1,85 @@ -# Microsoft Developer Studio Project File - Name="iemlib2" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=iemlib2 - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "iemlib2.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "iemlib2.mak" CFG="iemlib2 - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "iemlib2 - Win32 Release" (basierend auf "Win32 (x86) External Target") -!MESSAGE "iemlib2 - Win32 Debug" (basierend auf "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "iemlib2 - Win32 Release" - -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iemlib2.exe" -# PROP Bsc_Name "iemlib2.bsc" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "iemlib2 - Win32 Debug" - -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f makefile_win" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "makefile_win.exe" -# PROP BASE Bsc_Name "makefile_win.bsc" -# PROP BASE Target_Dir "" -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "NMAKE /f makefile_win" -# PROP Rebuild_Opt "/a" -# PROP Target_File "iemlib2.exe" -# PROP Bsc_Name "iemlib2.bsc" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "iemlib2 - Win32 Release" -# Name "iemlib2 - Win32 Debug" - -!IF "$(CFG)" == "iemlib2 - Win32 Release" - -!ELSEIF "$(CFG)" == "iemlib2 - Win32 Debug" - -!ENDIF - -# Begin Source File - -SOURCE=.\makefile_win -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="iemlib2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=iemlib2 - Win32 Debug
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE
+!MESSAGE NMAKE /f "iemlib2.mak".
+!MESSAGE
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE
+!MESSAGE NMAKE /f "iemlib2.mak" CFG="iemlib2 - Win32 Debug"
+!MESSAGE
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE
+!MESSAGE "iemlib2 - Win32 Release" (basierend auf "Win32 (x86) External Target")
+!MESSAGE "iemlib2 - Win32 Debug" (basierend auf "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "iemlib2 - Win32 Release"
+
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iemlib2.exe"
+# PROP Bsc_Name "iemlib2.bsc"
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "iemlib2 - Win32 Debug"
+
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f makefile_win"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makefile_win.exe"
+# PROP BASE Bsc_Name "makefile_win.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f makefile_win"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "iemlib2.exe"
+# PROP Bsc_Name "iemlib2.bsc"
+# PROP Target_Dir ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "iemlib2 - Win32 Release"
+# Name "iemlib2 - Win32 Debug"
+
+!IF "$(CFG)" == "iemlib2 - Win32 Release"
+
+!ELSEIF "$(CFG)" == "iemlib2 - Win32 Debug"
+
+!ENDIF
+
+# Begin Source File
+
+SOURCE=.\makefile_win
+# End Source File
+# End Target
+# End Project
diff --git a/src/iemlib2/iemlib2.dsw b/src/iemlib2/iemlib2.dsw index 2226931..4cf6c56 100644 --- a/src/iemlib2/iemlib2.dsw +++ b/src/iemlib2/iemlib2.dsw @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN! - -############################################################################### - -Project: "iemlib2"=.\iemlib2.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
+
+###############################################################################
+
+Project: "iemlib2"=.\iemlib2.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/src/iemlib2/makefile b/src/iemlib2/makefile index d44bf58..5e5c173 100644 --- a/src/iemlib2/makefile +++ b/src/iemlib2/makefile @@ -2,14 +2,14 @@ current: all .SUFFIXES: .pd_linux -INCLUDE = -I. -I/usr/local/src/pd/src +INCLUDE = -I. -I/usr/local/src/pd-0.37-4/src LDFLAGS = -export-dynamic -shared LIB = -ldl -lm -lpthread #select either the DBG and OPT compiler flags below: -CFLAGS = -DPD -DUNIX -Wall -W -Werror -Wno-unused \ +CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \ -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer \ -DDL_OPEN diff --git a/src/iemlib2/makefile_win b/src/iemlib2/makefile_win index 21e5678..3ac709d 100644 --- a/src/iemlib2/makefile_win +++ b/src/iemlib2/makefile_win @@ -1,71 +1,71 @@ - -all: ..\..\lib\iemlib2.dll - -VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98" - -PD_INST_PATH = "C:\Programme\pd" - -PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include - -PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN - -PD_WIN_L_FLAGS = /nologo - -PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \ - $(VIS_CPP_PATH)\lib\libc.lib \ - $(VIS_CPP_PATH)\lib\oldnames.lib \ - $(VIS_CPP_PATH)\lib\kernel32.lib \ - $(VIS_CPP_PATH)\lib\wsock32.lib \ - $(VIS_CPP_PATH)\lib\winmm.lib \ - $(PD_INST_PATH)\bin\pthreadVC.lib \ - $(PD_INST_PATH)\bin\pd.lib - - -SRC = add2_comma.c \ - bpe.c \ - dollarg.c \ - exp_inc.c \ - float24.c \ - iem_anything_kernel.c \ - iem_append_kernel.c \ - iem_i_route.c \ - iem_pbank_csv.c \ - iem_prepend_kernel.c \ - iem_receive_kernel.c \ - iem_route.c \ - iem_sel_any.c \ - iem_send_kernel.c \ - init.c \ - list2send.c \ - mergefilename.c \ - modulo_counter.c \ - post_netreceive.c \ - pre_inlet.c \ - prepend_ascii.c \ - round_zero.c \ - sigfade.c \ - sigiem_blocksize.c \ - sigiem_samplerate.c \ - sigLFO_noise.c \ - sigm2f.c \ - speedlim.c \ - splitfilename.c \ - stripfilename.c \ - toggle_mess.c \ - transf_fader.c \ - unsymbol.c \ - wrap.c \ - iemlib2.c - - -OBJ = $(SRC:.c=.obj) - -.c.obj: - cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c - -..\..\lib\iemlib2.dll: $(OBJ) - link $(PD_WIN_L_FLAGS) /dll /export:iemlib2_setup \ - /out:..\..\lib\iemlib2.dll $(OBJ) $(PD_WIN_LIB) - -clean: - del *.obj +
+all: ..\..\lib\iemlib2.dll
+
+VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"
+
+PD_INST_PATH = "C:\Programme\pd-0.37-3"
+
+PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include
+
+PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN
+
+PD_WIN_L_FLAGS = /nologo
+
+PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \
+ $(VIS_CPP_PATH)\lib\libc.lib \
+ $(VIS_CPP_PATH)\lib\oldnames.lib \
+ $(VIS_CPP_PATH)\lib\kernel32.lib \
+ $(VIS_CPP_PATH)\lib\wsock32.lib \
+ $(VIS_CPP_PATH)\lib\winmm.lib \
+ $(PD_INST_PATH)\bin\pthreadVC.lib \
+ $(PD_INST_PATH)\bin\pd.lib
+
+
+SRC = add2_comma.c \
+ bpe.c \
+ dollarg.c \
+ exp_inc.c \
+ float24.c \
+ iem_anything_kernel.c \
+ iem_append_kernel.c \
+ iem_i_route.c \
+ iem_pbank_csv.c \
+ iem_prepend_kernel.c \
+ iem_receive_kernel.c \
+ iem_route.c \
+ iem_sel_any.c \
+ iem_send_kernel.c \
+ init.c \
+ list2send.c \
+ mergefilename.c \
+ modulo_counter.c \
+ post_netreceive.c \
+ pre_inlet.c \
+ prepend_ascii.c \
+ round_zero.c \
+ sigfade.c \
+ sigiem_blocksize.c \
+ sigiem_samplerate.c \
+ sigLFO_noise.c \
+ sigm2f.c \
+ speedlim.c \
+ splitfilename.c \
+ stripfilename.c \
+ toggle_mess.c \
+ transf_fader.c \
+ unsymbol.c \
+ wrap.c \
+ iemlib2.c
+
+
+OBJ = $(SRC:.c=.obj)
+
+.c.obj:
+ cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
+
+..\..\lib\iemlib2.dll: $(OBJ)
+ link $(PD_WIN_L_FLAGS) /dll /export:iemlib2_setup \
+ /out:..\..\lib\iemlib2.dll $(OBJ) $(PD_WIN_LIB)
+
+clean:
+ del *.obj
|