Changeset 749 for trunk/libffado/src
- Timestamp:
- 11/30/07 05:23:37 (16 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp
r748 r749 36 36 37 37 StreamProcessor::StreamProcessor(FFADODevice &parent, enum eProcessorType type) 38 : m_parent( parent ) 39 , m_processor_type ( type ) 40 , m_channel( -1 ) 41 , m_handler( NULL ) 38 : m_processor_type ( type ) 42 39 , m_state( ePS_Created ) 43 40 , m_next_state( ePS_Invalid ) 44 41 , m_cycle_to_switch_state( 0 ) 42 , m_parent( parent ) 43 , m_channel( -1 ) 44 , m_handler( NULL ) 45 , m_dropped(0) 46 , m_last_timestamp(0) 47 , m_last_timestamp2(0) 45 48 , m_scratch_buffer( NULL ) 46 49 , m_scratch_buffer_size_bytes( 0 ) … … 50 53 , m_sync_delay( 0 ) 51 54 , m_in_xrun( false ) 52 , m_last_timestamp(0)53 , m_last_timestamp2(0)54 , m_dropped(0)55 55 { 56 56 // create the timestamped buffer and register ourselves as its client … … 1470 1470 1471 1471 // prepare a buffer of silence 1472 char *dummybuffer = (char *)calloc( sizeof(quadlet_t), nframes * getEventsPerFrame());1472 char *dummybuffer = (char *)calloc(getEventSize(), nframes * getEventsPerFrame()); 1473 1473 transmitSilenceBlock(dummybuffer, nframes, 0); 1474 1474 trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp
r748 r749 39 39 #define TRANSMIT_TRANSFER_DELAY DEFAULT_TRANSFER_DELAY 40 40 41 // Set to 1 to enable the generation of a 1 kHz test tone in analog output 1 42 #define TESTTONE 1 43 44 #if TESTTONE 45 #include <math.h> 46 #endif 47 41 48 namespace Streaming 42 49 { … … 283 290 // FIXME: remove this hacked in 1 kHz test signal to 284 291 // analog-1 when testing is complete. 285 signed int i nt_tpf = (int)ticks_per_frame;292 signed int i, int_tpf = (int)ticks_per_frame; 286 293 unsigned char *sample = data+8+16; 287 294 for (i=0; i<n_events; i++, sample+=m_event_size) {