Page MenuHomePhabricator (Chris)
Files F126944

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/sound.cpp b/util/sound.cpp
index 48a9547b..ab3ea3fe 100644
--- a/util/sound.cpp
+++ b/util/sound.cpp
@@ -1,96 +1,102 @@
#include <allegro.h>
#include <string>
#include "sound.h"
#include "load_exception.h"
using namespace std;
Sound::Sound():
my_sound( NULL ),
own( NULL ){
}
Sound::Sound( const string & path ) throw( LoadException ):
my_sound( NULL ),
own( NULL ){
my_sound = load_sample( path.c_str() );
if ( !my_sound ){
string xf( "Could not load " );
xf += path;
throw LoadException( xf );
}
own = new int;
*own = 1;
}
Sound::Sound( const Sound & copy ):
my_sound( NULL ),
own( NULL ){
own = copy.own;
if ( own ){
*own += 1;
}
my_sound = copy.my_sound;
}
void Sound::destroy(){
if ( own ){
*own -= 1;
if ( *own == 0 ){
delete own;
destroy_sample( my_sound );
own = NULL;
}
}
}
Sound & Sound::operator=( const Sound & rhs ){
if ( own ){
destroy();
}
own = rhs.own;
if ( own ){
*own += 1;
}
my_sound = rhs.my_sound;
return *this;
}
+
+void Sound::stop(){
+ if (my_sound){
+ stop_sample(my_sound);
+ }
+}
void Sound::play(){
if ( my_sound ){
play_sample( my_sound, 255, 128, 1000, false );
}
}
void Sound::play( int volume, int pan ){
if ( my_sound ){
int p = pan;
if ( p > 255 ){
p = 255;
} else if ( p < 0 ){
p = 0;
}
int v = volume;
if ( v < 0 ){
v = 0;
} else if ( v > 255 ){
v = 255;
}
play_sample( my_sound, v, p, 1000, false );
}
}
void Sound::playLoop(){
if ( my_sound ){
play_sample( my_sound, 255, 128, 1000, true );
}
}
Sound::~Sound(){
destroy();
}
diff --git a/util/sound.h b/util/sound.h
index 41e55b71..a8649d21 100644
--- a/util/sound.h
+++ b/util/sound.h
@@ -1,35 +1,36 @@
#ifndef _pain_sound_h
#define _pain_sound_h
#include <string>
#include "load_exception.h"
struct SAMPLE;
/* a sound! */
class Sound{
public:
Sound();
Sound( const std::string & path ) throw( LoadException );
Sound( const Sound & copy );
Sound & operator=( const Sound & rhs );
void play();
void play( int volume, int pan );
void playLoop();
+ void stop();
virtual ~Sound();
protected:
void destroy();
SAMPLE * my_sound;
/* reference counting */
int * own;
};
#endif

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 1:43 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
69300
Default Alt Text
(2 KB)

Event Timeline