From 7292ff65bc154760649628a3e881079140a12657 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Fri, 30 Jun 2006 19:57:46 +0000 Subject: Newly added classes coming from OrkAudio now export symbols. git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@288 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkbasecxx/OrkBase.dsp | 100 ++++++++++++++++++++++++++++++++-- orkbasecxx/TapeProcessor.h | 37 +++++++++++++ orkbasecxx/audiofile/AudioFile.h | 2 +- orkbasecxx/audiofile/LibSndFileFile.h | 2 +- orkbasecxx/audiofile/MediaChunkFile.h | 2 +- orkbasecxx/audiofile/PcmFile.h | 2 +- orkbasecxx/messages/CaptureMsg.cpp | 6 +- orkbasecxx/messages/CaptureMsg.h | 4 +- orkbasecxx/messages/DeleteTapeMsg.h | 2 +- orkbasecxx/messages/PingMsg.h | 4 +- orkbasecxx/messages/TapeMsg.h | 4 +- orkbasecxx/messages/TestMsg.h | 2 +- 12 files changed, 148 insertions(+), 19 deletions(-) create mode 100644 orkbasecxx/TapeProcessor.h diff --git a/orkbasecxx/OrkBase.dsp b/orkbasecxx/OrkBase.dsp index a3f9d61..d9dcc74 100644 --- a/orkbasecxx/OrkBase.dsp +++ b/orkbasecxx/OrkBase.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "." /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "BUILD_ORKBASE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "." /I "C:\devExt\libsndfile\src" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "BUILD_ORKBASE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 xerces-c_2.lib log4cxx.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"C:\devExt\ACE_wrappers\lib" /libpath:"C:\devExt\log4cxx\log4cxx-0.9.7\msvc\Lib\Release" /libpath:"C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\lib" +# ADD LINK32 LIBSNDFILE.lib xerces-c_2.lib log4cxx.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"C:\devExt\libsndfile\Release" /libpath:"C:\devExt\ACE_wrappers\lib" /libpath:"C:\devExt\log4cxx\log4cxx-0.9.7\msvc\Lib\Release" /libpath:"C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\lib" # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Cmds=copy Release\OrkBase.dll ..\OrkAudio\OrkBase.dll @@ -73,7 +73,7 @@ PostBuild_Cmds=copy Release\OrkBase.dll ..\OrkAudio\OrkBase.dll # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "BUILD_ORKBASE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "C:\devExt\libsndfile\src" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "BUILD_ORKBASE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -84,7 +84,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib log4cxx.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"Debug/OrkBaseD.dll" /pdbtype:sept /libpath:"C:\devExt\ACE_wrappers\lib" /libpath:"C:\devExt\log4cxx\log4cxx-0.9.7\msvc\Lib\Debug" /libpath:"C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\lib" +# ADD LINK32 LIBSNDFILE.lib xerces-c_2D.lib log4cxx.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"Debug/OrkBaseD.dll" /pdbtype:sept /libpath:"C:\devExt\libsndfile\Debug" /libpath:"C:\devExt\ACE_wrappers\lib" /libpath:"C:\devExt\log4cxx\log4cxx-0.9.7\msvc\Lib\Debug" /libpath:"C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\lib" # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Cmds=copy Debug\OrkBaseD.dll ..\OrkAudio\OrkBaseD.dll @@ -201,6 +201,22 @@ SOURCE=.\Messages\AsyncMessage.h # End Source File # Begin Source File +SOURCE=.\messages\CaptureMsg.cpp +# End Source File +# Begin Source File + +SOURCE=.\messages\CaptureMsg.h +# End Source File +# Begin Source File + +SOURCE=.\messages\DeleteTapeMsg.cpp +# End Source File +# Begin Source File + +SOURCE=.\messages\DeleteTapeMsg.h +# End Source File +# Begin Source File + SOURCE=.\Messages\Message.cpp !IF "$(CFG)" == "OrkBase - Win32 Release" @@ -218,6 +234,14 @@ SOURCE=.\Messages\Message.h # End Source File # Begin Source File +SOURCE=.\messages\PingMsg.cpp +# End Source File +# Begin Source File + +SOURCE=.\messages\PingMsg.h +# End Source File +# Begin Source File + SOURCE=.\Messages\SyncMessage.cpp !IF "$(CFG)" == "OrkBase - Win32 Release" @@ -233,6 +257,58 @@ SOURCE=.\Messages\SyncMessage.cpp SOURCE=.\Messages\SyncMessage.h # End Source File +# Begin Source File + +SOURCE=.\messages\TapeMsg.cpp +# End Source File +# Begin Source File + +SOURCE=.\messages\TapeMsg.h +# End Source File +# Begin Source File + +SOURCE=.\messages\TestMsg.cpp +# End Source File +# Begin Source File + +SOURCE=.\messages\TestMsg.h +# End Source File +# End Group +# Begin Group "audiofile" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\audiofile\AudioFile.cpp +# End Source File +# Begin Source File + +SOURCE=.\audiofile\AudioFile.h +# End Source File +# Begin Source File + +SOURCE=.\audiofile\LibSndFileFile.cpp +# End Source File +# Begin Source File + +SOURCE=.\audiofile\LibSndFileFile.h +# End Source File +# Begin Source File + +SOURCE=.\audiofile\MediaChunkFile.cpp +# End Source File +# Begin Source File + +SOURCE=.\audiofile\MediaChunkFile.h +# End Source File +# Begin Source File + +SOURCE=.\audiofile\PcmFile.cpp +# End Source File +# Begin Source File + +SOURCE=.\audiofile\PcmFile.h +# End Source File # End Group # Begin Source File @@ -248,6 +324,14 @@ SOURCE=.\AudioCapturePlugin.h # End Source File # Begin Source File +SOURCE=.\AudioTape.cpp +# End Source File +# Begin Source File + +SOURCE=.\AudioTape.h +# End Source File +# Begin Source File + SOURCE=.\Config.cpp # End Source File # Begin Source File @@ -363,6 +447,14 @@ SOURCE=.\StdString.h # End Source File # Begin Source File +SOURCE=.\TapeProcessor.h +# End Source File +# Begin Source File + +SOURCE=.\ThreadSafeQueue.h +# End Source File +# Begin Source File + SOURCE=.\Utils.cpp # End Source File # Begin Source File diff --git a/orkbasecxx/TapeProcessor.h b/orkbasecxx/TapeProcessor.h new file mode 100644 index 0000000..2b60fc8 --- /dev/null +++ b/orkbasecxx/TapeProcessor.h @@ -0,0 +1,37 @@ +/* + * Oreka -- A media capture and retrieval platform + * + * Copyright (C) 2005, orecx LLC + * + * http://www.orecx.com + * + * This program is free software, distributed under the terms of + * the GNU General Public License. + * Please refer to http://www.gnu.org/copyleft/gpl.html + * + */ +#ifndef __TAPEPROCESSOR_H__ +#define __TAPEPROCESSOR_H__ + +//#include +//#include "ace/Singleton.h" +#include "AudioCapture.h" +#include "dll.h" +#include "OrkBase.h" + +class TapeProcessor; + +typedef boost::shared_ptr TapeProcessorRef; + +/** TapeProcessor Interface + * a filter is a black box that takes media chunks as an input and produces media chunks as an output + * it can be translating between two encodings (codec) or just processing the signal + */ +class DLL_IMPORT_EXPORT_ORKBASE TapeProcessor +{ +public: + virtual TapeProcessorRef __CDECL__ Instanciate() = 0; + virtual void __CDECL__ AddAudioTape(AudioTapeRef audioTapeRef) = 0; +}; + +#endif \ No newline at end of file diff --git a/orkbasecxx/audiofile/AudioFile.h b/orkbasecxx/audiofile/AudioFile.h index bc9cbcf..3d3b566 100644 --- a/orkbasecxx/audiofile/AudioFile.h +++ b/orkbasecxx/audiofile/AudioFile.h @@ -23,7 +23,7 @@ /** Base class for all file accessor classes. */ -class AudioFile +class DLL_IMPORT_EXPORT_ORKBASE AudioFile { public: typedef enum {READ = 0, WRITE = 1} fileOpenModeEnum; diff --git a/orkbasecxx/audiofile/LibSndFileFile.h b/orkbasecxx/audiofile/LibSndFileFile.h index e0516a8..3ba2e63 100644 --- a/orkbasecxx/audiofile/LibSndFileFile.h +++ b/orkbasecxx/audiofile/LibSndFileFile.h @@ -24,7 +24,7 @@ /** file accessor class for all file types supported by the libsndfile library. The library can be found at http://www.mega-nerd.com/libsndfile/ */ -class LibSndFileFile : public AudioFile +class DLL_IMPORT_EXPORT_ORKBASE LibSndFileFile : public AudioFile { public: LibSndFileFile(int fileFormat); // fileFormat is described at http://www.mega-nerd.com/libsndfile/api.html diff --git a/orkbasecxx/audiofile/MediaChunkFile.h b/orkbasecxx/audiofile/MediaChunkFile.h index b8e69ed..e60a3fe 100644 --- a/orkbasecxx/audiofile/MediaChunkFile.h +++ b/orkbasecxx/audiofile/MediaChunkFile.h @@ -18,7 +18,7 @@ /** File class for saving audio chunks as-is */ -class MediaChunkFile : public AudioFile +class DLL_IMPORT_EXPORT_ORKBASE MediaChunkFile : public AudioFile { public: MediaChunkFile(); diff --git a/orkbasecxx/audiofile/PcmFile.h b/orkbasecxx/audiofile/PcmFile.h index 91c1325..bc09f01 100644 --- a/orkbasecxx/audiofile/PcmFile.h +++ b/orkbasecxx/audiofile/PcmFile.h @@ -19,7 +19,7 @@ #define PCM_FILE_DEFAULT_CHUNK_NUM_SAMPLES 8000 /** File class for raw 16 bit signed PCM output */ -class PcmFile : public AudioFile +class DLL_IMPORT_EXPORT_ORKBASE PcmFile : public AudioFile { public: PcmFile(); diff --git a/orkbasecxx/messages/CaptureMsg.cpp b/orkbasecxx/messages/CaptureMsg.cpp index f013e1f..4cf17cf 100644 --- a/orkbasecxx/messages/CaptureMsg.cpp +++ b/orkbasecxx/messages/CaptureMsg.cpp @@ -14,7 +14,7 @@ #include "Utils.h" #include "CaptureMsg.h" //#include "LogManager.h" -#include "CapturePluginProxy.h" +//#include "CapturePluginProxy.h" #define CAPTURE_CLASS "capture" #define CAPTURE_RESPONSE_CLASS "captureresponse" @@ -65,12 +65,12 @@ ObjectRef CaptureMsg::Process() if(m_eventType == CaptureEvent::EtStart) { - CapturePluginProxySingleton::instance()->StartCapture(m_capturePort); + //CapturePluginProxySingleton::instance()->StartCapture(m_capturePort); msg->m_success = true; } else if(m_eventType == CaptureEvent::EtStop) { - CapturePluginProxySingleton::instance()->StopCapture(m_capturePort); + //CapturePluginProxySingleton::instance()->StopCapture(m_capturePort); msg->m_success = true; } else diff --git a/orkbasecxx/messages/CaptureMsg.h b/orkbasecxx/messages/CaptureMsg.h index 782f70f..255c740 100644 --- a/orkbasecxx/messages/CaptureMsg.h +++ b/orkbasecxx/messages/CaptureMsg.h @@ -19,7 +19,7 @@ #include "AudioCapture.h" -class CaptureResponseMsg : public AsyncMessage +class DLL_IMPORT_EXPORT_ORKBASE CaptureResponseMsg : public AsyncMessage { public: void Define(Serializer* s); @@ -33,7 +33,7 @@ public: CStdString m_comment; }; -class CaptureMsg : public SyncMessage +class DLL_IMPORT_EXPORT_ORKBASE CaptureMsg : public SyncMessage { public: void Define(Serializer* s); diff --git a/orkbasecxx/messages/DeleteTapeMsg.h b/orkbasecxx/messages/DeleteTapeMsg.h index 33fb9ae..a697f3c 100644 --- a/orkbasecxx/messages/DeleteTapeMsg.h +++ b/orkbasecxx/messages/DeleteTapeMsg.h @@ -16,7 +16,7 @@ #include "messages/SyncMessage.h" -class DeleteTapeMsg : public SyncMessage +class DLL_IMPORT_EXPORT_ORKBASE DeleteTapeMsg : public SyncMessage { public: void Define(Serializer* s); diff --git a/orkbasecxx/messages/PingMsg.h b/orkbasecxx/messages/PingMsg.h index 21b659a..52a46c4 100644 --- a/orkbasecxx/messages/PingMsg.h +++ b/orkbasecxx/messages/PingMsg.h @@ -18,7 +18,7 @@ #include "messages/AsyncMessage.h" -class PingResponseMsg : public AsyncMessage +class DLL_IMPORT_EXPORT_ORKBASE PingResponseMsg : public AsyncMessage { public: void Define(Serializer* s); @@ -31,7 +31,7 @@ public: bool m_success; }; -class PingMsg : public SyncMessage +class DLL_IMPORT_EXPORT_ORKBASE PingMsg : public SyncMessage { public: void Define(Serializer* s); diff --git a/orkbasecxx/messages/TapeMsg.h b/orkbasecxx/messages/TapeMsg.h index 3165bb4..491c456 100644 --- a/orkbasecxx/messages/TapeMsg.h +++ b/orkbasecxx/messages/TapeMsg.h @@ -33,7 +33,7 @@ #define LOCAL_MAC_PARAM "localmac" #define REMOTE_MAC_PARAM "remotemac" -class TapeMsg : public SyncMessage +class DLL_IMPORT_EXPORT_ORKBASE TapeMsg : public SyncMessage { public: TapeMsg(); @@ -67,7 +67,7 @@ typedef boost::shared_ptr TapeMsgRef; /** A TapeResponse is a response to TapeMsg */ -class TapeResponse : public SimpleResponseMsg +class DLL_IMPORT_EXPORT_ORKBASE TapeResponse : public SimpleResponseMsg { public: TapeResponse(); diff --git a/orkbasecxx/messages/TestMsg.h b/orkbasecxx/messages/TestMsg.h index 13aed71..d8a1e66 100644 --- a/orkbasecxx/messages/TestMsg.h +++ b/orkbasecxx/messages/TestMsg.h @@ -24,7 +24,7 @@ #define DIRECTION_PARAM "direction" #define LOCALENTRYPOINT_PARAM "localentrypoint" -class TestMsg : public SyncMessage +class DLL_IMPORT_EXPORT_ORKBASE TestMsg : public SyncMessage { public: TestMsg(); -- cgit v1.2.3