Changeset 250
- Timestamp:
- 06/06/06 08:09:38 (18 years ago)
- Files:
-
- branches/libfreebob-2.0/configure.ac (modified) (1 diff)
- branches/libfreebob-2.0/doc/Makefile.am (modified) (1 diff)
- branches/libfreebob-2.0/doc/reference.doxygen.in (modified) (1 diff)
- branches/libfreebob-2.0/src/libfreebobstreaming/cip.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/cip.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/freebob_connections.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/freebob_connections.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/freebob_debug.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/freebob_streaming.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/freebob_streaming_private.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/handlers.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/handlers.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/Makefile.am (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/messagebuffer.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/messagebuffer.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/ringbuffer.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/ringbuffer.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/thread.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/thread.h (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/watchdog.c (deleted)
- branches/libfreebob-2.0/src/libfreebobstreaming/watchdog.h (deleted)
- branches/libfreebob-2.0/src/libstreaming/freebob_streaming.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/IsoHandlerManager.h (modified) (3 diffs)
- branches/libfreebob-2.0/src/libstreaming/Makefile.am (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/StreamProcessor.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
- branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.h (modified) (4 diffs)
- branches/libfreebob-2.0/src/libstreaming/StreamRunner.cpp (deleted)
- branches/libfreebob-2.0/src/libstreaming/StreamRunner.h (deleted)
- branches/libfreebob-2.0/src/libutil (added)
- branches/libfreebob-2.0/src/libutil/DelayLockedLoop.cpp (added)
- branches/libfreebob-2.0/src/libutil/DelayLockedLoop.h (added)
- branches/libfreebob-2.0/src/libutil/Makefile.am (added)
- branches/libfreebob-2.0/src/Makefile.am (modified) (2 diffs)
- branches/libfreebob-2.0/tests/streaming/Makefile.am (modified) (1 diff)
- branches/libfreebob-2.0/tests/streaming/test-isohandling.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libfreebob-2.0/configure.ac
r245 r250 232 232 src/debugmodule/Makefile 233 233 src/libfreebobavc/Makefile 234 src/libfreebobstreaming/Makefile235 234 src/libstreaming/Makefile 235 src/libutil/Makefile 236 236 src/Makefile 237 237 tests/Makefile branches/libfreebob-2.0/doc/Makefile.am
r245 r250 15 15 DOC_DIR=$(HTML_DIR) 16 16 17 all-local: doxygen-build.stamp17 doc: doxygen-build.stamp 18 18 19 19 doxygen-build.stamp: $(DOX) $(DOXSOURCES) branches/libfreebob-2.0/doc/reference.doxygen.in
r249 r250 367 367 @top_srcdir@/src/debugmodule \ 368 368 @top_srcdir@/src/libstreaming \ 369 @top_srcdir@/src/libutil \ 369 370 @top_srcdir@/src/libfreebobavc \ 370 371 @top_srcdir@/libfreebob/ branches/libfreebob-2.0/src/libstreaming/freebob_streaming.cpp
r244 r250 43 43 #include "AmdtpStreamProcessor.h" 44 44 #include "IsoHandlerManager.h" 45 #include "StreamRunner.h" 46 #include "FreebobPosixThread.h" 45 #include "../libutil/PosixThread.h" 47 46 #include "AmdtpPort.h" 48 47 branches/libfreebob-2.0/src/libstreaming/IsoHandlerManager.h
r244 r250 30 30 31 31 #include "../debugmodule/debugmodule.h" 32 #include " FreebobThread.h"32 #include "../libutil/Thread.h" 33 33 34 34 #include <sys/poll.h> … … 62 62 */ 63 63 64 class IsoHandlerManager : public Freebob RunnableInterface64 class IsoHandlerManager : public FreebobUtil::RunnableInterface 65 65 { 66 66 friend class StreamProcessorManager; … … 93 93 94 94 protected: 95 // FreebobRunnableInterface interface95 // RunnableInterface interface 96 96 bool Execute(); // note that this is called in we while(running) loop 97 97 bool Init(); branches/libfreebob-2.0/src/libstreaming/Makefile.am
r249 r250 18 18 19 19 noinst_LTLIBRARIES = libstreaming.la 20 noinst_HEADERS = cip.h FreebobPosixThread.h FreebobThread.h FreebobAtomic.h \ 21 IsoHandler.h IsoHandlerManager.h IsoStream.h PacketBuffer.h PortManager.h Port.h \ 22 StreamProcessor.h StreamProcessorManager.h AmdtpPortInfo.h AmdtpPort.h \ 23 AmdtpStreamProcessor.h StreamRunner.h streamstatistics.h MotuStreamProcessor.h MotuPort.h \ 24 MotuPortInfo.h 20 noinst_HEADERS = cip.h IsoHandler.h IsoHandlerManager.h IsoStream.h \ 21 PacketBuffer.h PortManager.h Port.h StreamProcessor.h StreamProcessorManager.h \ 22 AmdtpPortInfo.h AmdtpPort.h AmdtpStreamProcessor.h streamstatistics.h \ 23 MotuStreamProcessor.h MotuPort.h MotuPortInfo.h 25 24 26 libstreaming_la_SOURCES = cip.c FreebobPosixThread.cpp freebob_streaming.cpp \27 IsoHandler .cpp IsoHandlerManager.cpp IsoStream.cpp PacketBuffer.cpp PortManager.cpp \28 Port.cpp StreamProcessor.cpp StreamProcessorManager.cpp AmdtpPortInfo.cpp \29 Amdtp Port.cpp AmdtpStreamProcessor.cpp StreamRunner.cpp ringbuffer.c\30 streamstatistics.cpp MotuStreamProcessor.cpp MotuPort.cppMotuPortInfo.cpp25 libstreaming_la_SOURCES = cip.c freebob_streaming.cpp IsoHandler.cpp \ 26 IsoHandlerManager.cpp IsoStream.cpp PacketBuffer.cpp PortManager.cpp Port.cpp \ 27 StreamProcessor.cpp StreamProcessorManager.cpp AmdtpPortInfo.cpp AmdtpPort.cpp \ 28 AmdtpStreamProcessor.cpp ringbuffer.c streamstatistics.cpp MotuStreamProcessor.cpp MotuPort.cpp \ 29 MotuPortInfo.cpp 31 30 32 31 INCLUDES = $(LIBRAW1394_CFLAGS) $(LIBIEC61883_CFLAGS) -I$(top_srcdir)/src \ branches/libfreebob-2.0/src/libstreaming/StreamProcessor.cpp
r249 r250 27 27 */ 28 28 29 #include " FreebobAtomic.h"29 #include "../libutil/Atomic.h" 30 30 31 31 #include "StreamProcessor.h" branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp
r244 r250 151 151 152 152 // and the tread that runs the runner 153 m_streamingThread=new Freebob PosixThread(this, m_thread_realtime, m_thread_priority, PTHREAD_CANCEL_DEFERRED);153 m_streamingThread=new FreebobUtil::PosixThread(this, m_thread_realtime, m_thread_priority, PTHREAD_CANCEL_DEFERRED); 154 154 if(!m_streamingThread) { 155 155 debugFatal("Could not create streaming thread\n"); branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.h
r244 r250 30 30 31 31 #include "../debugmodule/debugmodule.h" 32 #include " FreebobThread.h"33 #include " FreebobPosixThread.h"32 #include "../libutil/Thread.h" 33 #include "../libutil/PosixThread.h" 34 34 #include <semaphore.h> 35 35 #include "Port.h" … … 52 52 */ 53 53 class StreamProcessorManager : 54 public Freebob RunnableInterface {54 public FreebobUtil::RunnableInterface { 55 55 56 56 friend class StreamRunner; … … 101 101 protected: 102 102 int signalWaiters(); // call this to signal a period boundary 103 // FreebobRunnableInterface interface103 // RunnableInterface interface 104 104 bool Execute(); // note that this is called in we while(running) loop 105 105 bool Init(); … … 123 123 IsoHandlerManager *m_isoManager; 124 124 125 Freebob PosixThread *m_streamingThread;125 FreebobUtil::PosixThread *m_streamingThread; 126 126 127 127 unsigned int m_nbperiods; branches/libfreebob-2.0/src/Makefile.am
r246 r250 17 17 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 18 19 SUBDIRS = debugmodule libfreebobavc libstreaming 19 SUBDIRS = debugmodule libfreebobavc libstreaming libutil 20 20 21 21 INCLUDES = $(LIBSIGC_CFLAGS) $(LIBRAW1394_CFLAGS) $(LIBIEC61883_CFLAGS) \ … … 62 62 63 63 libfreebob_la_LIBADD = debugmodule/libdebugmodule.la libfreebobavc/libfreebobavc.la \ 64 libstreaming/libstreaming.la 64 libstreaming/libstreaming.la libutil/libutil.la 65 65 branches/libfreebob-2.0/tests/streaming/Makefile.am
r205 r250 17 17 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 18 19 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/libstreaming $(LIBIEC61883_CFLAGS)19 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/libstreaming -I$(top_srcdir)/src/libutil $(LIBIEC61883_CFLAGS) 20 20 AM_CFLAGS = -DDEBUG 21 21 AM_CXXFLAGS = -DDEBUG branches/libfreebob-2.0/tests/streaming/test-isohandling.cpp
r227 r250 36 36 #include "AmdtpStreamProcessor.h" 37 37 #include "IsoHandlerManager.h" 38 #include "StreamRunner.h" 39 #include "FreebobPosixThread.h" 38 #include "PosixThread.h" 40 39 #include "AmdtpPort.h" 41 40 … … 142 141 } 143 142 144 // now create the runner that does the actual streaming 145 StreamRunner *runner = new StreamRunner(procMan); 146 if(!runner) { 147 printf("Could not create StreamRunner\n"); 148 return -1; 149 } 150 151 FreebobPosixThread *thread=new FreebobPosixThread(runner); 143 FreebobUtil::PosixThread *thread=new FreebobUtil::PosixThread(procMan); 152 144 153 145 … … 194 186 195 187 delete thread; 196 delete runner;197 188 198 189 delete procMan;