r3512 - in packages/trunk/ultrastar-ng/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-01 08:27:44 +0000 (Wed, 01 Aug 2007)
New Revision: 3512

Added:
   packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch
Modified:
   packages/trunk/ultrastar-ng/debian/changelog
   packages/trunk/ultrastar-ng/debian/patches/series
Log:
Added patch to prevent incorrect singing screens in songs with wrong #BACKGROUND or #VIDEO headers (Closes: #435383)



Modified: packages/trunk/ultrastar-ng/debian/changelog
===================================================================
--- packages/trunk/ultrastar-ng/debian/changelog	2007-07-31 22:02:00 UTC (rev 3511)
+++ packages/trunk/ultrastar-ng/debian/changelog	2007-08-01 08:27:44 UTC (rev 3512)
@@ -3,7 +3,10 @@
   [ Miriam Ruiz ]
   * Added patch to support previewing ogg files with xine (Closes: #430531)
   * Added patch to check that SDL is properly initialized (Closes: #427386)
+  * Added patch to prevent incorrect singing screens in songs with wrong
+    #BACKGROUND or #VIDEO headers (Closes: #435383)
 
+
   [ Jon Dowland ]
   * update menu section to "Games/Action" for menu policy transition.
     Thanks Linas Žvirblis.

Modified: packages/trunk/ultrastar-ng/debian/patches/series
===================================================================
--- packages/trunk/ultrastar-ng/debian/patches/series	2007-07-31 22:02:00 UTC (rev 3511)
+++ packages/trunk/ultrastar-ng/debian/patches/series	2007-08-01 08:27:44 UTC (rev 3512)
@@ -1,3 +1,4 @@
 exclude_docs.patch
 xine_ogg.patch
 check_sdl_init.patch
+sing_screen.patch

Added: packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch
===================================================================
--- packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch	                        (rev 0)
+++ packages/trunk/ultrastar-ng/debian/patches/sing_screen.patch	2007-08-01 08:27:44 UTC (rev 3512)
@@ -0,0 +1,35 @@
+# Debian Bug Report #435383
+# If the background image is missing the singing screen shows the last available background image.
+# This patch solves this bug
+# http://ultrastar-ng.cvs.sourceforge.net/ultrastar-ng/UltraStar-ng/src/screen_sing.cpp?r1=1.70&r2=1.71&view=patch
+
+--- ultrastar-ng-0.1.4/src/screen_sing.cpp.orig	2007-08-01 08:08:18.000000000 +0000
++++ ultrastar-ng-0.1.4/src/screen_sing.cpp	2007-08-01 08:08:33.000000000 +0000
+@@ -23,7 +23,6 @@
+ 			screen->format->Bmask,
+ 			screen->format->Amask);
+ 	SDL_SetAlpha(videoSurf, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
+-	//SDL_FillRect(videoSurf,NULL,0xffffff);
+ 	backgroundSurf = SDL_AllocSurface( screen->flags,
+ 			sm->getWidth(),
+ 			sm->getHeight(),
+@@ -54,16 +53,18 @@
+ 	CScreenManager * sm = CScreenManager::getSingletonPtr();
+ 	CSong * song = sm->getSong();
+         
++	SDL_FillRect(backgroundSurf,NULL,SDL_MapRGB(backgroundSurf->format, 255, 255, 255));
+ 	if( song->video != NULL ) {
+ 		snprintf(buff,1024,"%s/%s",song->path,song->video);
+ 		fprintf(stdout,"Now playing: (%d): %s\n",sm->getSongId(),buff);
+ 		video->loadVideo(buff,videoSurf,sm->getWidth(),sm->getHeight());
++		SDL_BlitSurface(theme->bg->getSDLSurface(),NULL,backgroundSurf,NULL);
++		SDL_BlitSurface(theme->p1box->getSDLSurface(),NULL,backgroundSurf,NULL);
+ 	} else if ( song->background != NULL) {
+ 		SDL_BlitSurface(song->backgroundSurf,NULL,backgroundSurf,NULL);
+ 		SDL_BlitSurface(theme->bg->getSDLSurface(),NULL,backgroundSurf,NULL);
+ 		SDL_BlitSurface(theme->p1box->getSDLSurface(),NULL,backgroundSurf,NULL);
+ 	} else {
+-		SDL_FillRect(backgroundSurf,NULL,SDL_MapRGB(backgroundSurf->format, 255, 255, 255));
+ 		SDL_BlitSurface(theme->bg->getSDLSurface(),NULL,backgroundSurf,NULL);
+ 		SDL_BlitSurface(theme->p1box->getSDLSurface(),NULL,backgroundSurf,NULL);
+ 	}