diff options
55 files changed, 427 insertions, 142 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e4b092d --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +*.o +*.lo +*.la +Makefile +Makefile.in +.libs +.deps +tags +orkaudio +aclocal.m4 +autom4te.cache/ +autotools/ +config.h +config.h.in +config.log +config.status +configure +libtool +stamp-h1 +orkbase-1.0.pc +orkbase-1.0.tar.gz +orkaudio-1.0.tar.gz +# Symlinks to ../common: +orkaudio/audiocaptureplugins/generator/AudioCapturePluginCommon.cpp +orkaudio/audiocaptureplugins/voip/AudioCapturePluginCommon.cpp diff --git a/BUILD_C++.txt b/BUILD_C++.txt index 9bac145..d942b24 100644 --- a/BUILD_C++.txt +++ b/BUILD_C++.txt @@ -11,9 +11,10 @@ or download sources tarballs from the listed websites. * log4cxx 0.9.7 - It is important to use this precise version for now http://logging.apache.org/log4cxx/ + (Not to be confused with log4cpp) * ACE 5.4.2 http://www.cs.wustl.edu/~schmidt/ACE.html -* libpcap 0.7.2 (only needed if you want to do VoIP recording) +* libpcap (only needed if you want to do VoIP recording) http://www.tcpdump.org/ * boost 1.31.0 http://www.boost.org @@ -36,6 +37,15 @@ Redhat/Centos specific Debian/Ubuntu specific +On Debian Lenny: +aptitude install \ + automake libtool libace-dev libboost-dev liblog4cxx9-dev \ + libpcap-dev libxerces-c2-dev libsndfile1-dev + +FIXME: portaudio v18 no longer available. Make it build with v19. + +Older versions: + * apt-get install libace-dev * apt-get install libboost-dev * apt-get install liblog4cpp-dev @@ -46,9 +56,7 @@ Debian/Ubuntu specific Build orkbasecxx on the command line: * Go to the root directory of the orkbasecxx -* libtoolize --force -* automake -a -* make -f Makefile.cvs +* autoreconf -i * ./configure * make * make install @@ -56,9 +64,7 @@ Build orkbasecxx on the command line: Build orkaudio on the command line: * Go to the root directory of the orkaudio -* libtoolize --force -* automake -a -* make -f Makefile.cvs +* autoreconf -i * ./configure * make * make install @@ -81,4 +87,4 @@ Build on Windows/MSVC6 (SP6) * Select orkbase as active project, build * Select orkaudio as active project, build * Select rtpmixer as active project, build -* Select desired capture plugin, build
\ No newline at end of file +* Select desired capture plugin, build diff --git a/orkaudio/Makefile.am b/orkaudio/Makefile.am index c475d4c..aa8fe77 100644 --- a/orkaudio/Makefile.am +++ b/orkaudio/Makefile.am @@ -3,23 +3,24 @@ AUTOMAKE_OPTIONS = foreign 1.4 -sbin_PROGRAMS = orkaudio -orkaudio_LDADD = -orkaudio_LDFLAGS = -lACE -lxerces-c -llog4cxx -lorkbase -lsndfile -orkaudio_SOURCES = OrkAudio.cpp -AM_CPPFLAGS = -D_REENTRANT -INCLUDES = -I@top_srcdir@ -I../orkbasecxx -I../orkbasecxx/filters/gsm -I../orkbasecxx/filters/gsm/gsm610 -I../orkbasecxx/filters/ilbc -I../orkbasecxx/filters/ilbc/ilbc -I../orkbasecxx/filters/audiogain -I../orkbasecxx/filters/g722codec -SUBDIRS = audiocaptureplugins filters +sbin_PROGRAMS = orkaudio +orkaudio_LDADD = +orkaudio_LDFLAGS = $(ORKBASE_LIBS) -lxerces-c -llog4cxx -lsndfile +orkaudio_SOURCES = OrkAudio.cpp OrkAudio.h App.h +AM_CPPFLAGS = -D_REENTRANT -I$(top_srcdir) $(ORKBASE_CFLAGS) +SUBDIRS = audiocaptureplugins filters +#DIST_SUBDIRS = messages #orkaudio_LDADD = $(top_builddir)/messages/libmessages.la -orkaudioconfdir = /etc/orkaudio +orkaudioconfdir = $(sysconfdir)/orkaudio orkaudioconf_DATA = \ logging-linux-template.properties \ config-linux-template.xml -install-orkaudioconfDATA: - mkdir -p /etc/orkaudio - cp logging-linux-template.properties /etc/orkaudio/logging.properties - cp config-linux-template.xml /etc/orkaudio/config.xml - mkdir -p /var/log/orkaudio +EXTRA_DIST = $(orkaudioconf_DATA) + +orkaudiologdir = /var/log/orkaudio + +install-exec-hook: + mkdir -p $(DESTDIR)/$(orkaudiologdir) 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 diff --git a/orkaudio/configure.ac b/orkaudio/configure.ac new file mode 100644 index 0000000..4925a03 --- /dev/null +++ b/orkaudio/configure.ac @@ -0,0 +1,54 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.61]) +AC_INIT([orkaudio], [1.0], [oreka@orex.com]) +AC_CONFIG_SRCDIR([OrkAudio.cpp]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_AUX_DIR([autotools]) +AM_INIT_AUTOMAKE + +AC_PREFIX_DEFAULT([/usr]) + +# Checks for programs. +AC_PROG_CXX +AC_PROG_CC +AC_PROG_LN_S +AC_PROG_LIBTOOL + +# Checks for libraries. +PKG_CHECK_MODULES([ORKBASE], [orkbase-1.0]) +# FIXME: Replace `main' with a function in `-lACE': +AC_CHECK_LIB([ACE], [main]) +# FIXME: Replace `main' with a function in `-llog4cxx': +AC_CHECK_LIB([log4cxx], [main]) +# FIXME: Replace `main' with a function in `-lpcap': +AC_CHECK_LIB([pcap], [main]) +# FIXME: Replace `main' with a function in `-lsndfile': +AC_CHECK_LIB([sndfile], [main]) + +# Checks for header files. + +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STDBOOL +AC_C_INLINE +AC_TYPE_SIZE_T + +# Checks for library functions. +AC_FUNC_ERROR_AT_LINE +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_CHECK_FUNCS([gettimeofday localtime_r memchr memset strchr strncasecmp strstr]) + +AC_CONFIG_FILES([Makefile + audiocaptureplugins/Makefile + audiocaptureplugins/generator/Makefile + audiocaptureplugins/voip/Makefile + filters/Makefile + filters/rtpmixer/Makefile + ]) + +ORKAUDIO_PLUGINS_DIR=${libdir}/orkaudio/plugins +AC_SUBST(ORKAUDIO_PLUGINS_DIR) + +AC_OUTPUT diff --git a/orkaudio/configure.in b/orkaudio/configure.in deleted file mode 100644 index ab8d145..0000000 --- a/orkaudio/configure.in +++ /dev/null @@ -1,12 +0,0 @@ -AC_INIT(configure.in) - -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(orkaudio, 1.0) - -AC_LANG_CPLUSPLUS -AC_PROG_CXX -AM_PROG_LIBTOOL - -AC_PREFIX_DEFAULT(/usr) - -AC_OUTPUT(Makefile audiocaptureplugins/Makefile audiocaptureplugins/generator/Makefile audiocaptureplugins/voip/Makefile filters/Makefile filters/rtpmixer/Makefile) diff --git a/orkaudio/filters/rtpmixer/Makefile.am b/orkaudio/filters/rtpmixer/Makefile.am index a5dffcc..e797c9b 100644 --- a/orkaudio/filters/rtpmixer/Makefile.am +++ b/orkaudio/filters/rtpmixer/Makefile.am @@ -1,10 +1,9 @@ METASOURCES = AUTO -plugindir= $(prefix)/lib/orkaudio/plugins +plugindir = @ORKAUDIO_PLUGINS_DIR@ plugin_LTLIBRARIES = librtpmixer.la librtpmixer_la_SOURCES = RtpMixer.cpp -librtpmixer_la_LDFLAGS = -module +librtpmixer_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -D_REENTRANT -librtpmixer_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase -INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common -all-local: librtpmixer.la - cp .libs/librtpmixer.so.0.0.0 ../../plugins/librtpmixer.so +librtpmixer_la_LIBADD = $(ORKBASE_LIBS) -lxerces-c -llog4cxx + +INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS) -I../common diff --git a/orkaudio/filters/rtpmixer/RtpMixer.cpp b/orkaudio/filters/rtpmixer/RtpMixer.cpp index f3e4216..7601f8f 100644 --- a/orkaudio/filters/rtpmixer/RtpMixer.cpp +++ b/orkaudio/filters/rtpmixer/RtpMixer.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h diff --git a/orkaudio/messages/Makefile.am b/orkaudio/messages/Makefile.am index f6c5305..e3c2225 100644 --- a/orkaudio/messages/Makefile.am +++ b/orkaudio/messages/Makefile.am @@ -3,5 +3,5 @@ noinst_LTLIBRARIES = libmessages.la libmessages_la_SOURCES = CaptureMsg.cpp DeleteTapeMsg.cpp PingMsg.cpp \ TapeMsg.cpp TestMsg.cpp RecordMsg.cpp AM_CPPFLAGS = -D_REENTRANT -libmessages_la_LIBADD = -L../../orkbasecxx/ -lorkbase -INCLUDES = -I@top_srcdir@ -I../../orkbasecxx +libmessages_la_LIBADD = $(ORKBASE_LIBS) +INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS) diff --git a/orkaudio/orkaudio.8 b/orkaudio/orkaudio.8 new file mode 100644 index 0000000..77fe0c4 --- /dev/null +++ b/orkaudio/orkaudio.8 @@ -0,0 +1,96 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH ORKAUDIO 8 "2009-09-07" +.SH NAME +orkaudio \- audio recording server of Oreka +.SH SYNOPSIS +.B orkaudio [ debug ] + +.B orkaudio transcode +.RI file.mcf + +.SH DESCRIPTION +.B orkaudio +in the first form runs the recording daemon of the Oreka recording server. + +If the option +.B debug +is provided it will not detach from the cosole and will run in debug mode. +In any case it remains in the current working directory. + +With the option +.B transcode +it will transcode a recording file (FILL IN DOCUMENTATION). + +A deamon listens on the followin ports: + +.B 59130 +.RS +A command-line interface (WHAT COMMANDS?) +.RE + +.B 59140 +.RS +A http server (that servers what exactly?) +.RE + +.B 59150 +.RS +Event streaming server (WHICH IS?) +.RE + +.SH OPTIONS +See above. + +.SH FILES +The +.B orkaudio +daemon uses configuration files from +.B /etc/orkaudio +but will look under a different directory if the environment variable +.B ORKAUDIO_CONFIG_PATH +is set. + +Before attempting to look for the files there it will try a name +specified by some environment variable as well as for the same variable +in the working directory. + +.B config.xml +.RS +The main configuration file. +.RE + +.B localpartymap.csv +.RS +.I [Fill in what this file does]. +Note that even if ORKAUDIO_CONFIG_PATH is set, this file will not be +looked for there. +.RE + +.B logging.properties +.RS +Logging settings, if the format used by log4cpp. +.RE + +Logs and audio files are saved under +.B /var/log/orkaudio +but may reside elsewhere if the environment variable +.B ORKAUDIO_LOGGING_PATH +is set. + + +.SH BUGS +No support for reloading configuration by e.g. SIGHUP. +I recon there are a few. Bugs are to be reported to +.I [TODO: please fill in] + +.SH SEE ALSO +http://oreka.sourceforge.org/ + +.SH AUTHOR +Orkaudio was written by orecx LLC (RIGHT?). +.PP +This manual page was written by Tzafrir Cohen <tzafrir.cohen@xorcom.com>, +for the Debian project (but may be used by others). diff --git a/orkbasecxx/AudioTape.cpp b/orkbasecxx/AudioTape.cpp index d4b5f81..862a35b 100644 --- a/orkbasecxx/AudioTape.cpp +++ b/orkbasecxx/AudioTape.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h @@ -380,6 +380,7 @@ void AudioTape::AddCaptureEvent(CaptureEventRef eventRef, bool send) m_onDemand = true; } break; + default: break; // FIXME: What happens with different possible values? } { diff --git a/orkbasecxx/BatchProcessing.cpp b/orkbasecxx/BatchProcessing.cpp index 81746af..6bc1464 100644 --- a/orkbasecxx/BatchProcessing.cpp +++ b/orkbasecxx/BatchProcessing.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h diff --git a/orkbasecxx/CapturePort.h b/orkbasecxx/CapturePort.h index 3b72f6f..3244c5d 100644 --- a/orkbasecxx/CapturePort.h +++ b/orkbasecxx/CapturePort.h @@ -11,7 +11,7 @@ * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #ifndef __PORT_H__ #define __PORT_H__ diff --git a/orkbasecxx/ConfigManager.cpp b/orkbasecxx/ConfigManager.cpp index 1dff7d8..4793058 100644 --- a/orkbasecxx/ConfigManager.cpp +++ b/orkbasecxx/ConfigManager.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 @@ -49,7 +49,7 @@ void ConfigManager::Initialize() try { char* cfgFilename = NULL; - char* cfgEnvPath = ""; + const char* cfgEnvPath = ""; int cfgAlloc = 0; cfgEnvPath = ACE_OS::getenv("ORKAUDIO_CONFIG_PATH"); diff --git a/orkbasecxx/EventStreaming.cpp b/orkbasecxx/EventStreaming.cpp index 4074e14..58880ef 100644 --- a/orkbasecxx/EventStreaming.cpp +++ b/orkbasecxx/EventStreaming.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
diff --git a/orkbasecxx/Filter.cpp b/orkbasecxx/Filter.cpp index df25c1d..0f85570 100644 --- a/orkbasecxx/Filter.cpp +++ b/orkbasecxx/Filter.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 #include "Filter.h" extern "C" @@ -243,4 +243,4 @@ void UlawToPcmFilter::CaptureEventIn(CaptureEventRef& event) void UlawToPcmFilter::CaptureEventOut(CaptureEventRef& event) { ; -}
\ No newline at end of file +} diff --git a/orkbasecxx/ImmediateProcessing.cpp b/orkbasecxx/ImmediateProcessing.cpp index 3f2c58a..dcd166d 100644 --- a/orkbasecxx/ImmediateProcessing.cpp +++ b/orkbasecxx/ImmediateProcessing.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h diff --git a/orkbasecxx/LogManager.cpp b/orkbasecxx/LogManager.cpp index f058429..552d1eb 100644 --- a/orkbasecxx/LogManager.cpp +++ b/orkbasecxx/LogManager.cpp @@ -31,7 +31,7 @@ void OrkLogManager::Initialize() BasicConfigurator::configure(); char* logCfgFilename = NULL; - char* cfgEnvPath = ""; + const char* cfgEnvPath = ""; int cfgAlloc = 0; cfgEnvPath = ACE_OS::getenv("ORKAUDIO_CONFIG_PATH"); diff --git a/orkbasecxx/Makefile.am b/orkbasecxx/Makefile.am index 8849d23..4a6d8e9 100644 --- a/orkbasecxx/Makefile.am +++ b/orkbasecxx/Makefile.am @@ -2,10 +2,12 @@ # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign 1.4 +SUBDIRS = messages serializers audiofile filters -lib_LTLIBRARIES = liborkbase.la -liborkbase_la_LDFLAGS = -liborkbase_la_SOURCES = Filter.cpp g711.c \ +lib_LTLIBRARIES = liborkbase.la +liborkbase_la_LDFLAGS = +liborkbase_la_SOURCES = \ + Filter.cpp g711.c \ OrkBase.cpp Object.cpp ObjectFactory.cpp \ OrkClient.cpp AudioCapture.cpp Utils.cpp \ AudioTape.cpp \ @@ -16,10 +18,44 @@ liborkbase_la_SOURCES = Filter.cpp g711.c \ Daemon.cpp ImmediateProcessing.cpp \ Reporting.cpp TapeFileNaming.cpp \ PartyFilter.cpp EventStreaming.cpp \ - OrkTrack.cpp -#INCLUDES = -I/projects/ext/xmlrpc++/xmlrpc++0.7/src -SUBDIRS = messages serializers audiofile filters -liborkbase_la_LIBADD = $(top_builddir)/serializers/libserializers.la \ + OrkTrack.cpp \ + AudioCapture.h AudioCapturePlugin.h \ + BatchProcessing.h \ + CapturePluginProxy.h CapturePort.h \ + Config.h ConfigManager.h Daemon.h \ + EventStreaming.h Filter.h ImmediateProcessing.h \ + LogManager.h MultiThreadedServer.h \ + Object.h ObjectFactory.h OrkBase.h \ + OrkClient.h PartyFilter.h Reporting.h \ + TapeFileNaming.h TapeProcessor.h \ + Utils.h config.h OrkTrack.h + +nobase_pkginclude_HEADERS = \ + audiofile/AudioFile.h \ + filters/audiogain/AudioGain.h \ + messages/TapeMsg.h messages/PingMsg.h messages/DeleteTapeMsg.h \ + messages/CaptureMsg.h messages/TestMsg.h messages/RecordMsg.h \ + messages/SyncMessage.h messages/AsyncMessage.h \ + messages/Message.h messages/InitMsg.h \ + serializers/Serializer.h +pkginclude_HEADERS = \ + AudioCapture.h Config.h MultiThreadedServer.h Object.h OrkBase.h \ + g711.h MemUtils.h dll.h Utils.h \ + OrkTrack.h OrkClient.h \ + LogManager.h ImmediateProcessing.h BatchProcessing.h Reporting.h \ + TapeFileNaming.h ConfigManager.h Daemon.h ObjectFactory.h \ + CapturePluginProxy.h AudioCapturePlugin.h Filter.h \ + TapeProcessor.h EventStreaming.h \ + StdString.h ThreadSafeQueue.h AudioTape.h \ + filters/ilbc/IlbcFilters.h \ + filters/ilbc/ilbc/iLBC_decode.h \ + filters/ilbc/ilbc/iLBC_encode.h \ + filters/ilbc/ilbc/iLBC_define.h \ + filters/gsm/GsmFilters.h filters/gsm/gsm610/gsm.h \ + filters/g722codec/G722.h filters/g722codec/G722Codec.h + +liborkbase_la_LIBADD = \ + $(top_builddir)/serializers/libserializers.la \ $(top_builddir)/messages/libmessages.la \ $(top_builddir)/audiofile/libaudiofile.la \ $(top_builddir)/filters/gsm/libgsm.la \ @@ -30,4 +66,6 @@ liborkbase_la_LIBADD = $(top_builddir)/serializers/libserializers.la \ $(top_builddir)/filters/g722codec/libg722codec.la -lm -AM_CXXFLAGS = -D_REENTRANT +AM_CXXFLAGS = -D_REENTRANT +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = orkbase-1.0.pc diff --git a/orkbasecxx/ObjectFactory.cpp b/orkbasecxx/ObjectFactory.cpp index 724bbfd..d89fa34 100644 --- a/orkbasecxx/ObjectFactory.cpp +++ b/orkbasecxx/ObjectFactory.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h diff --git a/orkbasecxx/PartyFilter.cpp b/orkbasecxx/PartyFilter.cpp index 57fa0d5..30b211e 100644 --- a/orkbasecxx/PartyFilter.cpp +++ b/orkbasecxx/PartyFilter.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h diff --git a/orkbasecxx/Reporting.cpp b/orkbasecxx/Reporting.cpp index 30243e6..802b8ef 100644 --- a/orkbasecxx/Reporting.cpp +++ b/orkbasecxx/Reporting.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h diff --git a/orkbasecxx/StdString.h b/orkbasecxx/StdString.h index 0f3896c..6271022 100644 --- a/orkbasecxx/StdString.h +++ b/orkbasecxx/StdString.h @@ -647,7 +647,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2) #endif // #ifdef SS_ANSI #ifndef UNUSED - #define UNUSED(x) x + #define UNUSED(x) #endif #endif // #ifndef W32BASE_H @@ -1311,15 +1311,14 @@ inline void ssasn(std::string& sDst, const std::wstring& sSrc) #endif sDst.resize(nDst+1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()), nDst, sSrc.c_str(), static_cast<int>(sSrc.size())); // In MBCS builds, we don't know how long the destination string will be. -#ifdef SS_MBCS sDst.resize(sslen(szCvt)); #else - szCvt; sDst.resize(sSrc.size()); #endif } @@ -1340,16 +1339,15 @@ inline void ssasn(std::string& sDst, PCWSTR pW) #endif sDst.resize(nDst + 1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()), nDst, pW, nSrc); // In MBCS builds, we don't know how long the destination string will be. -#ifdef SS_MBCS sDst.resize(sslen(szCvt)); #else sDst.resize(nDst); - szCvt; #endif } else @@ -1462,14 +1460,13 @@ inline void ssadd(std::string& sDst, const std::wstring& sSrc) #endif sDst.resize(nDst+nAdd+1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()+nDst), nAdd, sSrc.c_str(), nSrc); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nAdd); - szCvt; #endif } } @@ -1490,14 +1487,13 @@ inline void ssadd(std::string& sDst, PCWSTR pW) #endif sDst.resize(nDst + nAdd + 1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()+nDst), nAdd, pW, nSrc); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nSrc); - szCvt; #endif } } @@ -1535,14 +1531,13 @@ inline void ssadd(std::wstring& sDst, const std::string& sSrc) int nDst = static_cast<int>(sDst.size()); sDst.resize(nDst + nSrc + 1); +#ifdef SS_MBCS PCWSTR szCvt = StdCodeCvt(const_cast<SW_PTRTYPE>(sDst.data()+nDst), nSrc, sSrc.c_str(), nSrc+1); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nSrc); - szCvt; #endif } } @@ -1555,14 +1550,13 @@ inline void ssadd(std::wstring& sDst, PCSTR pA) int nDst = static_cast<int>(sDst.size()); sDst.resize(nDst + nSrc + 1); +#ifdef SS_MBCS PCWSTR szCvt = StdCodeCvt(const_cast<SW_PTRTYPE>(sDst.data()+nDst), nSrc, pA, nSrc+1); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nSrc); - szCvt; #endif } } diff --git a/orkbasecxx/TapeFileNaming.cpp b/orkbasecxx/TapeFileNaming.cpp index cb9e296..0d2841a 100644 --- a/orkbasecxx/TapeFileNaming.cpp +++ b/orkbasecxx/TapeFileNaming.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #define _WINSOCKAPI_ // prevents the inclusion of winsock.h diff --git a/orkbasecxx/TapeProcessor.cpp b/orkbasecxx/TapeProcessor.cpp index 76c94cf..1b59fed 100644 --- a/orkbasecxx/TapeProcessor.cpp +++ b/orkbasecxx/TapeProcessor.cpp @@ -11,7 +11,7 @@ *
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/audiofile/Makefile.am b/orkbasecxx/audiofile/Makefile.am index d737e11..c6650b3 100644 --- a/orkbasecxx/audiofile/Makefile.am +++ b/orkbasecxx/audiofile/Makefile.am @@ -1,6 +1,10 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libaudiofile.la -libaudiofile_la_SOURCES = MediaChunkFile.cpp AudioFile.cpp LibSndFileFile.cpp PcmFile.cpp +libaudiofile_la_SOURCES = \ + MediaChunkFile.cpp AudioFile.cpp \ + LibSndFileFile.cpp PcmFile.cpp \ + AudioFile.h LibSndFileFile.h \ + MediaChunkFile.h PcmFile.h AM_CPPFLAGS = -D_REENTRANT libaudiofile_la_LIBADD = -INCLUDES = -I@top_srcdir@ -I../../orkbasecxx +INCLUDES = -I$(top_srcdir) -I../../orkbasecxx diff --git a/orkbasecxx/audiofile/MediaChunkFile.cpp b/orkbasecxx/audiofile/MediaChunkFile.cpp index 1e9d6a3..ebb1822 100644 --- a/orkbasecxx/audiofile/MediaChunkFile.cpp +++ b/orkbasecxx/audiofile/MediaChunkFile.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 #include "ConfigManager.h" #include "MediaChunkFile.h" diff --git a/orkbasecxx/configure.ac b/orkbasecxx/configure.ac new file mode 100644 index 0000000..f5a14e0 --- /dev/null +++ b/orkbasecxx/configure.ac @@ -0,0 +1,60 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.61]) +AC_INIT([orkbase], [1.0], [oreka@orex.com]) +AC_CONFIG_SRCDIR([LogManager.cpp]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_AUX_DIR([autotools]) +AM_INIT_AUTOMAKE + +AC_PREFIX_DEFAULT([/usr]) + +# Checks for programs. +AC_PROG_CXX +AC_PROG_AWK +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AC_PROG_RANLIB +AC_PROG_LIBTOOL + +# Checks for libraries. +AC_CHECK_LIB([m], [cos]) + +# Checks for header files. +AC_CHECK_HEADERS([inttypes.h malloc.h memory.h stdlib.h string.h wchar.h wctype.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STDBOOL +AC_C_INLINE +AC_TYPE_INT16_T +AC_TYPE_INT32_T +AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T +AC_TYPE_UINT8_T + +# Checks for library functions. +AC_FUNC_ALLOCA +AC_FUNC_CHOWN +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_FUNC_MALLOC +AC_FUNC_STRTOD +AC_CHECK_FUNCS([gethrtime localtime_r memchr memmove memset mkdir pow sqrt strchr strerror strncasecmp strstr strtol strtoul]) + +AC_CONFIG_FILES([Makefile + audiofile/Makefile + filters/Makefile + filters/audiogain/Makefile + filters/g722codec/Makefile + filters/gsm/Makefile + filters/gsm/gsm610/Makefile + filters/ilbc/Makefile + filters/ilbc/ilbc/Makefile + messages/Makefile + serializers/Makefile + orkbase-1.0.pc]) +AC_OUTPUT diff --git a/orkbasecxx/configure.in b/orkbasecxx/configure.in deleted file mode 100644 index 9a510f1..0000000 --- a/orkbasecxx/configure.in +++ /dev/null @@ -1,12 +0,0 @@ -AC_INIT(configure.in) - -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(orkbase, 1.0) - -AC_PREFIX_DEFAULT(/usr) - -AC_LANG_CPLUSPLUS -AC_PROG_CXX -AM_PROG_LIBTOOL - -AC_OUTPUT(Makefile messages/Makefile serializers/Makefile audiofile/Makefile filters/Makefile filters/gsm/Makefile filters/gsm/gsm610/Makefile filters/ilbc/Makefile filters/ilbc/ilbc/Makefile filters/audiogain/Makefile filters/g722codec/Makefile) diff --git a/orkbasecxx/filters/audiogain/AudioGain.cpp b/orkbasecxx/filters/audiogain/AudioGain.cpp index 4477324..bc678e0 100644 --- a/orkbasecxx/filters/audiogain/AudioGain.cpp +++ b/orkbasecxx/filters/audiogain/AudioGain.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
diff --git a/orkbasecxx/filters/audiogain/Makefile.am b/orkbasecxx/filters/audiogain/Makefile.am index 2c377b5..2eee8e6 100644 --- a/orkbasecxx/filters/audiogain/Makefile.am +++ b/orkbasecxx/filters/audiogain/Makefile.am @@ -1,6 +1,6 @@ -METASOURCES = AUTO -noinst_LTLIBRARIES = libaudiogain.la -libaudiogain_la_SOURCES = AudioGain.cpp +METASOURCES = AUTO +noinst_LTLIBRARIES = libaudiogain.la +libaudiogain_la_SOURCES = AudioGain.cpp -INCLUDES = -I@top_srcdir@ -AM_CXXFLAGS = -D_REENTRANT +AM_CPPFLAGS = -I$(top_srcdir) +AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/filters/g722codec/G722Codec.cpp b/orkbasecxx/filters/g722codec/G722Codec.cpp index 5a59e1e..9a6bbc6 100644 --- a/orkbasecxx/filters/g722codec/G722Codec.cpp +++ b/orkbasecxx/filters/g722codec/G722Codec.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 diff --git a/orkbasecxx/filters/g722codec/Makefile.am b/orkbasecxx/filters/g722codec/Makefile.am index 9ff6ccf..9d9f66d 100644 --- a/orkbasecxx/filters/g722codec/Makefile.am +++ b/orkbasecxx/filters/g722codec/Makefile.am @@ -1,7 +1,7 @@ METASOURCES = AUTO SUBDIRS = noinst_LTLIBRARIES = libg722codec.la -libg722codec_la_SOURCES = G722Codec.cpp +libg722codec_la_SOURCES = G722Codec.cpp G722.h G722Codec.h -INCLUDES = -I@top_srcdir@ -I../.. +INCLUDES = -I$(top_srcdir) -I../.. AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/filters/gsm/GsmFilters.cpp b/orkbasecxx/filters/gsm/GsmFilters.cpp index af32571..3cc8f36 100644 --- a/orkbasecxx/filters/gsm/GsmFilters.cpp +++ b/orkbasecxx/filters/gsm/GsmFilters.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
#include "GsmFilters.h"
diff --git a/orkbasecxx/filters/gsm/Makefile.am b/orkbasecxx/filters/gsm/Makefile.am index 26be37b..03de1a3 100644 --- a/orkbasecxx/filters/gsm/Makefile.am +++ b/orkbasecxx/filters/gsm/Makefile.am @@ -1,7 +1,7 @@ METASOURCES = AUTO SUBDIRS = gsm610 noinst_LTLIBRARIES = libgsm.la -libgsm_la_SOURCES = GsmFilters.cpp +libgsm_la_SOURCES = GsmFilters.cpp GsmFilters.h -INCLUDES = -I@top_srcdir@ -I./gsm610 +INCLUDES = -I$(top_srcdir) -I$(srcdir)/gsm610 AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/filters/gsm/gsm610/Makefile.am b/orkbasecxx/filters/gsm/gsm610/Makefile.am index aba1767..6f9490f 100644 --- a/orkbasecxx/filters/gsm/gsm610/Makefile.am +++ b/orkbasecxx/filters/gsm/gsm610/Makefile.am @@ -3,7 +3,8 @@ noinst_LTLIBRARIES = libgsm610.la libgsm610_la_SOURCES = add.c code.c decode.c gsm_create.c gsm_decode.c \ gsm_destroy.c gsm_encode.c gsm_option.c \ long_term.c lpc.c preprocess.c rpe.c \ - short_term.c table.c + short_term.c table.c \ + config.h gsm.h gsm610_priv.h -INCLUDES = -I@top_srcdir@ +INCLUDES = -I$(top_srcdir) AM_CFLAGS = -D_REENTRANT diff --git a/orkbasecxx/filters/ilbc/IlbcFilters.cpp b/orkbasecxx/filters/ilbc/IlbcFilters.cpp index c6fd9b5..4986141 100644 --- a/orkbasecxx/filters/ilbc/IlbcFilters.cpp +++ b/orkbasecxx/filters/ilbc/IlbcFilters.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
diff --git a/orkbasecxx/filters/ilbc/Makefile.am b/orkbasecxx/filters/ilbc/Makefile.am index c9a8f58..43fb2da 100644 --- a/orkbasecxx/filters/ilbc/Makefile.am +++ b/orkbasecxx/filters/ilbc/Makefile.am @@ -1,7 +1,7 @@ METASOURCES = AUTO SUBDIRS = ilbc noinst_LTLIBRARIES = libilbc.la -libilbc_la_SOURCES = IlbcFilters.cpp +libilbc_la_SOURCES = IlbcFilters.cpp IlbcFilters.h -INCLUDES = -I@top_srcdir@ -I./ilbc +INCLUDES = -I$(top_srcdir) -I$(srcdir)/ilbc AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/filters/ilbc/ilbc/Makefile.am b/orkbasecxx/filters/ilbc/ilbc/Makefile.am index 3d6a240..ee34f26 100644 --- a/orkbasecxx/filters/ilbc/ilbc/Makefile.am +++ b/orkbasecxx/filters/ilbc/ilbc/Makefile.am @@ -4,7 +4,13 @@ libilbcrfc_la_SOURCES = anaFilter.c iCBSearch.c packing.c \ constants.c gainquant.c iLBC_decode.c StateConstructW.c \ createCB.c getCBvec.c iLBC_encode.c StateSearchW.c doCPLC.c \ helpfun.c syntFilter.c enhancer.c hpInput.c LPCdecode.c \ - iLBC_filter.c hpOutput.c LPCencode.c FrameClassify.c iCBConstruct.c lsf.c + iLBC_filter.c hpOutput.c LPCencode.c FrameClassify.c \ + iCBConstruct.c lsf.c \ + FrameClassify.h LPCdecode.h LPCencode.h StateConstructW.h \ + StateSearchW.h anaFilter.h constants.h createCB.h doCPLC.h \ + enhancer.h filter.h gainquant.h getCBvec.h helpfun.h hpInput.h \ + hpOutput.h iCBConstruct.h iCBSearch.h iLBC_decode.h iLBC_define.h \ + iLBC_encode.h lsf.h packing.h syntFilter.h -INCLUDES = -I@top_srcdir@ +INCLUDES = -I$(top_srcdir) AM_CFLAGS = -D_REENTRANT diff --git a/orkbasecxx/messages/InitMsg.cpp b/orkbasecxx/messages/InitMsg.cpp index f5de4a5..9137192 100644 --- a/orkbasecxx/messages/InitMsg.cpp +++ b/orkbasecxx/messages/InitMsg.cpp @@ -6,7 +6,7 @@ * http://www.orecx.com * */ -#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 diff --git a/orkbasecxx/messages/Makefile.am b/orkbasecxx/messages/Makefile.am index 7504a1c..b818636 100644 --- a/orkbasecxx/messages/Makefile.am +++ b/orkbasecxx/messages/Makefile.am @@ -2,8 +2,11 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libmessages.la libmessages_la_SOURCES = AsyncMessage.cpp Message.cpp \ SyncMessage.cpp CaptureMsg.cpp DeleteTapeMsg.cpp \ - PingMsg.cpp TapeMsg.cpp RecordMsg.cpp InitMsg.cpp + PingMsg.cpp TapeMsg.cpp RecordMsg.cpp InitMsg.cpp \ + AsyncMessage.h CaptureMsg.h DeleteTapeMsg.h \ + Message.h PingMsg.h RecordMsg.h SyncMessage.h \ + TapeMsg.h TestMsg.h InitMsg.h #libmessages_la_LIBADD = -L/projects/ext/xmlrpc++/xmlrpc++0.7/ -lXmlRpc -INCLUDES = -I@top_srcdir@ -I../../orkaudio +INCLUDES = -I$(top_srcdir) -I../../orkaudio AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/messages/Message.cpp b/orkbasecxx/messages/Message.cpp index 477bb42..d643964 100644 --- a/orkbasecxx/messages/Message.cpp +++ b/orkbasecxx/messages/Message.cpp @@ -13,7 +13,7 @@ #define _WINSOCKAPI_ // prevents the inclusion of winsock.h -#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning +//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning #include "serializers/XmlRpcSerializer.h" #include "Message.h" diff --git a/orkbasecxx/messages/Message.h b/orkbasecxx/messages/Message.h index e15fda8..cae8f73 100644 --- a/orkbasecxx/messages/Message.h +++ b/orkbasecxx/messages/Message.h @@ -14,10 +14,10 @@ #ifndef __MESSAGE_H__ #define __MESSAGE_H__ -//#ifdef WIN32 +#ifdef WIN32 #pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning #pragma warning( disable: 4018 ) // signed/unsigned mismatch -//#endif +#endif #include "dll.h" #include "OrkBase.h" diff --git a/orkbasecxx/messages/SyncMessage.h b/orkbasecxx/messages/SyncMessage.h index 0683364..9af3c34 100644 --- a/orkbasecxx/messages/SyncMessage.h +++ b/orkbasecxx/messages/SyncMessage.h @@ -11,7 +11,7 @@ * */ -#pragma warning( disable: 4786 ) +//#pragma warning( disable: 4786 ) #ifndef __SYNCMESSAGE_H__ #define __SYNCMESSAGE_H__ diff --git a/orkbasecxx/messages/TapeMsg.cpp b/orkbasecxx/messages/TapeMsg.cpp index 142e67b..0d3f07b 100644 --- a/orkbasecxx/messages/TapeMsg.cpp +++ b/orkbasecxx/messages/TapeMsg.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 diff --git a/orkbasecxx/orkbase-1.0.pc.in b/orkbasecxx/orkbase-1.0.pc.in new file mode 100644 index 0000000..c5f447a --- /dev/null +++ b/orkbasecxx/orkbase-1.0.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +pkgincludedir=${includedir}/orkbase + +Name: orkbase +Description: Base libraries for Oreka recording system +Version: @VERSION@ +URL: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk/orkbasecxx +#Requires: ACE # Don't have pkg-config support yet... +Libs: -L${libdir} -lACE -lorkbase +Cflags: -I${pkgincludedir} + diff --git a/orkbasecxx/serializers/Makefile.am b/orkbasecxx/serializers/Makefile.am index 33bd167..b0c29d6 100644 --- a/orkbasecxx/serializers/Makefile.am +++ b/orkbasecxx/serializers/Makefile.am @@ -5,6 +5,6 @@ libserializers_la_SOURCES = DomSerializer.cpp DomSerializer.h Serializer.cpp\ UrlSerializer.cpp UrlSerializer.h XmlRpcSerializer.cpp\ XmlRpcSerializer.h #libserializers_la_LIBADD = -L/projects/ext/xmlrpc++/xmlrpc++0.7/ -lXmlRpc -INCLUDES = -I@top_srcdir@ +INCLUDES = -I$(top_srcdir) AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/serializers/Serializer.h b/orkbasecxx/serializers/Serializer.h index fc60b02..023e695 100644 --- a/orkbasecxx/serializers/Serializer.h +++ b/orkbasecxx/serializers/Serializer.h @@ -14,7 +14,7 @@ #ifndef __SERIALIZER_H__ #define __SERIALIZER_H__ -#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning +//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning #include "Utils.h" #include "dll.h" |