This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository planetblupi.
commit 21bd7d3e90a9f830b7bd7713d3ff370e2b75f923
Author: Mathieu Schroeter <math...@schroetersa.ch>
Date: Thu Dec 7 11:01:01 2017 +0100
Use ogg music files instead of midi
It prevents different behaviour between OS.
---
resources/music/music000.mid | Bin 131400 -> 0 bytes
resources/music/music000.ogg | Bin 0 -> 12724663 bytes
resources/music/music001.mid | Bin 150115 -> 0 bytes
resources/music/music001.ogg | Bin 0 -> 12472314 bytes
resources/music/music002.mid | Bin 160403 -> 0 bytes
resources/music/music002.ogg | Bin 0 -> 12009171 bytes
resources/music/music003.mid | Bin 90444 -> 0 bytes
resources/music/music003.ogg | Bin 0 -> 9254922 bytes
resources/music/music004.mid | Bin 91458 -> 0 bytes
resources/music/music004.ogg | Bin 0 -> 4854247 bytes
resources/music/music005.mid | Bin 184644 -> 0 bytes
resources/music/music005.ogg | Bin 0 -> 4710862 bytes
resources/music/music006.mid | Bin 97149 -> 0 bytes
resources/music/music006.ogg | Bin 0 -> 4602855 bytes
resources/music/music007.mid | Bin 151127 -> 0 bytes
resources/music/music007.ogg | Bin 0 -> 4800059 bytes
resources/music/music008.mid | Bin 139355 -> 0 bytes
resources/music/music008.ogg | Bin 0 -> 4853980 bytes
resources/music/music009.mid | Bin 191817 -> 0 bytes
resources/music/music009.ogg | Bin 0 -> 4509020 bytes
src/event.cxx | 2 +-
21 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/music/music000.mid b/resources/music/music000.mid
deleted file mode 100644
index 172145c..0000000
Binary files a/resources/music/music000.mid and /dev/null differ
diff --git a/resources/music/music000.ogg b/resources/music/music000.ogg
new file mode 100644
index 0000000..5c47708
Binary files /dev/null and b/resources/music/music000.ogg differ
diff --git a/resources/music/music001.mid b/resources/music/music001.mid
deleted file mode 100644
index 3a408a2..0000000
Binary files a/resources/music/music001.mid and /dev/null differ
diff --git a/resources/music/music001.ogg b/resources/music/music001.ogg
new file mode 100644
index 0000000..97d95e6
Binary files /dev/null and b/resources/music/music001.ogg differ
diff --git a/resources/music/music002.mid b/resources/music/music002.mid
deleted file mode 100644
index 4d29210..0000000
Binary files a/resources/music/music002.mid and /dev/null differ
diff --git a/resources/music/music002.ogg b/resources/music/music002.ogg
new file mode 100644
index 0000000..0a05f53
Binary files /dev/null and b/resources/music/music002.ogg differ
diff --git a/resources/music/music003.mid b/resources/music/music003.mid
deleted file mode 100644
index 6bcab72..0000000
Binary files a/resources/music/music003.mid and /dev/null differ
diff --git a/resources/music/music003.ogg b/resources/music/music003.ogg
new file mode 100644
index 0000000..de58b17
Binary files /dev/null and b/resources/music/music003.ogg differ
diff --git a/resources/music/music004.mid b/resources/music/music004.mid
deleted file mode 100644
index b7d4e38..0000000
Binary files a/resources/music/music004.mid and /dev/null differ
diff --git a/resources/music/music004.ogg b/resources/music/music004.ogg
new file mode 100644
index 0000000..7a19d3e
Binary files /dev/null and b/resources/music/music004.ogg differ
diff --git a/resources/music/music005.mid b/resources/music/music005.mid
deleted file mode 100644
index 08fba67..0000000
Binary files a/resources/music/music005.mid and /dev/null differ
diff --git a/resources/music/music005.ogg b/resources/music/music005.ogg
new file mode 100644
index 0000000..2dd982a
Binary files /dev/null and b/resources/music/music005.ogg differ
diff --git a/resources/music/music006.mid b/resources/music/music006.mid
deleted file mode 100644
index e511b04..0000000
Binary files a/resources/music/music006.mid and /dev/null differ
diff --git a/resources/music/music006.ogg b/resources/music/music006.ogg
new file mode 100644
index 0000000..057788d
Binary files /dev/null and b/resources/music/music006.ogg differ
diff --git a/resources/music/music007.mid b/resources/music/music007.mid
deleted file mode 100644
index f0853ca..0000000
Binary files a/resources/music/music007.mid and /dev/null differ
diff --git a/resources/music/music007.ogg b/resources/music/music007.ogg
new file mode 100644
index 0000000..8d782f2
Binary files /dev/null and b/resources/music/music007.ogg differ
diff --git a/resources/music/music008.mid b/resources/music/music008.mid
deleted file mode 100644
index ee7d6c3..0000000
Binary files a/resources/music/music008.mid and /dev/null differ
diff --git a/resources/music/music008.ogg b/resources/music/music008.ogg
new file mode 100644
index 0000000..b05d67d
Binary files /dev/null and b/resources/music/music008.ogg differ
diff --git a/resources/music/music009.mid b/resources/music/music009.mid
deleted file mode 100644
index fbb4773..0000000
Binary files a/resources/music/music009.mid and /dev/null differ
diff --git a/resources/music/music009.ogg b/resources/music/music009.ogg
new file mode 100644
index 0000000..a9a0714
Binary files /dev/null and b/resources/music/music009.ogg differ
diff --git a/src/event.cxx b/src/event.cxx
index 10572a2..9680eb9 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3360,7 +3360,7 @@ CEvent::ChangePhase (Uint32 phase)
music = m_pDecor->GetMusic ();
if (music > 0)
{
- filename = string_format ("music/music%.3d.mid", music - 1);
+ filename = string_format ("music/music%.3d.ogg", music - 1);
m_pSound->StopMusic ();
m_pSound->PlayMusic (filename);
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/planetblupi.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
