Changeset 866

Timestamp:

01/20/08 03:59:17 (15 years ago)

Author:

ppalmers

Message:

- weed out some unused functions
- introduce 'debugOutputExtreme' allowing to disable debug statements in the speed-sensitive sections. This should reduce the cpu load on a 'normal' debug build significantly.

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/src/debugmodule/debugmodule.h (modified) (2 diffs)
• trunk/libffado/src/libieee1394/cycletimer.h (modified) (4 diffs)
• trunk/libffado/src/libieee1394/CycleTimerHelper.cpp (modified) (4 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (14 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.h (modified) (2 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (13 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (18 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (6 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (11 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.h (modified) (1 diff)
• trunk/libffado/tests/test-ffado.cpp (modified) (2 diffs)

trunk/libffado/config.h.in

@@ -40 +40 @@
-#define SHAREDIR "$SHAREDIR"
-
-
+
+
+
+
+
-
-#define IEEE1394SERVICE_USE_CYCLETIMER_DLL  1

trunk/libffado/src/debugmodule/debugmodule.h

@@ -185 +185 @@
-                                     format,                       \
-                                     ##args )
+    #define DEBUG_NORMAL( x ) x;
+
+    #if DEBUG_EXTREME_ENABLE
+        #define debugOutputExtreme( level, format, args... )           \
+                    m_debugModule.print( level,                        \
+                                        __FILE__,                     \
+                                        __FUNCTION__,                 \
+                                        __LINE__,                     \
+                                        format,                       \
+                                        ##args )
+        #define debugOutputShortExtreme( level, format, args... )      \
+                    m_debugModule.printShort( level,                   \
+                                        format,                       \
+                                        ##args )
+        #define DEBUG_EXTREME( x ) x;
+    #else
+        #define debugOutputExtreme( level, format, args... )
+        #define debugOutputShortExtreme( level, format, args... )
+        #define DEBUG_EXTREME( x )
+    #endif
-
-#else
@@ -190 +210 @@
-    #define debugOutput( level, format, args... )
-    #define debugOutputShort( level, format, args... )
+    #define DEBUG_NORMAL( x )
+
+    #define debugOutputExtreme( level, format, args... )
+    #define debugOutputShortExtreme( level, format, args... )
+    #define DEBUG_EXTREME( x )
-
-#endif

trunk/libffado/src/libieee1394/cycletimer.h

@@ -305 +305 @@
-    uint64_t timestamp;
-
-(DEBUG_LEVEL_VERY_VERBOSE,
-
+Extreme(DEBUG_LEVEL_VERY_VERBOSE, 
+               
-
-    // reconstruct the full cycle
@@ -345 +345 @@
-        timestamp  = new_cycles * TICKS_PER_CYCLE;
-    } else {
-
-
-rcv_cycle,delta_cycles,
+Extreme
+               
+               rcv_cycle, delta_cycles, 
-
-        new_cycles-=8000; // wrap around
@@ -391 +391 @@
-    uint64_t timestamp;
-
-(DEBUG_LEVEL_VERY_VERBOSE,
-syt_timestamp,xmt_cycle,
+Extreme(DEBUG_LEVEL_VERY_VERBOSE, 
+               syt_timestamp, xmt_cycle, 
-
-    // reconstruct the full cycle
@@ -431 +431 @@
-        timestamp  = new_cycles * TICKS_PER_CYCLE;
-    } else {
-
-
-xmt_cycle,delta_cycles,
+Extreme
+               
+               xmt_cycle, delta_cycles, 
-
-        new_cycles-=8000; // wrap around

trunk/libffado/src/libieee1394/CycleTimerHelper.cpp

@@ -165 +165 @@
-CycleTimerHelper::Execute()
-{
-
+Extreme
-    if (!m_first_run) {
-        // wait for the next update period
@@ -182 +182 @@
-        return false;
-    }
-
-
+Extreme
+    
-
-    if (m_first_run) {
@@ -226 +226 @@
-        m_next_time_usecs = local_time + m_usecs_per_update;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    ENTER_CRITICAL_SECTION;
-    m_current_vars.ticks = (uint64_t)(m_current_time_ticks);// + m_average_offset_ticks);
@@ -270 +269 @@
-    if (y_step_in_ticks_int > 0) {
-        retval = addTicks(offset_in_ticks_int, y_step_in_ticks_int);
-
- 
+Extreme
+
-    } else {
-        retval = substractTicks(offset_in_ticks_int, -y_step_in_ticks_int);
-
-        // this can happen if the update thread was woken up earlier than it should have been
-
- 
+Extreme
+
-    }
-

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -83 +83 @@
-   , m_max_packet_size( 1024 )
-   , m_irq_interval( -1 )
-   , m_packetcount( 0 )
-   , m_dropped( 0 )
-   , m_Client( 0 )
-   , m_poll_timeout( 100 )
@@ -104 +102 @@
-   , m_max_packet_size( max_packet_size )
-   , m_irq_interval( irq )
-   , m_packetcount( 0 )
-   , m_dropped( 0 )
-   , m_Client( 0 )
-   , m_poll_timeout( 100 )
@@ -126 +122 @@
-   , m_max_packet_size( max_packet_size )
-   , m_irq_interval( irq )
-   , m_packetcount( 0 )
-   , m_dropped( 0 )
-   , m_Client( 0 )
-   , m_poll_timeout( 100 )
@@ -174 +168 @@
-IsoHandler::waitForClient()
-{
-
+Extreme
-    if(m_Client) {
-        bool result;
@@ -182 +176 @@
-            result = m_Client->waitForConsumePacket();
-        }
-
+Extreme
-        return result;
-    } else {
-
+Extreme
-    }
-    return false;
@@ -193 +187 @@
-IsoHandler::tryWaitForClient()
-{
-
+Extreme
-    if(m_Client) {
-        bool result;
@@ -201 +195 @@
-            result = m_Client->canConsumePacket();
-        }
-
+Extreme
-        return result;
-    } else {
-
+Extreme
-    }
-    return false;
@@ -212 +206 @@
-IsoHandler::Execute()
-{
-
+Extreme
-
-    // bypass if not running
@@ -224 +218 @@
-    // wait for the availability of frames in the client
-    // (blocking for transmit handlers)
-
+Extreme
-    if (waitForClient()) {
-#if ISOHANDLER_USE_POLL
@@ -277 +271 @@
-bool
-IsoHandler::iterate() {
-
+Extreme
-                this, getTypeString());
-    if(m_State == E_Running) {
@@ -288 +282 @@
-            return false;
-        }
-
-
+Extreme
+       
-        return true;
-    } else {
@@ -427 +421 @@
-                                            m_speed, m_prebuffers);
-    }
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Packet count................: %10d (%5d dropped)\n",
-            this->getPacketCount(), this->getDroppedCount());
-}
-
@@ -478 +470 @@
-                    unsigned int cycle, unsigned int dropped) {
-
-
-
-
-
-
-
+
+
+
-    if(m_Client) {
-        return m_Client->putPacket(data, length, channel, tag, sy, cycle, dropped);
@@ -497 +486 @@
-                    int cycle, unsigned int dropped) {
-
-
-
-
-
-
-
+
+
+
-    if(m_Client) {
-        return m_Client->getPacket(data, length, tag, sy, cycle, dropped, m_max_packet_size);

trunk/libffado/src/libieee1394/IsoHandler.h

@@ -113 +113 @@
-    int getPacketLatency() { return m_irq_interval;};
-
-    int getPacketCount() {return m_packetcount;};
-    void resetPacketCount() {m_packetcount=0;};
-
-    int getDroppedCount() {return m_dropped;};
-    void resetDroppedCount() {m_dropped=0;};
-
-    unsigned int getPreBuffers() {return m_prebuffers;};
-    void setPreBuffers(unsigned int n) {m_prebuffers=n;};
@@ -141 +135 @@
-    int             m_irq_interval;
-
-    int m_packetcount;
-    int m_dropped;
-    Streaming::StreamProcessor *m_Client;
-

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -154 +154 @@
-
-    // Use a shadow map of the fd's such that the poll call is not in a critical section
-uint64_t poll_enter = m_service.getCurrentTimeAsUsecs(
+DEBUG_EXTREME( uint64_t poll_enter = m_service.getCurrentTimeAsUsecs() 
-    err = poll (m_poll_fds_shadow, m_poll_nfds_shadow, m_poll_timeout);
-uint64_t poll_exit = m_service.getCurrentTimeAsUsecs(
+DEBUG_EXTREME( uint64_t poll_exit = m_service.getCurrentTimeAsUsecs() 
-
-    if (err == -1) {
@@ -168 +168 @@
-    int nb_rcv = 0;
-    int nb_xmit = 0;
-uint64_t iter_enter = m_service.getCurrentTimeAsUsecs(
+DEBUG_EXTREME( uint64_t iter_enter = m_service.getCurrentTimeAsUsecs() 
-    for (i = 0; i < m_poll_nfds_shadow; i++) {
-        if(m_poll_fds_shadow[i].revents) {
-
-
+Extreme
+               
-        }
-        if (m_poll_fds_shadow[i].revents & POLLERR) {
@@ -195 +195 @@
-        }
-    }
-uint64_t iter_exit = m_service.getCurrentTimeAsUsecs(
-
-
-
-
+DEBUG_EXTREME( uint64_t iter_exit = m_service.getCurrentTimeAsUsecs() 
+
+Extreme
+       
+       
-
-    return true;

trunk/libffado/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

@@ -161 +161 @@
-    #ifdef DEBUG
-    if(isRunning()) {
-
-
+
+
+
-    }
-    #endif
@@ -182 +183 @@
-                       unsigned int nevents, unsigned int offset)
-{
-
+
+
+
-
-    bool no_problem=true;

trunk/libffado/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -84 +84 @@
-    int cycles_until_transmit;
-
-
+
+
-    // check whether the packet buffer has packets for us to send.
-    // the base timestamp is the one of the next sample in the buffer
@@ -117 +118 @@
-
-    if (dropped) {
- 
-
-
-
-transmit_at_time, ( unsigned int ) TICKS_TO_CYCLES ( transmit_at_time 
-presentation_time, ( unsigned int ) TICKS_TO_CYCLES ( presentation_time 
+
+ 
+ 
+ 
+ transmit_at_time, (unsigned int)TICKS_TO_CYCLES(transmit_at_time
+ presentation_time, (unsigned int)TICKS_TO_CYCLES(presentation_time
-    }
-    // two different options:
@@ -138 +139 @@
-        if ( cycles_until_presentation <= AMDTP_MIN_CYCLES_BEFORE_PRESENTATION )
-        {
- ( DEBUG_LEVEL_VERBOSE
-
-
+( DEBUG_LEVEL_NORMAL
+ 
+ 
-            // we are too late
-            return eCRV_XRun;
@@ -148 +149 @@
-            unsigned int now_cycle = ( unsigned int ) ( TICKS_TO_CYCLES ( m_1394service.getCycleTimerTicks() ) );
-
-
-
-
-
-
+
+
+
-
-            // there is still time left to send the packet
@@ -195 +194 @@
-        {
-            // we are too late
-VERBOSE
+NORMAL
-                        "Too late: CY=%04u, TC=%04u, CUT=%04d, TSP=%011llu (%04u)\n",
-                        cycle,
@@ -224 +223 @@
-        else
-        {
- ( 
-
-
-
-transmit_at_time, ( unsigned int ) TICKS_TO_CYCLES ( transmit_at_time 
-presentation_time, ( unsigned int ) TICKS_TO_CYCLES ( presentation_time ) 
+Extreme(
+       
+       
+       
+       transmit_at_time, (unsigned int)TICKS_TO_CYCLES(transmit_at_time
+       presentation_time, (unsigned int)TICKS_TO_CYCLES(presentation_time)
-#ifdef DEBUG
-            if ( cycles_until_transmit > AMDTP_MAX_CYCLES_TO_TRANSMIT_EARLY + 1 )
-            {
- ( 
-
-
-
-transmit_at_time, ( unsigned int ) TICKS_TO_CYCLES ( transmit_at_time 
-presentation_time, ( unsigned int ) TICKS_TO_CYCLES ( presentation_time ) 
+Extreme(
+       
+       
+       
+       transmit_at_time, (unsigned int)TICKS_TO_CYCLES(transmit_at_time
+       presentation_time, (unsigned int)TICKS_TO_CYCLES(presentation_time)
-            }
-#endif
@@ -256 +255 @@
-    if ( m_data_buffer->readFrames ( m_syt_interval, ( char * ) ( data + 8 ) ) )
-    {
-
-
+
+
+
-        return eCRV_OK;
-    }
@@ -271 +271 @@
-{
-    struct iec61883_packet *packet = ( struct iec61883_packet * ) data;
-
-
+
+
+
-
-    packet->sid = m_local_node_id;
@@ -308 +309 @@
-{
-    struct iec61883_packet *packet = ( struct iec61883_packet * ) data;
-
-
+
+
+
-    packet->sid = m_local_node_id;
-
@@ -1034 +1036 @@
-        {
-            AmdtpPortInfo *pinfo=dynamic_cast<AmdtpPortInfo *>(*it);
-
-
+
+
+
-            if(pinfo->getPosition() == idx) {
-                struct _MBLA_port_cache p;
@@ -1049 +1052 @@
-
-                m_audio_ports.push_back(p);
-
-
+
+
+
-                goto next_index;
-            }
@@ -1065 +1069 @@
-    {
-        AmdtpPortInfo *pinfo=dynamic_cast<AmdtpPortInfo *>(*it);
-
-
+
+
+
-        if ((*it)->getPortType() == Port::E_Midi) {
-            struct _MIDI_port_cache p;
@@ -1082 +1087 @@
-
-            m_midi_ports.push_back(p);
-
-
+
+
+
-        }
-    }

trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

@@ -388 +388 @@
-
-    if (result == eCRV_OK) {
-
-
+
+
+
-        // update some accounting
-        m_last_good_cycle = cycle;
@@ -502 +503 @@
-        }
-        if (dropped_cycles > 0) {
-
+
+
-            m_dropped += dropped_cycles;
-            // HACK: this should not be necessary, since the header generation functions should trigger the xrun.
@@ -595 +597 @@
-        enum eChildReturnValue result = generateSilentPacketHeader(data, length, tag, sy, cycle, dropped_cycles, max_length);
-        if (result == eCRV_Packet) {
-
-
+
+
+
-            // update some accounting
-            m_last_good_cycle = cycle;
@@ -646 +649 @@
-        enum eChildReturnValue result = generatePacketHeader(data, length, tag, sy, cycle, dropped_cycles, max_length);
-        if (result == eCRV_Packet || result == eCRV_Defer) {
-
-
+
+
+
-            // update some accounting
-            m_last_good_cycle = cycle;
@@ -743 +747 @@
-    }
-
-
+
+
+
-    generateEmptyPacketHeader(data, length, tag, sy, cycle, dropped_cycles, max_length);
-    generateEmptyPacketData(data, length, tag, sy, cycle, dropped_cycles, max_length);
@@ -759 +765 @@
-bool StreamProcessor::getFrames(unsigned int nbframes, int64_t ts) {
-    bool result;
-
+
+
+
-    assert( getType() == ePT_Receive );
-    if(isDryRunning()) result = getFramesDry(nbframes, ts);
@@ -788 +796 @@
-    lag_ticks = diffTicks(ts, ts_expected);
-    lag_frames = (((float)lag_ticks) / srate);
-
-
+
+
+
-    if (lag_frames >= 1.0) {
-        // the stream lags
@@ -809 +818 @@
-bool StreamProcessor::getFramesDry(unsigned int nbframes, int64_t ts)
-{
-
-
+
+
+
-    // dry run on this side means that we put silence in all enabled ports
-    // since there is do data put into the ringbuffer in the dry-running state
@@ -829 +839 @@
-{
-    bool result;
-
+
+
+
-    assert( getType() == ePT_Transmit );
-    if(isDryRunning()) result = putFramesDry(nbframes, ts);
@@ -840 +852 @@
-StreamProcessor::putFramesWet(unsigned int nbframes, int64_t ts)
-{
-
+
+
+
-    // transfer the data
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
-
+
+
-    return true; // FIXME: what about failure?
-}
@@ -850 +865 @@
-StreamProcessor::putFramesDry(unsigned int nbframes, int64_t ts)
-{
-
+
+
+
-    // do nothing
-    return true;
@@ -858 +875 @@
-StreamProcessor::putSilenceFrames(unsigned int nbframes, int64_t ts)
-{
-
+
+
+
-
-    size_t bytes_per_frame = getEventSize() * getEventsPerFrame();
@@ -1640 +1659 @@
-bool StreamProcessor::waitForProduce(unsigned int nframes)
-{
-
+
+
+
-    struct timespec ts;
-    int result;
@@ -1662 +1683 @@
-        if (result == -1) {
-            if (errno == ETIMEDOUT) {
-
+
+
+
-                pthread_mutex_unlock(&m_activity_cond_lock);
-                return false;
-            } else {
-
+
+
-                pthread_mutex_unlock(&m_activity_cond_lock);
-                return false;
@@ -1686 +1710 @@
-bool StreamProcessor::waitForConsume(unsigned int nframes)
-{
-
+
+
+
-    struct timespec ts;
-    int result;
@@ -1718 +1744 @@
-    }
-    pthread_mutex_unlock(&m_activity_cond_lock);
-
+
+
+
-    return true;
-}
@@ -1737 +1765 @@
-        unsigned int bufferspace = m_data_buffer->getBufferSpace();
-        if(bufferspace >= nframes) {
-//             debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "enough space (%u)...\n", bufferspace);
-            return true;
-        } else return false;
@@ -1768 +1795 @@
-        unsigned int bufferfill = m_data_buffer->getBufferFill();
-        if(bufferfill >= nframes) {
-//             debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "enough items (%u)...\n", bufferfill);
-            return true;
-        } else return false;

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -711 +711 @@
-
-    while(period_not_ready) {
-
+
+
+
-        bool result;
-        if(m_SyncSource->getType() == StreamProcessor::ePT_Receive) {
@@ -770 +772 @@
-    //       and the receive processors should have done their transfer.
-    m_time_of_transfer = m_SyncSource->getTimeAtPeriod();
-
-
+
+
+
-
-    // this is to notify the client of the delay that we introduced by waiting
-    m_delayed_usecs = - m_SyncSource->getTimeUntilNextPeriodSignalUsecs();
-
+
+
+
-
-#ifdef DEBUG
@@ -789 +794 @@
-        xmt_bf = (*it)->getBufferFill();
-    }
-
-
+
+
+
-
-    // check if xruns occurred on the Iso side.
@@ -832 +838 @@
- */
-bool StreamProcessorManager::transfer() {
-
+Extreme
-    bool retval=true;
-    retval &= transfer(StreamProcessor::ePT_Receive);
@@ -849 +855 @@
-bool StreamProcessorManager::transfer(enum StreamProcessor::eProcessorType t) {
-    if(m_SyncSource == NULL) return false;
-
+
+
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),
@@ -920 +927 @@
-bool StreamProcessorManager::transferSilence(enum StreamProcessor::eProcessorType t) {
-    if(m_SyncSource == NULL) return false;
-
+
+
-        t, m_time_of_transfer,
-        (unsigned int)TICKS_TO_SECS(m_time_of_transfer),

trunk/libffado/src/libutil/TimestampedBuffer.cpp

@@ -156 +156 @@
-float TimestampedBuffer::calculateRate() {
-    ffado_timestamp_t diff;
-
+
-    diff=m_buffer_next_tail_timestamp - m_buffer_tail_timestamp;
-
-
-
-
-
-
+
+
+
+
+
+
+
-    // the maximal difference we can allow (64secs)
-    const ffado_timestamp_t max=m_wrap_at/((ffado_timestamp_t)2);
@@ -176 +177 @@
-    if (rate<0.0) debugError("rate < 0! (%f)\n",rate);
-    if (fabsf(m_nominal_rate - rate)>(m_nominal_rate*0.1)) {
-
+
+
-                     this, rate,m_nominal_rate,diff, m_update_period);
-
@@ -532 +534 @@
- */
-bool TimestampedBuffer::blockProcessWriteFrames(unsigned int nbframes, ffado_timestamp_t ts) {
-
-
+
+
+
-    int xrun;
-    unsigned int offset = 0;
@@ -642 +645 @@
-bool TimestampedBuffer::blockProcessReadFrames(unsigned int nbframes) {
-
-
+
+
+
-
-    int xrun;
@@ -773 +778 @@
-    EXIT_CRITICAL_SECTION;
-
-(DEBUG_LEVEL_VERY_VERBOSE, "for (%p) to "
-                   TIMESTAMP_FORMAT_SPEC" => "TIMESTAMP_FORMAT_SPEC", NTS=
-                   
-
+Extreme(DEBUG_LEVEL_VERY_VERBOSE, 
+"for (%p) to "TIMESTAMP_FORMAT_SPEC" => "TIMESTAMP_FORMAT_SPEC", 
+"NTS="
+       
-
-}
@@ -820 +825 @@
-    EXIT_CRITICAL_SECTION;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -1158 +989 @@
-        
-        debugOutput( DEBUG_LEVEL_VERBOSE,
-
+
+
-                     m_buffer_tail_timestamp, m_buffer_next_tail_timestamp,
-                     m_buffer_tail_timestamp, pred_buffer_next_tail_timestamp);
@@ -1172 +1004 @@
-    ffado_timestamp_t max_abs_diff = one_update_step * (1.0 + max_deviation);
-    
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    if (diff > max_abs_diff) {
@@ -1188 +1024 @@
-    }
-
-
-
+
+
+
-
-    double err = diff;
-
-
-
-
-
+
+
+
+
+
+
-
-    ENTER_CRITICAL_SECTION;
@@ -1205 +1043 @@
-
-    if (m_buffer_next_tail_timestamp >= m_wrap_at) {
-
-
+
+
+
-
-        m_buffer_next_tail_timestamp -= m_wrap_at;
-
-
-
+
+
+
-
-    }
@@ -1217 +1057 @@
-    EXIT_CRITICAL_SECTION;
-
-
-
+
+
+
-
-

trunk/libffado/src/libutil/TimestampedBuffer.h

@@ -131 +131 @@
-        void setBufferTailTimestamp ( ffado_timestamp_t new_timestamp );
-        void setBufferHeadTimestamp ( ffado_timestamp_t new_timestamp );
-
-        // sync related, also drops or add frames when necessary
-        bool syncBufferHeadToTimestamp ( ffado_timestamp_t ts );
-        bool syncBufferTailToTimestamp ( ffado_timestamp_t ts );
-        bool syncCorrectLag ( int64_t ts );
-
-        ffado_timestamp_t getTimestampFromTail ( int nframes );

trunk/libffado/tests/test-ffado.cpp

@@ -204 +204 @@
-    }
-
-
+l
-    setDebugLevel(arguments.verbose);
-
@@ -275 +275 @@
-
-            int devices_on_bus = m_deviceManager->getNbDevices();
-
+l
-
-            for(i=0;i<devices_on_bus;i++) {