Revision: 7326
http://playerstage.svn.sourceforge.net/playerstage/?rev=7326&view=rev
Author: natepak
Date: 2009-02-10 18:16:15 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Fixes to openal
Modified Paths:
--------------
code/gazebo/trunk/server/World.cc
code/gazebo/trunk/server/audio_video/AudioDecoder.hh
code/gazebo/trunk/server/audio_video/OpenAL.cc
code/gazebo/trunk/server/gui/GLFrame.cc
Modified: code/gazebo/trunk/server/World.cc
===================================================================
--- code/gazebo/trunk/server/World.cc 2009-02-10 08:14:48 UTC (rev 7325)
+++ code/gazebo/trunk/server/World.cc 2009-02-10 18:16:15 UTC (rev 7326)
@@ -125,7 +125,8 @@
}
// Load OpenAL audio
- OpenAL::Instance()->Load( rootNode->GetChild("openal", "audio") );
+ if (rootNode->GetChild("openal","audio"))
+ OpenAL::Instance()->Load( rootNode->GetChild("openal", "audio") );
this->physicsEngine = new ODEPhysics(); //TODO: use exceptions here
Modified: code/gazebo/trunk/server/audio_video/AudioDecoder.hh
===================================================================
--- code/gazebo/trunk/server/audio_video/AudioDecoder.hh 2009-02-10
08:14:48 UTC (rev 7325)
+++ code/gazebo/trunk/server/audio_video/AudioDecoder.hh 2009-02-10
18:16:15 UTC (rev 7326)
@@ -2,8 +2,8 @@
#define AUDIODECODER_HH
extern "C" {
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
+#include <avformat.h>
+#include <avcodec.h>
}
#include <string>
Modified: code/gazebo/trunk/server/audio_video/OpenAL.cc
===================================================================
--- code/gazebo/trunk/server/audio_video/OpenAL.cc 2009-02-10 08:14:48 UTC
(rev 7325)
+++ code/gazebo/trunk/server/audio_video/OpenAL.cc 2009-02-10 18:16:15 UTC
(rev 7326)
@@ -121,17 +121,17 @@
/// Finalize
void OpenAL::Fini()
{
+ if (this->audioDevice)
+ {
+ alcCloseDevice(this->audioDevice);
+ }
+
if (this->context)
{
this->context = alcGetCurrentContext();
alcMakeContextCurrent(NULL);
alcDestroyContext(this->context);
}
-
- if (this->audioDevice)
- {
- alcCloseDevice(this->audioDevice);
- }
}
////////////////////////////////////////////////////////////////////////////////
Modified: code/gazebo/trunk/server/gui/GLFrame.cc
===================================================================
--- code/gazebo/trunk/server/gui/GLFrame.cc 2009-02-10 08:14:48 UTC (rev
7325)
+++ code/gazebo/trunk/server/gui/GLFrame.cc 2009-02-10 18:16:15 UTC (rev
7326)
@@ -95,6 +95,8 @@
// Set default starting pose of the camera
this->startPose.pos.Set(-2, 0, 2);
this->startPose.rot.SetFromEuler( Vector3(0, DTOR(30), 0) );
+
+ this->saveFrames = false;
}
////////////////////////////////////////////////////////////////////////////////
@@ -107,6 +109,7 @@
// Load the frame
void GLFrame::Load( XMLConfigNode *node )
{
+
this->saveFrames = false;
if (node)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
