diff options
| -rw-r--r-- | orkaudio/BatchProcessing.cpp | 3 | ||||
| -rw-r--r-- | orkaudio/Makefile.am | 17 | ||||
| -rw-r--r-- | orkaudio/OrkAudio.cpp | 10 | ||||
| -rw-r--r-- | orkaudio/Reporting.cpp | 3 | ||||
| -rw-r--r-- | orkaudio/configure.in | 4 | ||||
| -rw-r--r-- | orkbasecxx/Makefile.am | 10 | ||||
| -rw-r--r-- | orkbasecxx/TapeProcessor.h | 4 | ||||
| -rw-r--r-- | orkbasecxx/configure.in | 4 | ||||
| -rw-r--r-- | orkbasecxx/messages/Makefile.am | 5 |
9 files changed, 36 insertions, 24 deletions
diff --git a/orkaudio/BatchProcessing.cpp b/orkaudio/BatchProcessing.cpp index efad036..0b8a8c9 100644 --- a/orkaudio/BatchProcessing.cpp +++ b/orkaudio/BatchProcessing.cpp @@ -71,7 +71,8 @@ void BatchProcessing::ThreadHandler(void *args) { CStdString debug; - TapeProcessorRef batchProcessing = TapeProcessorRegistry::instance()->GetNewTapeProcessor(CStdString("BatchProcessing")); + CStdString processorName("BatchProcessing"); + TapeProcessorRef batchProcessing = TapeProcessorRegistry::instance()->GetNewTapeProcessor(processorName); if(batchProcessing.get() == NULL) { LOG4CXX_ERROR(LOG.batchProcessingLog, "Could not instanciate BatchProcessing"); diff --git a/orkaudio/Makefile.am b/orkaudio/Makefile.am index dbd804a..3d3894f 100644 --- a/orkaudio/Makefile.am +++ b/orkaudio/Makefile.am @@ -6,16 +6,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 sbin_PROGRAMS = orkaudio orkaudio_LDADD = orkaudio_LDFLAGS = -lsndfile -lACE -lxerces-c -llog4cxx -lorkbase -orkaudio_SOURCES = OrkAudio.cpp AudioTape.cpp \ - BatchProcessing.cpp CapturePluginProxy.cpp \ - CapturePort.cpp Config.cpp ConfigManager.cpp \ - Daemon.cpp ImmediateProcessing.cpp LogManager.cpp \ - MultiThreadedServer.cpp Reporting.cpp +orkaudio_SOURCES = OrkAudio.cpp \ + BatchProcessing.cpp \ + CapturePluginProxy.cpp \ + CapturePort.cpp \ + Daemon.cpp \ + ImmediateProcessing.cpp \ + Reporting.cpp AM_CPPFLAGS = -D_REENTRANT INCLUDES = -I@top_srcdir@ -I../orkbasecxx -SUBDIRS = audiocaptureplugins messages audiofile filters -orkaudio_LDADD = $(top_builddir)/messages/libmessages.la \ - $(top_builddir)/audiofile/libaudiofile.la +SUBDIRS = audiocaptureplugins filters +#orkaudio_LDADD = $(top_builddir)/messages/libmessages.la orkaudioconfdir = /etc/orkaudio orkaudioconf_DATA = \ diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp index 60a3a2b..c27cbbb 100644 --- a/orkaudio/OrkAudio.cpp +++ b/orkaudio/OrkAudio.cpp @@ -140,8 +140,10 @@ void Transcode(CStdString &file) // Transmit the tape to the BatchProcessing - TapeProcessorRef bp = TapeProcessorRegistry::instance()->GetNewTapeProcessor(CStdString("BatchProcessing")); - AudioTapeRef tape(new AudioTape(CStdString("SinglePort"), file)); + CStdString ProcessorName("BatchProcessing"); + TapeProcessorRef bp = TapeProcessorRegistry::instance()->GetNewTapeProcessor(ProcessorName); + CStdString portName("SinglePort"); + AudioTapeRef tape(new AudioTape(portName, file)); bp->AddAudioTape(tape); // Make sure it stops after processing @@ -176,8 +178,8 @@ void MainThread() ObjectFactorySingleton::instance()->RegisterObject(objRef); objRef.reset(new CaptureMsg); ObjectFactorySingleton::instance()->RegisterObject(objRef); - objRef.reset(new TestMsg); - ObjectFactorySingleton::instance()->RegisterObject(objRef); + //objRef.reset(new TestMsg); + //ObjectFactorySingleton::instance()->RegisterObject(objRef); ConfigManager::Instance()->Initialize(); diff --git a/orkaudio/Reporting.cpp b/orkaudio/Reporting.cpp index 5d2f7ec..48f3675 100644 --- a/orkaudio/Reporting.cpp +++ b/orkaudio/Reporting.cpp @@ -73,7 +73,8 @@ void Reporting::AddAudioTape(AudioTapeRef& audioTapeRef) void Reporting::ThreadHandler(void *args) { - TapeProcessorRef reporting = TapeProcessorRegistry::instance()->GetNewTapeProcessor(CStdString("Reporting")); + CStdString processorName("Reporting"); + TapeProcessorRef reporting = TapeProcessorRegistry::instance()->GetNewTapeProcessor(processorName); if(reporting.get() == NULL) { LOG4CXX_ERROR(LOG.reportingLog, "Could not instanciate Reporting"); diff --git a/orkaudio/configure.in b/orkaudio/configure.in index 45deca6..e4cc615 100644 --- a/orkaudio/configure.in +++ b/orkaudio/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(orkaudio, 0.5) +AM_INIT_AUTOMAKE(orkaudio, 0.6) AC_LANG_CPLUSPLUS AC_PROG_CXX @@ -9,4 +9,4 @@ AM_PROG_LIBTOOL AC_PREFIX_DEFAULT(/usr) -AC_OUTPUT(Makefile messages/Makefile audiofile/Makefile audiocaptureplugins/Makefile audiocaptureplugins/generator/Makefile audiocaptureplugins/voip/Makefile filters/Makefile filters/rtpmixer/Makefile) +AC_OUTPUT(Makefile audiocaptureplugins/Makefile audiocaptureplugins/generator/Makefile audiocaptureplugins/voip/Makefile filters/Makefile filters/rtpmixer/Makefile) diff --git a/orkbasecxx/Makefile.am b/orkbasecxx/Makefile.am index 0e8bed6..586b48b 100644 --- a/orkbasecxx/Makefile.am +++ b/orkbasecxx/Makefile.am @@ -7,9 +7,13 @@ 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 + OrkClient.cpp AudioCapture.cpp Utils.cpp \ + AudioTape.cpp \ + Config.cpp ConfigManager.cpp LogManager.cpp \ + MultiThreadedServer.cpp TapeProcessor.cpp #INCLUDES = -I/projects/ext/xmlrpc++/xmlrpc++0.7/src -SUBDIRS = messages serializers +SUBDIRS = messages serializers audiofile liborkbase_la_LIBADD = $(top_builddir)/serializers/libserializers.la \ - $(top_builddir)/messages/libmessages.la + $(top_builddir)/messages/libmessages.la \ + $(top_builddir)/audiofile/libaudiofile.la AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/TapeProcessor.h b/orkbasecxx/TapeProcessor.h index a177480..54f5eca 100644 --- a/orkbasecxx/TapeProcessor.h +++ b/orkbasecxx/TapeProcessor.h @@ -65,4 +65,6 @@ private: TapeProcessorRef m_firstTapeProcessor;
};
-#endif
\ No newline at end of file +#endif
+
+
diff --git a/orkbasecxx/configure.in b/orkbasecxx/configure.in index 6cc6be3..1c87c5b 100644 --- a/orkbasecxx/configure.in +++ b/orkbasecxx/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(orkbase, 0.5) +AM_INIT_AUTOMAKE(orkbase, 0.6) AC_PREFIX_DEFAULT(/usr) @@ -9,4 +9,4 @@ AC_LANG_CPLUSPLUS AC_PROG_CXX AM_PROG_LIBTOOL -AC_OUTPUT(Makefile messages/Makefile serializers/Makefile) +AC_OUTPUT(Makefile messages/Makefile serializers/Makefile audiofile/Makefile) diff --git a/orkbasecxx/messages/Makefile.am b/orkbasecxx/messages/Makefile.am index 0465da7..aba1c8e 100644 --- a/orkbasecxx/messages/Makefile.am +++ b/orkbasecxx/messages/Makefile.am @@ -1,7 +1,8 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libmessages.la -libmessages_la_SOURCES = AsyncMessage.cpp AsyncMessage.h Message.cpp Message.h\ - SyncMessage.cpp SyncMessage.h +libmessages_la_SOURCES = AsyncMessage.cpp Message.cpp \ + SyncMessage.cpp CaptureMsg.cpp DeleteTapeMsg.cpp \ + PingMsg.cpp TapeMsg.cpp #libmessages_la_LIBADD = -L/projects/ext/xmlrpc++/xmlrpc++0.7/ -lXmlRpc INCLUDES = -I@top_srcdir@ |