mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-05-02 06:47:59 +03:00
Combined OpenAL+Audiere sound test now compiles and runs, but segfaults
This commit is contained in:
parent
9e332c4067
commit
56f9daed96
13 changed files with 142 additions and 172 deletions
|
@ -2,6 +2,8 @@
|
|||
|
||||
#include "../../stream/clients/audiere_file.h"
|
||||
|
||||
using namespace Mangle::Stream;
|
||||
|
||||
// Exception handling
|
||||
class Audiere_Exception : public std::exception
|
||||
{
|
||||
|
@ -109,11 +111,11 @@ AudiereSource::AudiereSource(const std::string &file)
|
|||
setup();
|
||||
}
|
||||
|
||||
AudiereSource::AudiereSource(Stream::StreamPtr input)
|
||||
AudiereSource::AudiereSource(StreamPtr input)
|
||||
{
|
||||
// Use our Stream::AudiereFile implementation to convert a Mangle
|
||||
// 'Stream' to an Audiere 'File'
|
||||
sample = OpenSampleSource(new Stream::AudiereFile(input));
|
||||
sample = OpenSampleSource(new AudiereFile(input));
|
||||
if(!sample)
|
||||
fail("Couldn't load stream");
|
||||
|
||||
|
@ -125,7 +127,7 @@ AudiereSource::AudiereSource(audiere::SampleSourcePtr src)
|
|||
{ assert(sample); setup(); }
|
||||
|
||||
// Common function called from all constructors
|
||||
AudiereSource::setup()
|
||||
void AudiereSource::setup()
|
||||
{
|
||||
assert(sample);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue