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/genericavc/avc_avdevice.cpp

    r716 r734  
    236236        bool found=false; 
    237237        for ( PlugVector::const_iterator it2 = syncMSUInputPlugs.begin(); 
    238               it2 != syncMSUInputPlugs.end(); 
    239               ++it2 ) 
     238            it2 != syncMSUInputPlugs.end(); 
     239            ++it2 ) 
    240240        { 
    241241            AVC::Plug* msuPlug = *it2; 
     
    422422    } 
    423423 
    424     int samplerate=outputPlug->getSampleRate(); 
    425  
    426424    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing receive processor...\n"); 
    427425    // create & add streamprocessors 
    428426    Streaming::StreamProcessor *p; 
    429427 
     428    if ( outputPlug->getNrOfChannels() == 0 ) { 
     429        debugError("Receive plug has no channels\n"); 
     430        return false; 
     431    } 
    430432    p=new Streaming::AmdtpReceiveStreamProcessor( 
    431433                             get1394Service().getPort(), 
    432                              samplerate, 
    433434                             outputPlug->getNrOfChannels()); 
    434435 
     
    455456        p=new Streaming::AmdtpReceiveStreamProcessor( 
    456457                                  get1394Service().getPort(), 
    457                                   samplerate, 
    458458                                  inputPlug->getNrOfChannels()); 
    459459    } else { 
    460460        p=new Streaming::AmdtpTransmitStreamProcessor( 
    461461                                get1394Service().getPort(), 
    462                                 samplerate, 
    463462                                inputPlug->getNrOfChannels()); 
    464463    } 
     
    596595AvDevice::getStreamCount() { 
    597596    return m_receiveProcessors.size() + m_transmitProcessors.size(); 
     597    //return 1; 
    598598} 
    599599 
  • trunk/libffado/src/genericavc/avc_avdevice.h

    r639 r734  
    3434#include "libavc/general/avc_plug.h" 
    3535 
    36 #include "libstreaming/AmdtpStreamProcessor.h" 
    37 #include "libstreaming/AmdtpPort.h" 
    38 #include "libstreaming/AmdtpPortInfo.h" 
     36#include "libstreaming/amdtp/AmdtpReceiveStreamProcessor.h" 
     37#include "libstreaming/amdtp/AmdtpTransmitStreamProcessor.h" 
     38#include "libstreaming/amdtp/AmdtpPort.h" 
     39#include "libstreaming/amdtp/AmdtpPortInfo.h" 
    3940 
    4041#include "debugmodule/debugmodule.h"