diff options
| author | Bertrand Lorentz <bertrand.lorentz@gmail.com> | 2011-01-30 21:39:08 +0100 |
|---|---|---|
| committer | Bertrand Lorentz <bertrand.lorentz@gmail.com> | 2011-01-30 21:58:19 +0100 |
| commit | 586ec5ab1a7c1a48db5bccbb45acb9b94691d4bd (patch) | |
| tree | fd07a063d15e02f91268a4166dfd39c0865a445c /build/m4 | |
| parent | a3f266a5e2322baadad6c702aa8ec949c71e4f3a (diff) | |
SoundMenu: Implement the new registration process
The sound menu included in Ubuntu Natty (indicator-sound > 0.5.8)
now automatically detects MPRIS applications appearing on the bus. So we
don't have to register explicitly anymore.
Unregistering is done by adding ourselves in a black-list of players
which won't appear in the sound menu. This should be done through
GSettings, but indicator-sound kindly provides us with a d-bus method
for that.
This means that the build dependency on indicate-sharp is now optional
and can be substituted by a runtime dependency on indicator-sound >
0.5.8.
For compatibility with Ubuntu Maverick, we still do the explicit
registration with indicate-sharp. This will just be ignored by
indicator-sound provided on Natty.
This is all hidden away in a new SoundMenuProxy class, to keep things
reasonably sane.
Diffstat (limited to 'build/m4')
| -rw-r--r-- | build/m4/banshee/soundmenu.m4 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build/m4/banshee/soundmenu.m4 b/build/m4/banshee/soundmenu.m4 index afcd33edd..9522feb68 100644 --- a/build/m4/banshee/soundmenu.m4 +++ b/build/m4/banshee/soundmenu.m4 @@ -12,11 +12,9 @@ AC_DEFUN([BANSHEE_CHECK_SOUNDMENU], PKG_CHECK_MODULES(INDICATESHARP, indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED, has_indicatesharp=yes, has_indicatesharp=no) - if test "x$has_indicatesharp" = "xno"; then - AC_MSG_ERROR([indicate-sharp was not found or is not up to date. Please install indicate-sharp of at least version $LIBINDICATESHARP_REQUIRED, or disable sound menu support by passing --disable-soundmenu]) - fi fi + AM_CONDITIONAL(HAVE_INDICATESHARP, test "x$has_indicatesharp" = "xyes") AM_CONDITIONAL(ENABLE_SOUNDMENU, test "x$enable_soundmenu" = "xyes") ]) |