Show
Ignore:
Timestamp:
11/28/07 05:03:31 (15 years ago)
Author:
ppalmers
Message:

merge ppalmers-streaming branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/motu/motu_avdevice.cpp

    r660 r734  
    3232#include "debugmodule/debugmodule.h" 
    3333 
    34 #include "libstreaming/MotuStreamProcessor.h" 
    35 #include "libstreaming/MotuPort.h" 
     34#include "libstreaming/motu/MotuReceiveStreamProcessor.h" 
     35#include "libstreaming/motu/MotuTransmitStreamProcessor.h" 
     36#include "libstreaming/motu/MotuPort.h" 
    3637 
    3738#include "libutil/DelayLockedLoop.h" 
     
    523524 
    524525    m_receiveProcessor=new Streaming::MotuReceiveStreamProcessor( 
    525         m_p1394Service->getPort(), samp_freq, event_size_in); 
     526        m_p1394Service->getPort(), event_size_in); 
    526527 
    527528    // The first thing is to initialize the processor.  This creates the 
     
    593594    // Do the same for the transmit processor 
    594595    m_transmitProcessor=new Streaming::MotuTransmitStreamProcessor( 
    595         m_p1394Service->getPort(), getSamplingFrequency(), event_size_out); 
     596        m_p1394Service->getPort(), event_size_out); 
    596597 
    597598    m_transmitProcessor->setVerboseLevel(getDebugLevel()); 
  • trunk/libffado/src/motu/motu_avdevice.h

    r660 r734  
    3131#include "libavc/avc_definitions.h" 
    3232 
    33 #include "libstreaming/MotuStreamProcessor.h" 
     33#include "libstreaming/motu/MotuReceiveStreamProcessor.h" 
     34#include "libstreaming/motu/MotuTransmitStreamProcessor.h" 
    3435 
    3536#define MOTUFW_BASE_ADDR                0xfffff0000000ULL