--- linuxsampler/trunk/src/engines/gig/Engine.cpp 2007/09/14 14:45:11 1348 +++ linuxsampler/trunk/src/engines/gig/Engine.cpp 2007/11/14 23:42:15 1481 @@ -29,6 +29,8 @@ #include "Engine.h" +#include "../../common/global_private.h" + namespace LinuxSampler { namespace gig { InstrumentResourceManager Engine::instruments; @@ -189,7 +191,7 @@ * engine afterwards by calling @c ResumeAll() later on! */ void Engine::SuspendAll() { - dmsg(1,("gig::Engine: Suspending all ...\n")); + dmsg(2,("gig::Engine: Suspending all ...\n")); // stop the engine, so we can safely modify the engine's // data structures from this foreign thread DisableAndLock(); @@ -223,7 +225,7 @@ if (!iPendingStreamDeletions) break; usleep(10000); // sleep for 10ms } - dmsg(1,("gig::Engine: Everything suspended.\n")); + dmsg(2,("gig::Engine: Everything suspended.\n")); } /** @@ -245,13 +247,13 @@ * @param pRegion - region the engine shall stop using */ void Engine::Suspend(::gig::Region* pRegion) { - dmsg(1,("gig::Engine: Suspending Region %x ...\n",pRegion)); + dmsg(2,("gig::Engine: Suspending Region %x ...\n",pRegion)); SuspendedRegionsMutex.Lock(); SuspensionChangeOngoing.Set(true); pPendingRegionSuspension = pRegion; SuspensionChangeOngoing.WaitAndUnlockIf(true); SuspendedRegionsMutex.Unlock(); - dmsg(1,("gig::Engine: Region %x suspended.",pRegion)); + dmsg(2,("gig::Engine: Region %x suspended.",pRegion)); } /** @@ -261,13 +263,13 @@ * @param pRegion - region the engine shall be allowed to use again */ void Engine::Resume(::gig::Region* pRegion) { - dmsg(1,("gig::Engine: Resuming Region %x ...\n",pRegion)); + dmsg(2,("gig::Engine: Resuming Region %x ...\n",pRegion)); SuspendedRegionsMutex.Lock(); SuspensionChangeOngoing.Set(true); pPendingRegionResumption = pRegion; SuspensionChangeOngoing.WaitAndUnlockIf(true); SuspendedRegionsMutex.Unlock(); - dmsg(1,("gig::Engine: Region %x resumed.\n",pRegion)); + dmsg(2,("gig::Engine: Region %x resumed.\n",pRegion)); } /** @@ -569,7 +571,7 @@ * @returns 0 on success */ int Engine::RenderAudio(uint Samples) { - dmsg(7,("RenderAudio(Samples=%d)\n", Samples)); + dmsg(8,("RenderAudio(Samples=%d)\n", Samples)); // return if engine disabled if (EngineDisabled.Pop()) { @@ -1975,7 +1977,7 @@ } String Engine::Version() { - String s = "$Revision: 1.81 $"; + String s = "$Revision: 1.84 $"; return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword }