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/dice/dice_avdevice.cpp

    r672 r734  
    2828#include "libieee1394/ieee1394service.h" 
    2929 
    30 #include "libstreaming/AmdtpStreamProcessor.h" 
    31  
    3230#include "debugmodule/debugmodule.h" 
    3331 
     
    5149    // vendor id, model id, vendor name, model name 
    5250    {FW_VENDORID_TCAT, 0x00000002, "TCAT", "DiceII EVM"}, 
     51    {FW_VENDORID_TCAT, 0x00000004, "TCAT", "DiceII EVM (vxx)"}, 
    5352}; 
    5453 
     
    448447bool 
    449448DiceAvDevice::prepare() { 
    450     int samplerate=getSamplingFrequency(); 
    451  
    452449    // prepare receive SP's 
    453450    for (unsigned int i=0;i<m_nb_tx;i++) { 
     
    494491        p=new Streaming::AmdtpReceiveStreamProcessor( 
    495492                             m_p1394Service->getPort(), 
    496                              samplerate, 
    497493                             nb_channels); 
    498494 
     
    581577        p=new Streaming::AmdtpTransmitStreamProcessor( 
    582578                             m_p1394Service->getPort(), 
    583                              samplerate, 
    584579                             nb_channels); 
    585580 
  • trunk/libffado/src/dice/dice_avdevice.h

    r639 r734  
    3030#include "libavc/avc_definitions.h" 
    3131 
    32 #include "libstreaming/AmdtpStreamProcessor.h" 
    33 #include "libstreaming/AmdtpPort.h" 
     32#include "libstreaming/amdtp/AmdtpReceiveStreamProcessor.h" 
     33#include "libstreaming/amdtp/AmdtpTransmitStreamProcessor.h" 
     34#include "libstreaming/amdtp/AmdtpPort.h" 
    3435#include "libieee1394/ARMHandler.h" 
    3536