lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some refactoring, moved C++ allocation into the *_Alloc function instead of directly in new, removed new in most of classes too. Cloning should work on all copyable classes now.

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1802 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
groogy 2011-02-27 14:07:10 +00:00
parent 0a2abc6933
commit 7d7c4c999f
26 changed files with 235 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bindings/ruby/sfml-audio/audio/Sound.cpp
View file

@ -91,6 +91,16 @@ static VALUE Sound_Initialize( int argc, VALUE *args, VALUE self )
return self;
}
static VALUE Sound_InitializeCopy( VALUE self, VALUE aSource )
{
sf::Sound *selfObject = NULL;
Data_Get_Struct( self, sf::Sound, selfObject );
sf::Sound *sourceObject = NULL;
Data_Get_Struct( aSource, sf::Sound, sourceObject );
*selfObject = *sourceObject;
return self;
}
/* call-seq:
* sound.play()
*
@ -269,12 +279,10 @@ static VALUE Sound_ResetBuffer( VALUE self )
return Qnil;
}
static VALUE Sound_New( int argc, VALUE *args, VALUE aKlass )
static VALUE Sound_Alloc( VALUE aKlass )
{
sf::Sound *object = new sf::Sound();
VALUE rbData = Data_Wrap_Struct( aKlass, 0, Sound_Free, object );
rb_obj_call_init( rbData, argc, args );
return rbData;
return Data_Wrap_Struct( aKlass, 0, Sound_Free, object );
}
void Init_Sound( void )
@ -312,10 +320,12 @@ void Init_Sound( void )
globalSoundClass = rb_define_class_under( sfml, "Sound", globalSoundSourceClass );
// Class methods
rb_define_singleton_method( globalSoundClass, "new", Sound_New, -1 );
//rb_define_singleton_method( globalSoundClass, "new", Sound_New, -1 );
rb_define_alloc_func( globalSoundClass, Sound_Alloc );
// Instance methods
rb_define_method( globalSoundClass, "initialize", Sound_Initialize, 0 );
rb_define_method( globalSoundClass, "initialize_copy", Sound_InitializeCopy, 1 );
rb_define_method( globalSoundClass, "play", Sound_Play, 0 );
rb_define_method( globalSoundClass, "pause", Sound_Pause, 0 );
rb_define_method( globalSoundClass, "stop", Sound_Stop, 0 );