[Gnash-commit] [SCM] Gnash branch, master, updated. e280fbac6429b7b8ddb703fe3cfaed316cfdf07e

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  e280fbac6429b7b8ddb703fe3cfaed316cfdf07e (commit)
      from  28acb70eb8416b7aaa1692f97153975ab6fd58de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=e280fbac6429b7b8ddb703fe3cfaed316cfdf07e


commit e280fbac6429b7b8ddb703fe3cfaed316cfdf07e
Author: Sandro Santilli <address@hidden>
Date:   Mon Oct 25 17:52:47 2010 +0200

    Drop the sample fetching debug lines (they aren't meaingful if they don't 
use the same clock used for SWF frame advancement)

diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index 4493d42..ae7d84f 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -557,22 +557,6 @@ sound_handler::unplugAllInputStreams()
 void
 sound_handler::fetchSamples (boost::int16_t* to, unsigned int nSamples)
 {
-#ifdef GNASH_DEBUG_SAMPLES_FETCHING 
-    // should we use SystemClock for checking this ?
-    static WallClockTimer timerTotal;
-    static WallClockTimer timerLocal;
-    static size_t fetched = 0;
-    fetched += nSamples;
-    boost::uint32_t tl = timerLocal.elapsed();
-    if ( tl > 1000 ) {
-        boost::uint32_t tt = timerTotal.elapsed();
-        boost::uint32_t exptime = fetched*1000/88200;
-        log_debug("Samples fetch frequency: %d KHz (%dms late)",
-            floor(fetched*500.0/tt)/1000, (long)tt-exptime);
-        timerLocal.restart();
-    }
-#endif
-
     if ( isPaused() ) return; // should we write wav file anyway ?
 
     float finalVolumeFact = getFinalVolume()/100.0;
@@ -585,7 +569,7 @@ sound_handler::fetchSamples (boost::int16_t* to, unsigned 
int nSamples)
         // A buffer to fetch InputStream samples into
         boost::scoped_array<boost::int16_t> buf ( new boost::int16_t[nSamples] 
);
 
-#if GNASH_DEBUG_SAMPLES_FETCHING > 1
+#ifdef GNASH_DEBUG_SAMPLES_FETCHING 
         log_debug("Fetching %d samples from each of %d input streams", 
nSamples, _inputStreams.size());
 #endif
 

-----------------------------------------------------------------------

Summary of changes:
 libsound/sound_handler.cpp |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Gnash