diff options
Diffstat (limited to 'orkaudio/audiocaptureplugins')
-rw-r--r-- | orkaudio/audiocaptureplugins/Makefile.am | 2 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/generator/Generator.cpp | 3 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/generator/Makefile.am | 13 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/Iax2Session.cpp | 2 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/Makefile.am | 21 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h | 2 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/RtpSession.cpp | 2 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIp.cpp | 2 |
8 files changed, 27 insertions, 20 deletions
diff --git a/orkaudio/audiocaptureplugins/Makefile.am b/orkaudio/audiocaptureplugins/Makefile.am index bc31197..0ac6a45 100644 --- a/orkaudio/audiocaptureplugins/Makefile.am +++ b/orkaudio/audiocaptureplugins/Makefile.am @@ -1,2 +1,4 @@ METASOURCES = AUTO SUBDIRS = generator voip + +EXTRA_DIST = common/AudioCapturePluginCommon.h diff --git a/orkaudio/audiocaptureplugins/generator/Generator.cpp b/orkaudio/audiocaptureplugins/generator/Generator.cpp index f00d1f1..1595634 100644 --- a/orkaudio/audiocaptureplugins/generator/Generator.cpp +++ b/orkaudio/audiocaptureplugins/generator/Generator.cpp @@ -84,7 +84,8 @@ void Run() { audioBuffer[i] = 0; } - int numRead = fread(audioBuffer, sizeof(short), fileSize, file); + // FIXME: why was this read? + //int numRead = fread(audioBuffer, sizeof(short), fileSize, file); fclose(file); } else diff --git a/orkaudio/audiocaptureplugins/generator/Makefile.am b/orkaudio/audiocaptureplugins/generator/Makefile.am index 44624f8..0cf4ae5 100644 --- a/orkaudio/audiocaptureplugins/generator/Makefile.am +++ b/orkaudio/audiocaptureplugins/generator/Makefile.am @@ -1,10 +1,11 @@ METASOURCES = AUTO -lib_LTLIBRARIES = libgenerator.la +plugindir = @ORKAUDIO_PLUGINS_DIR@ +plugin_LTLIBRARIES = libgenerator.la libgenerator_la_SOURCES = GeneratorConfig.cpp Generator.cpp \ - AudioCapturePluginCommon.cpp -libgenerator_la_LDFLAGS = -module + AudioCapturePluginCommon.cpp GeneratorConfig.h +libgenerator_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -D_REENTRANT -libgenerator_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase -INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common +libgenerator_la_LIBADD = $(ORKBASE_LIBS) -lxerces-c -llog4cxx +INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS) -I$(srcdir)/../common AudioCapturePluginCommon.cpp: - ln -s ../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp + ln -s $(srcdir)/../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp diff --git a/orkaudio/audiocaptureplugins/voip/Iax2Session.cpp b/orkaudio/audiocaptureplugins/voip/Iax2Session.cpp index 5df6011..8721e34 100644 --- a/orkaudio/audiocaptureplugins/voip/Iax2Session.cpp +++ b/orkaudio/audiocaptureplugins/voip/Iax2Session.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning +//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning #define _WINSOCKAPI_ // prevents the inclusion of winsock.h #include "Utils.h" diff --git a/orkaudio/audiocaptureplugins/voip/Makefile.am b/orkaudio/audiocaptureplugins/voip/Makefile.am index a415ade..3fe1e6c 100644 --- a/orkaudio/audiocaptureplugins/voip/Makefile.am +++ b/orkaudio/audiocaptureplugins/voip/Makefile.am @@ -1,10 +1,13 @@ -METASOURCES = AUTO -lib_LTLIBRARIES = libvoip.la -libvoip_la_SOURCES = VoIpConfig.cpp VoIp.cpp Rtp.cpp Iax2Session.cpp RtpSession.cpp \ - SipTcp.cpp AudioCapturePluginCommon.cpp PacketHeaderDefs.cpp -libvoip_la_LDFLAGS = -module -AM_CPPFLAGS = -D_REENTRANT -libvoip_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase -lpcap -INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common +METASOURCES = AUTO +plugindir = @ORKAUDIO_PLUGINS_DIR@ +plugin_LTLIBRARIES = libvoip.la +libvoip_la_SOURCES = VoIpConfig.cpp VoIp.cpp Rtp.cpp Iax2Session.cpp RtpSession.cpp \ + SipTcp.cpp AudioCapturePluginCommon.cpp PacketHeaderDefs.cpp \ + Iax2Session.h PacketHeaderDefs.h Rtp.h RtpSession.h SipTcp.h VoIpConfig.h +libvoip_la_LDFLAGS = -module -avoid-version +AM_CPPFLAGS = -D_REENTRANT +libvoip_la_LIBADD = $(ORKBASE_LIBS) -lxerces-c -llog4cxx -lpcap + +INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS) -I$(srcdir)/../common AudioCapturePluginCommon.cpp: - ln -s ../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp + ln -s $(srcdir)/../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp diff --git a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h index cf88d90..24043bb 100644 --- a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h +++ b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h @@ -15,7 +15,7 @@ #ifndef __PACKETHEADERDEFS_H__ #define __PACKETHEADERDEFS_H__ -#pragma warning( disable: 4200 ) // disables warning C4200: nonstandard extension used : zero-sized array in struct/union +//#pragma warning( disable: 4200 ) // disables warning C4200: nonstandard extension used : zero-sized array in struct/union #include "ace/OS_NS_arpa_inet.h" #include "StdString.h" diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp index ceda5f7..4a9c39e 100644 --- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp +++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning +//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning #define _WINSOCKAPI_ // prevents the inclusion of winsock.h #include "Utils.h" diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp index 2ee0b95..ae174dc 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning +//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning #define _WINSOCKAPI_ // prevents the inclusion of winsock.h #ifndef WIN32 |