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

merge ppalmers-streaming branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/bounce/bounce_avdevice.h

    r639 r734  
    3030#include "libavc/general/avc_extended_cmd_generic.h" 
    3131 
    32 #include "libstreaming/AmdtpStreamProcessor.h" 
    33 #include "libstreaming/AmdtpPort.h" 
    34 #include "libstreaming/AmdtpPortInfo.h" 
     32#include "libstreaming/amdtp/AmdtpReceiveStreamProcessor.h" 
     33#include "libstreaming/amdtp/AmdtpTransmitStreamProcessor.h" 
     34#include "libstreaming/amdtp/AmdtpPort.h" 
     35#include "libstreaming/amdtp/AmdtpPortInfo.h" 
    3536 
    3637#include "libieee1394/ARMHandler.h" 
  • trunk/libffado/src/bounce/bounce_slave_avdevice.cpp

    r587 r734  
    2323 */ 
    2424 
    25 #include "libstreaming/AmdtpSlaveStreamProcessor.h" 
     25#include "libstreaming/amdtp/AmdtpSlaveStreamProcessor.h" 
    2626 
    2727#include "libieee1394/configrom.h"