Packman Build Service PMBS

lightspark.spec Changed

lightspark.tar.xz/src/backends/interfaces/audio/sdl/SDLPlugin.cpp Changed

@@ -52,16 +52,7 @@
 		sdl_available = !SDL_InitSubSystem ( SDL_INIT_AUDIO );
 	else
 		sdl_available = !SDL_Init ( SDL_INIT_AUDIO );
-	if (Mix_OpenAudio (LIGHTSPARK_AUDIO_SDL_SAMPLERATE, AUDIO_S16, 2, LIGHTSPARK_AUDIO_SDL_BUFERSIZE) < 0)
-	{
-		LOG(LOG_ERROR,"Couldn't open SDL_mixer");
-		sdl_available = 0;
-		SDL_QuitSubSystem ( SDL_INIT_AUDIO );
-		if (!SDL_WasInit(0))
-			SDL_Quit ();
-		return;
-	}
-	Mix_Pause(-1);
+	mixeropened = 0;
 }
 void SDLPlugin::set_device(std::string desiredDevice,
 		IAudioPlugin::DEVICE_TYPES desiredType)
@@ -73,6 +64,16 @@
 {
 	if (!sdl_available)
 		return NULL;
+	if (!mixeropened)
+	{
+		if (Mix_OpenAudio (LIGHTSPARK_AUDIO_SDL_SAMPLERATE, AUDIO_S16, 2, LIGHTSPARK_AUDIO_SDL_BUFERSIZE) < 0)
+		{
+			LOG(LOG_ERROR,"Couldn't open SDL_mixer");
+			sdl_available = 0;
+			return NULL;
+		}
+		mixeropened = 1;
+	}
 
 	SDLAudioStream *stream = new SDLAudioStream(this);
 	stream->decoder = decoder;
@@ -92,9 +93,12 @@
 	for (stream_iterator it = streams.begin(); it != streams.end(); ++it) {
 		delete *it;
 	}
-	if (sdl_available)
+	if (mixeropened)
 	{
 		Mix_CloseAudio();
+	}
+	if (sdl_available)
+	{
 		SDL_QuitSubSystem ( SDL_INIT_AUDIO );
 		if (!SDL_WasInit(0))
 			SDL_Quit ();
@@ -174,7 +178,7 @@
 
 bool SDLAudioStream::ispaused()
 {
-	return SDL_GetAudioStatus() != SDL_AUDIO_PLAYING;
+	return Mix_Paused(mixer_channel);
 }
 
 bool SDLAudioStream::isValid()

lightspark.tar.xz/src/backends/interfaces/audio/sdl/SDLPlugin.h Changed

lightspark.tar.xz/src/backends/rendering.cpp Changed

lightspark.tar.xz/src/backends/rendering.h Changed

lightspark.tar.xz/src/main.cpp Changed

@@ -35,8 +35,9 @@
 class StandaloneEngineData: public EngineData
 {
 	guint destroyHandlerId;
+	guint deleteHandlerId;
 public:
-	StandaloneEngineData() : destroyHandlerId(0)
+	StandaloneEngineData() : destroyHandlerId(0),deleteHandlerId(0)
 	{
 #ifndef _WIN32
 		visual = XVisualIDFromVisual(gdk_x11_visual_get_xvisual(gdk_visual_get_system()));
@@ -52,6 +53,8 @@
 	{
 		if(widget)
 		{
+			if(deleteHandlerId)
+				g_signal_handler_disconnect(widget, deleteHandlerId);
 			if(destroyHandlerId)
 				g_signal_handler_disconnect(widget, destroyHandlerId);
 
@@ -66,10 +69,17 @@
 		e->widget = NULL;
 		getSys()->setShutdownFlag();
 	}
+	static gboolean StandaloneDelete(GtkWidget *widget, gpointer data)
+	{
+		// wait for rendering complete
+		getSys()->waitRendering();
+		return FALSE;
+	}
 	GtkWidget* createGtkWidget()
 	{
 		GtkWidget* window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		gtk_window_set_title((GtkWindow*)window,"Lightspark");
+		deleteHandlerId = g_signal_connect(window,"delete_event",G_CALLBACK(StandaloneDelete),this);
 		destroyHandlerId = g_signal_connect(window,"destroy",G_CALLBACK(StandaloneDestroy),this);
 		return window;
 	}

lightspark.tar.xz/src/parsing/flv.cpp Changed

@@ -204,7 +204,7 @@
 	aligned_free(packetData);
 }
 
-AudioDataTag::AudioDataTag(std::istream& s):VideoTag(s),_isHeader(false)
+AudioDataTag::AudioDataTag(std::istream& s):VideoTag(s),_isHeader(false),packetData(NULL),packetLen(0)
 {
 	unsigned int start=s.tellg();
 	BitStream bs(s);
@@ -236,13 +236,15 @@
 		_isHeader=(t==0);
 		headerConsumed++;
 	}
-	packetLen=dataSize-headerConsumed;
-
-	aligned_malloc((void**)&packetData, 16, packetLen+16); //Ensure no overrun happens when doing aligned reads
-
-	s.read((char*)packetData,packetLen);
-	memset(packetData+packetLen,0,16);
-
+	if (dataSize > headerConsumed)
+	{
+		packetLen=dataSize-headerConsumed;
+	
+		aligned_malloc((void**)&packetData, 16, packetLen+16); //Ensure no overrun happens when doing aligned reads
+	
+		s.read((char*)packetData,packetLen);
+		memset(packetData+packetLen,0,16);
+	}
 	//Compute totalLen
 	unsigned int end=s.tellg();
 	totalLen=(end-start)+11;
@@ -250,5 +252,6 @@
 
 AudioDataTag::~AudioDataTag()
 {
-	aligned_free(packetData);
+	if (packetData)
+		aligned_free(packetData);
 }

lightspark.tar.xz/src/scripting/abc.cpp Changed

lightspark.tar.xz/src/scripting/flash/display/flashdisplay.cpp Changed

lightspark.tar.xz/src/scripting/flash/media/flashmedia.cpp Changed

lightspark.tar.xz/src/swf.cpp Changed

lightspark.tar.xz/src/swf.h Changed

Changes of Revision 95