r10758 - in packages/trunk/zaz/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Sat Jan 30 15:21:49 UTC 2010
Author: miriam
Date: 2010-01-30 15:21:49 +0000 (Sat, 30 Jan 2010)
New Revision: 10758
Modified:
packages/trunk/zaz/debian/changelog
packages/trunk/zaz/debian/patches/no_music.patch
Log:
It's not ready for release yet. It hangs when exiting in my computer trying to shut the audio system down.
Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog 2010-01-30 14:36:51 UTC (rev 10757)
+++ packages/trunk/zaz/debian/changelog 2010-01-30 15:21:49 UTC (rev 10758)
@@ -1,4 +1,4 @@
-zaz (0.3.1+dfsg1-1) unstable; urgency=low
+zaz (0.3.1+dfsg1-1) UNRELEASED; urgency=low
* New Upstream Release
- Level sets
Modified: packages/trunk/zaz/debian/patches/no_music.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music.patch 2010-01-30 14:36:51 UTC (rev 10757)
+++ packages/trunk/zaz/debian/patches/no_music.patch 2010-01-30 15:21:49 UTC (rev 10758)
@@ -41,26 +41,49 @@
CenterMsg(_("Kinga Dybka"), 25.5, font, 0.1);
--- a/src/game.cpp
+++ b/src/game.cpp
-@@ -235,7 +235,7 @@ const string Game::getRandomMusic()
+@@ -235,7 +235,8 @@ const string Game::getRandomMusic()
}
else
{
- ERR("No music files installed");
+ //ERR("No music files installed");
++ *phname='\0';
}
return string(phname);
}
--- a/src/streamingoggsample.cpp
+++ b/src/streamingoggsample.cpp
-@@ -30,7 +30,10 @@ StreamingOggSample::StreamingOggSample(c
+@@ -27,10 +27,16 @@ StreamingOggSample::StreamingOggSample(c
+ bufflen = 0;
+ buff = 0;
+
++ if (filename == "")
++ {
++ goto error;
++ }
++
inphile = fopen(settings.getCFilename (filename), "rb");
if (inphile == NULL)
{
- ERR("Could not open " + filename);
+ //ERR("Could not open " + filename);
++ goto error;
+ }
+
+ if (ov_open_callbacks(inphile, &vf, NULL, 0, OV_CALLBACKS_NOCLOSE) < 0)
+@@ -45,6 +51,15 @@ StreamingOggSample::StreamingOggSample(c
+ length = ov_pcm_total(&vf, -1) * channels;
+
+ loaded = true;
++
++ return;
++
++error:
++ vi=NULL;
+ channels = 0;
+ length = 0;
++ loaded = false;
+ return;
- }
+ }
- if (ov_open_callbacks(inphile, &vf, NULL, 0, OV_CALLBACKS_NOCLOSE) < 0)
+ StreamingOggSample::~StreamingOggSample()
More information about the Pkg-games-commits
mailing list