port to NetBSD

diff --git a/Makefile.am b/Makefile.am
index 26ea70580bc0943eeac487045572322b7f8a91da..009c2dc467dd72403a4a786a70f81c077649c911 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,10 @@ SUBDIRS = data doc src
 EXTRA_DIST = extra
 
 run: all
-       $(MAKE) -C src run
+       @cd src && $(MAKE) run
 
 debug: all
-       $(MAKE) -C src debug
+       @cd src && $(MAKE) debug
 
 
 .PHONY: docs package
@@ -19,7 +19,7 @@ docs:
 
 if WIN32
 package: all
-       $(MAKE) -C win32 installer
+       @cd win32 && $(MAKE) installer
 else
 package: dist-bzip2
 endif

diff --git a/src/Moof/Sound.cc b/src/Moof/Sound.cc
index a6156249add8e0043c2b4f3637336053e4acb574..4c60e328085f60d7d282c2e70144079c49c5dbc2 100644 (file)
--- a/src/Moof/Sound.cc
+++ b/src/Moof/Sound.cc
@@ -273,12 +273,12 @@ public:
        void beginStream()
        {
                ALuint buffer;
-               for (int i = mBufferObjects.size(); i < 4; ++i)
+               for (int i = mBufferObjects.size(); i < 8; ++i)
                {
                        alGenBuffers(1, &buffer);
                        mBufferObjects.push_back(buffer);
                }
-               for (int i = 0; i < 4; ++i)
+               for (int i = 0; i < 8; ++i)
                {
                        buffer = mBufferObjects[i];
                        mQueue.front()->stream(buffer);

diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc
index a4dcf4047dfcc591f327accff93fa46039f7febc..7f51510ce60189320383f25272e87da9914dc353 100644 (file)
--- a/src/Moof/Timer.cc
+++ b/src/Moof/Timer.cc
@@ -44,7 +44,7 @@ namespace Mf {
 
 
 Scalar Timer::gNextFire = std::numeric_limits<Scalar>::max();
-std::map<unsigned,Timer&> Timer::gTimers;
+std::map<unsigned,Timer*> Timer::gTimers;
 
 
 unsigned Timer::getNewID()
@@ -75,7 +75,7 @@ void Timer::init(const Function& function, Scalar seconds, Mode mode)
                }
 
                mId = getNewID();
-               gTimers.insert(std::pair<unsigned,Timer&>(mId, *this));
+               gTimers.insert(std::pair<unsigned,Timer*>(mId, this));
 
                if (mAbsolute < gNextFire) gNextFire = mAbsolute;
        }
@@ -123,12 +123,12 @@ void Timer::fire()
 
 Scalar Timer::findNextFire()
 {
-       std::map<unsigned,Timer&>::iterator it;
+       std::map<unsigned,Timer*>::iterator it;
        Scalar nextFire = std::numeric_limits<Scalar>::max();
 
        for (it = gTimers.begin(); it != gTimers.end(); ++it)
        {
-               Scalar absolute = (*it).second.mAbsolute;
+               Scalar absolute = (*it).second->mAbsolute;
                if (absolute < nextFire) nextFire = absolute;
        }
 
@@ -154,14 +154,14 @@ bool Timer::isRepeating() const
 
 void Timer::fireIfExpired(Scalar t)
 {
-       std::map<unsigned,Timer&>::iterator it;
+       std::map<unsigned,Timer*>::iterator it;
 
        if (gNextFire > t) return;
 
        for (it = gTimers.begin(); it != gTimers.end(); ++it)
        {
-               Timer& timer = (*it).second;
-               if (timer.isExpired()) timer.fire();
+               Timer* timer = (*it).second;
+               if (timer->isExpired()) timer->fire();
        }
 }
 

diff --git a/src/Moof/Timer.hh b/src/Moof/Timer.hh
index bb0b48334c6b24cab36f8a8e4328f5e8b80186ea..a0bc676b7f130f042d550ac0c1fb25d44faa3386 100644 (file)
--- a/src/Moof/Timer.hh
+++ b/src/Moof/Timer.hh
@@ -124,7 +124,7 @@ private:
        unsigned        mId;
 
        static Scalar                                           gNextFire;
-       static std::map<unsigned,Timer&>        gTimers;
+       static std::map<unsigned,Timer*>        gTimers;
 };