reverting last experimental, release 2.536

asb-capfan · Jan 4, 2012 · 095b0fb · 095b0fb
1 parent ea3ef5f
commit 095b0fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 68 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,33 +1,19 @@
 Revision history for Perl extension SDL_perl.
 
-* 2.535_07 Jan 03 2011
-	- SDL::Mixer::Channels callback: experimental usage of sv_dup [FROGGS]
+Versioning rule: public releases are even numbers, dev releases are odd. (same like perl dist)
 
-* 2.535_06 Dec 30 2011
+* 2.536 Jan 04 2011
 	- using INT2PTR to convert stored pointers to right size and hide warnings [FROGGS]
-
-* 2.535_05 Dec 28 2011
 	- SDL::Mixer::Channels: using malloc instead of safemalloc [FROGGS]
-
-* 2.535_04 Dec 26 2011
 	- SDL::Mixer::Channels: get_chunk returns a copy of the retrieved chunk
 	  that we can free safely [FROGGS]
 	- SDL::Mixer::MixChunk: added condition to destructor [FROGGS]
-
-* 2.535_03 Dec 4 2011
 	- SDL::Mixer::Music: added load_MUS_RW [FROGGS]
 	- defines.h: added VERSION_ATLEAST macro [FROGGS]
-
-* 2.535_02 Dec 2 2011
 	- src/SDLx/Surface.xs: fixed perl-5.8.9 crash while shifting from empty AV [FROGGS]
-
-* 2.535_01 Nov 5 2011
-	- Merged in memory leak fixes [dod]
+	- memory leak fixes [dod]
 
 * 2.534 October 27 2011
-	- Combined release of 2.534_*
-
-* 2.534_03 October 06 2011
 	- SDL::Palette fixed colors() to return an array [Blaizer]
 	- SDL::Video fixed set_colors, set_palette [FROGGS, Blaizer]
 	- SDLx::Text improved error message [garu]
@@ -43,15 +29,9 @@ Revision history for Perl extension SDL_perl.
 	- SDL::Event fixed SDL_EVENTMASK documentation [jtpalmer]
 	- SDL::RWOps got SDL::RWOps->from_const_mem working, updated docs [FROGGS]
 	- SDL::Video updated xs and docs for blit_surface using undefined rects [FROGGS]
-
-* 2.534_02 August 27 2011
-	New features:
 	- SDLx::Surface: added methods draw_trigon, draw_ellipse, draw_arc and draw_bezier [jtpalmer]
-	Bug fixes:
 	- SDLx::Rect: fixed methods copy, move and inflate [jtpalmer]
 	- SDLx::Surface: minor documentation update [jtpalmer]
-
-* 2.534_01 June 13 2011
 	- Using 'perl' instead of 'SDLPerl' to run silent tests on darwin [FROGGS]
 
 * 2.533 May 31 2011
@@ -65,8 +45,6 @@ Revision history for Perl extension SDL_perl.
 
 * 2.532 March 27 2011
 	- Tested and released experimental branch
-
-* 2.531_02 March 20 2011
 	- using parent Perls context in SDL::Mixer::Music's callbacks instead of TLS [FROGGS]
 	- Adding sleep(2) to core_palette.t [FROGGS]
 	- Loading threads before Test::More in several SDL::Mixer tests [kthakore]
@@ -77,8 +55,6 @@ Revision history for Perl extension SDL_perl.
 	- Rewrote INSTALL and README file [Pip]
 	- SDLx::Surface: added tests for draw_rect with transparency/translucency [garu]
 	- SDLx::Surface: fixed option handling, center and right alignment in write_to/xy [FROGGS]
-
-* 2.531_01 March 9 2011
 	New features:
 	- SDLx::Surface    draw_polygon(), linking GFX to Surfaces when available [FROGGS]
 	- SDLx::Controller exit_on_quit() and eoq() accessors [garu]
@@ -126,19 +102,13 @@ Revision history for Perl extension SDL_perl.
 
 * 2.527 Jan 18 2011
 	- Critical memory leak fixed in SDLx::App
-
-* 2.526_2 Jan 18 2011
 	- SMPEG compile test
-
-* 2.526_1 Jan 11 2011
 	- Experimental SMPEG support, new tests:
 	- Fixed Mac regression due to ppport
 
 * 2.526 Dec 31 2010
 	- Inline with 'SDL' support
 	- Decreasing some SDL_Validate scalar leaks
-
-* 2.525_5
 	- Fixed bug with SDL::Mixer::Music::hook_music, arg was freed too early [FROGGS]
 	- Added Module::Build::SDL, a helper for creating SDL based modules [kthakore]
 	- AudioSpec callbacks are using *_TLS_CONTEXT macros [FROGGS]
@@ -265,16 +235,13 @@ Revision history for Perl extension SDL_perl.
 	- *nix users gets a stack dumper of segfault
 
 * 2.500  July 9 2010
-
 	- Fixed Memory Leaks due to perl desturct level
 	- Fixed Memory leak in SDL::Mixer::Music
 	- Fixed the test on SDLx::Sprite
 	- Modified SDLx::FPS [Blaizer]
 	- Cleaned up docs [Blaizer]
 	- Cleaned up docs for SDLx::Rect and added Category
 	- Added SDLx::SFont and docs and test
