Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 264965 Details for
Bug 348605
games-arcade/monster-masher is incompatible with gnome-base/libgnome-2.32.0
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
port to use libcanberra
monster-masher-1.8.1-libcanberra.patch (text/plain), 1.70 KB, created by
David Leverton
on 2011-03-06 16:28:42 UTC
(
hide
)
Description:
port to use libcanberra
Filename:
MIME Type:
Creator:
David Leverton
Created:
2011-03-06 16:28:42 UTC
Size:
1.70 KB
patch
obsolete
>--- monster-masher-1.8.1/configure.ac~ 2008-11-09 20:52:01.000000000 +0000 >+++ monster-masher-1.8.1/configure.ac 2011-03-06 13:08:42.000000000 +0000 >@@ -18,7 +18,8 @@ > gconfmm-2.6 >= 2.6.0 \ > gtkmm-2.4 >= 2.6.0 \ > libgnomecanvasmm-2.6 >= 2.6.0 \ >- libglademm-2.4 >= 2.4.0) >+ libglademm-2.4 >= 2.4.0 \ >+ libcanberra) > AC_SUBST(DEPS_CFLAGS) > AC_SUBST(DEPS_LIBS) > >--- monster-masher-1.8.1/src/sound.hpp~ 2007-01-06 16:16:30.000000000 +0000 >+++ monster-masher-1.8.1/src/sound.hpp 2011-03-06 13:12:47.000000000 +0000 >@@ -22,6 +22,7 @@ > #define SOUND_HPP > > #include <string> >+#include <canberra.h> > > #include "helpers.hpp" > >@@ -39,8 +40,7 @@ > private: > Sound(); > >- typedef std::map<std::string, int> cache_map; >- cache_map cache; >+ ca_context *ctx; > }; > > #endif >--- monster-masher-1.8.1/src/sound.cpp~ 2007-01-06 16:16:30.000000000 +0000 >+++ monster-masher-1.8.1/src/sound.cpp 2011-03-06 13:19:35.000000000 +0000 >@@ -30,26 +30,23 @@ > return s; > } > >-Sound::Sound() >+Sound::Sound() : >+ ctx(0) > { >+ ca_context_create(&ctx); > } > > Sound::~Sound() > { >+ if (ctx) >+ ca_context_destroy(ctx); > } > > void Sound::play(const std::string &name) > { >- int id; >- >- cache_map::iterator i = cache.find(name); >- if (i != cache.end()) >- id = i->second; >- else { >- id = gnome_sound_sample_load(name.c_str(), >- (MONSTER_MASHER_SOUND_DIR + name).c_str()); >- cache.insert(make_pair(name, id)); >- } >- >- esd_sample_play(gnome_sound_connection_get(), id); >+ if (ctx) >+ ca_context_play(ctx, 0, >+ CA_PROP_MEDIA_FILENAME, (MONSTER_MASHER_SOUND_DIR + name).c_str(), >+ CA_PROP_CANBERRA_CACHE_CONTROL, "permanent", >+ NULL); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 348605
:
257019
|
264965
|
265083