Changeset 250

Show
Ignore:
Timestamp:
06/06/06 08:09:38 (16 years ago)
Author:
pieterpalmers
Message:

- removed old streaming code
- removed some obsolete files
- moved utility classes to libutil
- don't do the doxygen processing on make all, explicit make doc in doc/ is now nescessary (speed)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libfreebob-2.0/configure.ac

    r245 r250  
    232232                 src/debugmodule/Makefile 
    233233                 src/libfreebobavc/Makefile 
    234                  src/libfreebobstreaming/Makefile 
    235234                 src/libstreaming/Makefile 
     235                 src/libutil/Makefile 
    236236                 src/Makefile 
    237237                 tests/Makefile 
  • branches/libfreebob-2.0/doc/Makefile.am

    r245 r250  
    1515DOC_DIR=$(HTML_DIR) 
    1616 
    17 all-local: doxygen-build.stamp 
     17doc: doxygen-build.stamp 
    1818 
    1919doxygen-build.stamp: $(DOX) $(DOXSOURCES) 
  • branches/libfreebob-2.0/doc/reference.doxygen.in

    r249 r250  
    367367                         @top_srcdir@/src/debugmodule \ 
    368368                         @top_srcdir@/src/libstreaming \ 
     369                         @top_srcdir@/src/libutil \ 
    369370                         @top_srcdir@/src/libfreebobavc \ 
    370371                         @top_srcdir@/libfreebob/ 
  • branches/libfreebob-2.0/src/libstreaming/freebob_streaming.cpp

    r244 r250  
    4343#include "AmdtpStreamProcessor.h" 
    4444#include "IsoHandlerManager.h" 
    45 #include "StreamRunner.h" 
    46 #include "FreebobPosixThread.h" 
     45#include "../libutil/PosixThread.h" 
    4746#include "AmdtpPort.h" 
    4847 
  • branches/libfreebob-2.0/src/libstreaming/IsoHandlerManager.h

    r244 r250  
    3030 
    3131#include "../debugmodule/debugmodule.h" 
    32 #include "FreebobThread.h" 
     32#include "../libutil/Thread.h" 
    3333 
    3434#include <sys/poll.h> 
     
    6262*/ 
    6363 
    64 class IsoHandlerManager : public FreebobRunnableInterface 
     64class IsoHandlerManager : public FreebobUtil::RunnableInterface 
    6565{ 
    6666        friend class StreamProcessorManager; 
     
    9393 
    9494        protected: 
    95                 // FreebobRunnableInterface interface 
     95                // RunnableInterface interface 
    9696                bool Execute(); // note that this is called in we while(running) loop 
    9797                bool Init(); 
  • branches/libfreebob-2.0/src/libstreaming/Makefile.am

    r249 r250  
    1818 
    1919noinst_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 
     20noinst_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 
    2524 
    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         AmdtpPort.cpp AmdtpStreamProcessor.cpp StreamRunner.cpp        ringbuffer.c
    30                streamstatistics.cpp MotuStreamProcessor.cpp MotuPort.cpp MotuPortInfo.cpp 
     25libstreaming_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 
    3130 
    3231INCLUDES = $(LIBRAW1394_CFLAGS) $(LIBIEC61883_CFLAGS) -I$(top_srcdir)/src \ 
  • branches/libfreebob-2.0/src/libstreaming/StreamProcessor.cpp

    r249 r250  
    2727 */ 
    2828 
    29 #include "FreebobAtomic.h" 
     29#include "../libutil/Atomic.h" 
    3030 
    3131#include "StreamProcessor.h" 
  • branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp

    r244 r250  
    151151 
    152152        // and the tread that runs the runner 
    153         m_streamingThread=new FreebobPosixThread(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); 
    154154        if(!m_streamingThread) { 
    155155                debugFatal("Could not create streaming thread\n"); 
  • branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.h

    r244 r250  
    3030 
    3131#include "../debugmodule/debugmodule.h" 
    32 #include "FreebobThread.h" 
    33 #include "FreebobPosixThread.h" 
     32#include "../libutil/Thread.h" 
     33#include "../libutil/PosixThread.h" 
    3434#include <semaphore.h> 
    3535#include "Port.h" 
     
    5252*/ 
    5353class StreamProcessorManager : 
    54                         public FreebobRunnableInterface { 
     54                        public FreebobUtil::RunnableInterface { 
    5555 
    5656        friend class StreamRunner; 
     
    101101protected: 
    102102        int signalWaiters(); // call this to signal a period boundary 
    103         // FreebobRunnableInterface interface 
     103        // RunnableInterface interface 
    104104        bool Execute(); // note that this is called in we while(running) loop 
    105105        bool Init(); 
     
    123123        IsoHandlerManager *m_isoManager; 
    124124 
    125         FreebobPosixThread *m_streamingThread; 
     125        FreebobUtil::PosixThread *m_streamingThread; 
    126126 
    127127    unsigned int m_nbperiods; 
  • branches/libfreebob-2.0/src/Makefile.am

    r246 r250  
    1717# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1818 
    19 SUBDIRS = debugmodule libfreebobavc libstreaming 
     19SUBDIRS = debugmodule libfreebobavc libstreaming libutil 
    2020 
    2121INCLUDES = $(LIBSIGC_CFLAGS) $(LIBRAW1394_CFLAGS) $(LIBIEC61883_CFLAGS) \ 
     
    6262 
    6363libfreebob_la_LIBADD = debugmodule/libdebugmodule.la libfreebobavc/libfreebobavc.la \ 
    64         libstreaming/libstreaming.la  
     64        libstreaming/libstreaming.la libutil/libutil.la 
    6565 
  • branches/libfreebob-2.0/tests/streaming/Makefile.am

    r205 r250  
    1717# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1818 
    19 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/libstreaming $(LIBIEC61883_CFLAGS) 
     19INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/libstreaming -I$(top_srcdir)/src/libutil $(LIBIEC61883_CFLAGS) 
    2020AM_CFLAGS = -DDEBUG 
    2121AM_CXXFLAGS = -DDEBUG 
  • branches/libfreebob-2.0/tests/streaming/test-isohandling.cpp

    r227 r250  
    3636#include "AmdtpStreamProcessor.h" 
    3737#include "IsoHandlerManager.h" 
    38 #include "StreamRunner.h" 
    39 #include "FreebobPosixThread.h" 
     38#include "PosixThread.h" 
    4039#include "AmdtpPort.h" 
    4140 
     
    142141        } 
    143142         
    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); 
    152144 
    153145 
     
    194186 
    195187        delete thread; 
    196         delete runner; 
    197188 
    198189        delete procMan;