-
-* 2.5 RC
 	- Fixed SDL::Surface->get_pixels_ptr
 	- Removed SDL::OpenGL, SDL::Game::Event
 	- Moved SDL::App -> SDLx::App, SDL::Game -> SDLx::Rect
@@ -319,13 +286,11 @@ Revision history for Perl extension SDL_perl.
 	- Critical bug with 'static memory and array free in gfx' [kthakore]
 	- Bug fixes for mandriva [kthakore]
 
-* 2.4  Tue Apr 06 2010
+* 2.400  Tue Apr 06 2010
 	- MacOSX testing
 	- Pango working with frozen-bubble
 	- Clean up with back compatible stuff
 	- Dropped SVG and Sound
-
-* 2.3_9  Sun Mar 28 2010
 	- all constants are in their modules, exported by default and documented [FROGGS]
 	- Moved SDL::Net away [FROGGS]
 	- Pango XS/tests/docs [FROGGS]
@@ -335,8 +300,6 @@ Revision history for Perl extension SDL_perl.
 	- examples made to work with new API [mantovani]
 	- manifest fix for MacOSX [kthakore]
 	- some measly docs [kthakore]
-
-* 2.3_8  Sat Mar 20 2010
 	- TTF XS/tests/docs [#85] [FROGGS]
 	- Minor fixes and cleanup [ kthakore, kmx ]
 	- added more version checks to SDL::GFX XS [#79] [FROGGS]
@@ -345,21 +308,15 @@ Revision history for Perl extension SDL_perl.
 	- Directory clean up [FROGGS]
 	- Surface double free fix for picky kernel [kthakore]
 	- SDL::Events documentation [kthakore]
-
-* 2.3_7  Mon Mar 08 2010
 	- Mixer XS/tests/docs [kthakore, FROGGS]
 	- Fixes for Build system on cygwin [kmx]
-
-* 2.3_6  Wed Feb 24 2010
 	- Moved mixer code into correct locations [kthakore]
 	- Cleaned up last of SDL xs [kthakore]
 	- Update Build system [kmx]
 	- Fixed up my_perl assumption for non threaded perl [kthakore, ruoso]
 	- 64 bit and MacOSX fixes in builds[ kmx, kthakore ]
 	- Prepared XS to build when no threading available [kthakore]
 	- Minor bug fixes in test for core.t with PERL_SAFE_PUTENV [kthakore]
-
-* 2.3_5  Sun Jan 31 2010
 	- Fixed serious XS mem leaks in AV* [FROGGS]
 	- Removed usless verify method in SDL.pm [J_King]
 	- GFX rotozoom started [FROGGS]
@@ -368,8 +325,6 @@ Revision history for Perl extension SDL_perl.
 	- SDL::App resize fixed [kthakore, TonyC] {http://rt.cpan.org/Public/Bug/Display.html?id=16984}
 	- Migrated O_OBJECT to thread safe bag [ruoso, kthakore]
 	- Update time docs [kthakore]
-
-* 2.3_3  Mon Dec 07 2009
 	- SDL::Image implemented and tested [#72] [kthakore]
 	- FreeBSD SDL test clean up [#75] [kthakore]
 	- Handle GFX seperate headers in Build [FROGGS,kthakore]
@@ -379,11 +334,7 @@ Revision history for Perl extension SDL_perl.
 	- Replaced test file for MixMusic (proper file format) [FROGGS]
 	- Added license information file (README) for test/data [FROGGS]
 	- Moved mixer stuff from SDL:: to SDL::Mixer:: [FROGGS]
-
-* 2.3_1  Sun Nov 29 2009
 	- General fixup for CPAN
-
-* 2.3_0  Sun Nov 29 2009
 	- General Memory leaking stopping [kthakore, acme]
 	- More complete unit testing [kthakore, acme, FROGGS]
 	- Fix bug with TTFSizeText, it actually returns 0 on success [acme]

diff --git a/lib/SDL.pm b/lib/SDL.pm
@@ -54,7 +54,7 @@ our %EXPORT_TAGS = (
 	defaults => $SDL::Constants::EXPORT_TAGS{'SDL/defaults'}
 );
 
-our $VERSION = '2.535_07';
+our $VERSION = '2.536';
 $VERSION = eval $VERSION;
 
 print "$VERSION" if ( defined( $ARGV[0] ) && ( $ARGV[0] eq '--SDLperl' ) );

diff --git a/src/Mixer/Channels.xs b/src/Mixer/Channels.xs
@@ -28,7 +28,7 @@ static SV * cb = (SV*)NULL;
 
 void callback(int channel)
 {
-	ENTER_TLS_CONTEXT;
+	PERL_SET_CONTEXT(parent_perl);
 	dSP;
 	ENTER;
 	SAVETMPS;
@@ -38,22 +38,10 @@ void callback(int channel)
 	PUTBACK;
 
 	if(cb)
-	{
-		if(PERL_GET_CONTEXT == parent_perl)
-			call_sv(cb, G_VOID);
-		else
-		{
-			CLONE_PARAMS clone_params;
-			clone_params.stashes = newAV();
-			clone_params.flags   = CLONEf_KEEP_PTR_TABLE;
-			call_sv(sv_dup(cb, &clone_params), G_VOID);
-		}
-	}
+		call_sv(cb, G_VOID);
 
 	FREETMPS;
 	LEAVE;
-
-	LEAVE_TLS_CONTEXT;
 }
 #endif