Hello community,
here is the log from the commit of package libcanberra for openSUSE:Factory
checked in at Fri Sep 4 01:33:10 CEST 2009.
--------
--- GNOME/libcanberra/libcanberra.changes 2009-08-05 11:59:04.000000000 +0200
+++ libcanberra/libcanberra.changes 2009-08-27 16:50:12.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Aug 27 16:46:02 CEST 2009 - vuntz@novell.com
+
+- Update to version 0.16:
+ + add description to autostart file
+ + dso: quieten gcc a bit
+ + implement ca_context_playing() call
+ + vorbis: fix implicit channel map decoding master
+- Use spec-cleaner script to split BuildRequires/Requires lines,
+ and reorder the preamble.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libcanberra-0.15.tar.bz2
New:
----
libcanberra-0.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcanberra.spec ++++++
--- /var/tmp/diff_new_pack.Ton87C/_old 2009-09-04 01:32:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Ton87C/_new 2009-09-04 01:32:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libcanberra (Version 0.15)
+# spec file for package libcanberra (Version 0.16)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,19 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: libcanberra
+Version: 0.16
+Release: 1
+License: LGPL v2.0 or later
Summary: Portable sound event library
-BuildRequires: alsa-devel gconf2-devel gstreamer-0_10-devel gtk-doc gtk2-devel libpulse-devel >= 0.9.11 libvorbis-devel lynx update-desktop-files
Url: http://0pointer.de/lennart/projects/libcanberra/
-License: LGPL v2.0 or later
-Version: 0.15
-Release: 1
Group: System/Libraries
Source: libcanberra-%{version}.tar.bz2
Source1: libcanberra-gtk-module.sh
+BuildRequires: alsa-devel
+BuildRequires: gconf2-devel
+BuildRequires: gstreamer-0_10-devel
+BuildRequires: gtk-doc
+BuildRequires: gtk2-devel
+BuildRequires: libpulse-devel >= 0.9.11
+BuildRequires: libvorbis-devel
+BuildRequires: lynx
+BuildRequires: update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libcanberra0 = %{version}-%{release}
@@ -35,8 +42,8 @@
License: LGPL v2.0 or later
Summary: Portable sound event library
Group: System/Libraries
-Requires: sound-theme-freedesktop
Requires: libpulse0 >= 0.9.11
+Requires: sound-theme-freedesktop
%description
libcanberra is an implementation of the XDG Sound Theme and Name
@@ -46,11 +53,9 @@
1. 1. libcanberra: the main library
-
2. 2. libcanberra-gtk: some glue code to make it easier to use
libcanberra from Gtk+ applications
-
3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
@@ -62,11 +67,9 @@
1. 1. libcanberra: the main library
-
2. 2. libcanberra-gtk: some glue code to make it easier to use
libcanberra from Gtk+ applications
-
3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
@@ -84,11 +87,9 @@
1. 1. libcanberra: the main library
-
2. 2. libcanberra-gtk: some glue code to make it easier to use
libcanberra from Gtk+ applications
-
3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
@@ -107,11 +108,9 @@
1. 1. libcanberra: the main library
-
2. 2. libcanberra-gtk: some glue code to make it easier to use
libcanberra from Gtk+ applications
-
3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
@@ -119,10 +118,10 @@
License: LGPL v2.0 or later
Summary: Portable sound event library
Group: Development/Libraries/C and C++
-Requires: libcanberra0 = %{version}
-Requires: libcanberra-gtk0 = %{version}
Requires: gtk-doc
Requires: gtk2-devel
+Requires: libcanberra-gtk0 = %{version}
+Requires: libcanberra0 = %{version}
%description devel
libcanberra is an implementation of the XDG Sound Theme and Name
@@ -132,11 +131,9 @@
1. 1. libcanberra: the main library
-
2. 2. libcanberra-gtk: some glue code to make it easier to use
libcanberra from Gtk+ applications
-
3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
@@ -149,14 +146,14 @@
%install
%makeinstall
-%suse_update_desktop_file $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
-find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
-install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
-rm $RPM_BUILD_ROOT%{_datadir}/doc/libcanberra/README
+%suse_update_desktop_file %{buildroot}%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
+find %{buildroot} \( -name *.a -o -name *.la \) -exec rm {} \;
+install -D -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
+rm %{buildroot}%{_datadir}/doc/libcanberra/README
%find_gconf_schemas
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -n libcanberra0 -p /sbin/ldconfig
++++++ libcanberra-0.15.tar.bz2 -> libcanberra-0.16.tar.bz2 ++++++
++++ 1888 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/README new/libcanberra-0.16/README
--- old/libcanberra-0.15/README 2009-08-05 03:19:55.000000000 +0200
+++ new/libcanberra-0.16/README 2009-08-27 04:22:50.000000000 +0200
@@ -1,4 +1,4 @@
- libcanberra 0.15
+ libcanberra 0.16
Copyright 2008-2009 Lennart Poettering
@@ -26,58 +26,62 @@
News
- Wed 5 Auf 2009:
+ Thu 27 Aug 2009:
- [10]Version 0.15 released; bug fixes
+ [10]Version 0.16 released; add new ca_context_playing() call
+
+ Wed 5 Aug 2009:
+
+ [11]Version 0.15 released; bug fixes
Thu 2 Jul 2009:
- [11]Version 0.14 released; bug fixes
+ [12]Version 0.14 released; bug fixes
Tue 23 Jun 2009:
- [12]Version 0.13 released; multichannel support; gtk multihead support;
+ [13]Version 0.13 released; multichannel support; gtk multihead support;
bug fixes
Mon 13 Apr 2009:
- [13]Version 0.12 released; changes include: various fixes and updates
+ [14]Version 0.12 released; changes include: various fixes and updates
for the PulseAudio backend; detect forks and return an error for all
functions in that case
Wed 21 Jan 2009:
- [14]Version 0.11 released; changes include: major GStreamer backend
+ [15]Version 0.11 released; changes include: major GStreamer backend
fixes; update to libtool 2.2; a few other fixes
Mon 6 Oct 2008:
- [15]Version 0.10 released; changes include: install Gtk+ module using
+ [16]Version 0.10 released; changes include: install Gtk+ module using
GConf; a few other fixes
Tue 9 Sep 2008:
- [16]Version 0.9 released; changes include: GStreamer fixes, include
+ [17]Version 0.9 released; changes include: GStreamer fixes, include
(optional) libtdb based lookup cache.
Thu 28 Aug 2008:
- [17]Version 0.8 released; changes include: new OSS and GStreamer
+ [18]Version 0.8 released; changes include: new OSS and GStreamer
backend; portability fixes for FreeBSD/Solaris; the multi backend works
now
Thu 14 Aug 2008:
- [18]Version 0.7 released; changes include: documentation updates;
+ [19]Version 0.7 released; changes include: documentation updates;
various bug fixes; add this web site/README; allow playback of event
sounds with only a sound file path specified; other changes
Overview
- libcanberra is an implementation of the [19]XDG Sound Theme and Name
+ libcanberra is an implementation of the [20]XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
- [20]GNOME. It comes with several backends ([21]ALSA, [22]PulseAudio,
- OSS, [23]GStreamer, null) and is designed to be portable. It consists
+ [21]GNOME. It comes with several backends ([22]ALSA, [23]PulseAudio,
+ OSS, [24]GStreamer, null) and is designed to be portable. It consists
of the following parts:
1. libcanberra: the main library
2. libcanberra-gtk: some glue code to make it easier to use
@@ -85,14 +89,14 @@
3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
- For more information see [24]the original announcement.
+ For more information see [25]the original announcement.
Current Status
libcanberra is mostly feature complete. For now however it includes
backends only for ALSA, PulseAudio, OSS and GStreamer.
- libcanberra has been declared [25]a blessed GNOME dependency.
+ libcanberra has been declared [26]a blessed GNOME dependency.
The OSS driver is incomplete: only sound files that are in a format
natively understood by the sound card are supported. If the sample
@@ -114,7 +118,7 @@
Documentation
- You may browse the [26]gtkdoc generated [27]programing documentation of
+ You may browse the [27]gtkdoc generated [28]programing documentation of
the API.
Requirements
@@ -149,18 +153,18 @@
Download
The newest release is always available from
- [28]http://0pointer.de/lennart/projects/libcanberra/
+ [29]http://0pointer.de/lennart/projects/libcanberra/
- The current release is [29]0.15
+ The current release is [30]0.16
- Get libcanberra's development sources from the [30]GIT [31]repository
- ([32]gitweb):
+ Get libcanberra's development sources from the [31]GIT [32]repository
+ ([33]gitweb):
git clone git://git.0pointer.de/libcanberra
If you want to report bugs, have questions or want to be notified about
- new releases, please join the [33]libcanberra-discuss mailing list.
+ new releases, please join the [34]libcanberra-discuss mailing list.
- libcanberra's bugs are tracked at [34]bugs.freedesktop.org.
+ libcanberra's bugs are tracked at [35]bugs.freedesktop.org.
__________________________________________________________________
@@ -178,28 +182,29 @@
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
- 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
- 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
- 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
- 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
- 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
- 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
- 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
- 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
- 19. http://freedesktop.org/wiki/Specifications/sound-theme-spec
- 20. http://www.gnome.org/
- 21. http://alsa-project.org/
- 22. http://pulseaudio.org/
- 23. http://gstreamer.org/
- 24. http://0pointer.de/blog/projects/sixfold-announcement.html
- 25. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
- 26. http://www.gtk.org/gtk-doc/
- 27. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
- 28. http://0pointer.de/lennart/projects/libcanberra/
- 29. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
- 30. http://git-scm.com/
- 31. git://git.0pointer.de/libcanberra
- 32. http://git.0pointer.de/?p=libcanberra.git
- 33. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
- 34. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
+ 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+ 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
+ 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
+ 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
+ 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
+ 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
+ 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
+ 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
+ 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
+ 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
+ 20. http://freedesktop.org/wiki/Specifications/sound-theme-spec
+ 21. http://www.gnome.org/
+ 22. http://alsa-project.org/
+ 23. http://pulseaudio.org/
+ 24. http://gstreamer.org/
+ 25. http://0pointer.de/blog/projects/sixfold-announcement.html
+ 26. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
+ 27. http://www.gtk.org/gtk-doc/
+ 28. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
+ 29. http://0pointer.de/lennart/projects/libcanberra/
+ 30. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+ 31. http://git-scm.com/
+ 32. git://git.0pointer.de/libcanberra
+ 33. http://git.0pointer.de/?p=libcanberra.git
+ 34. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
+ 35. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/configure.ac new/libcanberra-0.16/configure.ac
--- old/libcanberra-0.15/configure.ac 2009-08-05 03:10:50.000000000 +0200
+++ new/libcanberra-0.16/configure.ac 2009-08-27 03:58:14.000000000 +0200
@@ -20,7 +20,7 @@
# http://www.gnu.org/licenses/.
m4_define([ca_major],[0])
-m4_define([ca_minor],[15])
+m4_define([ca_minor],[16])
m4_define([ca_version],[ca_major.ca_minor])
AC_PREREQ(2.63)
@@ -34,12 +34,14 @@
AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/])
-AC_SUBST(LIBCANBERRA_VERSION_INFO, [1:7:1])
+AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:0:2])
AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:1:1])
AC_CANONICAL_HOST
AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
if type -p stow > /dev/null && test -d /usr/local/stow ; then
AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/doc/README new/libcanberra-0.16/doc/README
--- old/libcanberra-0.15/doc/README 2009-08-05 03:19:55.000000000 +0200
+++ new/libcanberra-0.16/doc/README 2009-08-27 04:22:50.000000000 +0200
@@ -1,4 +1,4 @@
- libcanberra 0.15
+ libcanberra 0.16
Copyright 2008-2009 Lennart Poettering
@@ -26,58 +26,62 @@
News
- Wed 5 Auf 2009:
+ Thu 27 Aug 2009:
- [10]Version 0.15 released; bug fixes
+ [10]Version 0.16 released; add new ca_context_playing() call
+
+ Wed 5 Aug 2009:
+
+ [11]Version 0.15 released; bug fixes
Thu 2 Jul 2009:
- [11]Version 0.14 released; bug fixes
+ [12]Version 0.14 released; bug fixes
Tue 23 Jun 2009:
- [12]Version 0.13 released; multichannel support; gtk multihead support;
+ [13]Version 0.13 released; multichannel support; gtk multihead support;
bug fixes
Mon 13 Apr 2009:
- [13]Version 0.12 released; changes include: various fixes and updates
+ [14]Version 0.12 released; changes include: various fixes and updates
for the PulseAudio backend; detect forks and return an error for all
functions in that case
Wed 21 Jan 2009:
- [14]Version 0.11 released; changes include: major GStreamer backend
+ [15]Version 0.11 released; changes include: major GStreamer backend
fixes; update to libtool 2.2; a few other fixes
Mon 6 Oct 2008:
- [15]Version 0.10 released; changes include: install Gtk+ module using
+ [16]Version 0.10 released; changes include: install Gtk+ module using
GConf; a few other fixes
Tue 9 Sep 2008:
- [16]Version 0.9 released; changes include: GStreamer fixes, include
+ [17]Version 0.9 released; changes include: GStreamer fixes, include
(optional) libtdb based lookup cache.
Thu 28 Aug 2008:
- [17]Version 0.8 released; changes include: new OSS and GStreamer
+ [18]Version 0.8 released; changes include: new OSS and GStreamer
backend; portability fixes for FreeBSD/Solaris; the multi backend works
now
Thu 14 Aug 2008:
- [18]Version 0.7 released; changes include: documentation updates;
+ [19]Version 0.7 released; changes include: documentation updates;
various bug fixes; add this web site/README; allow playback of event
sounds with only a sound file path specified; other changes
Overview
- libcanberra is an implementation of the [19]XDG Sound Theme and Name
+ libcanberra is an implementation of the [20]XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
- [20]GNOME. It comes with several backends ([21]ALSA, [22]PulseAudio,
- OSS, [23]GStreamer, null) and is designed to be portable. It consists
+ [21]GNOME. It comes with several backends ([22]ALSA, [23]PulseAudio,
+ OSS, [24]GStreamer, null) and is designed to be portable. It consists
of the following parts:
1. libcanberra: the main library
2. libcanberra-gtk: some glue code to make it easier to use
@@ -85,14 +89,14 @@
3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
- For more information see [24]the original announcement.
+ For more information see [25]the original announcement.
Current Status
libcanberra is mostly feature complete. For now however it includes
backends only for ALSA, PulseAudio, OSS and GStreamer.
- libcanberra has been declared [25]a blessed GNOME dependency.
+ libcanberra has been declared [26]a blessed GNOME dependency.
The OSS driver is incomplete: only sound files that are in a format
natively understood by the sound card are supported. If the sample
@@ -114,7 +118,7 @@
Documentation
- You may browse the [26]gtkdoc generated [27]programing documentation of
+ You may browse the [27]gtkdoc generated [28]programing documentation of
the API.
Requirements
@@ -149,18 +153,18 @@
Download
The newest release is always available from
- [28]http://0pointer.de/lennart/projects/libcanberra/
+ [29]http://0pointer.de/lennart/projects/libcanberra/
- The current release is [29]0.15
+ The current release is [30]0.16
- Get libcanberra's development sources from the [30]GIT [31]repository
- ([32]gitweb):
+ Get libcanberra's development sources from the [31]GIT [32]repository
+ ([33]gitweb):
git clone git://git.0pointer.de/libcanberra
If you want to report bugs, have questions or want to be notified about
- new releases, please join the [33]libcanberra-discuss mailing list.
+ new releases, please join the [34]libcanberra-discuss mailing list.
- libcanberra's bugs are tracked at [34]bugs.freedesktop.org.
+ libcanberra's bugs are tracked at [35]bugs.freedesktop.org.
__________________________________________________________________
@@ -178,28 +182,29 @@
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
- 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
- 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
- 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
- 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
- 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
- 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
- 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
- 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
- 19. http://freedesktop.org/wiki/Specifications/sound-theme-spec
- 20. http://www.gnome.org/
- 21. http://alsa-project.org/
- 22. http://pulseaudio.org/
- 23. http://gstreamer.org/
- 24. http://0pointer.de/blog/projects/sixfold-announcement.html
- 25. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
- 26. http://www.gtk.org/gtk-doc/
- 27. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
- 28. http://0pointer.de/lennart/projects/libcanberra/
- 29. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
- 30. http://git-scm.com/
- 31. git://git.0pointer.de/libcanberra
- 32. http://git.0pointer.de/?p=libcanberra.git
- 33. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
- 34. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
+ 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+ 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
+ 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
+ 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
+ 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
+ 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
+ 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
+ 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
+ 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
+ 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
+ 20. http://freedesktop.org/wiki/Specifications/sound-theme-spec
+ 21. http://www.gnome.org/
+ 22. http://alsa-project.org/
+ 23. http://pulseaudio.org/
+ 24. http://gstreamer.org/
+ 25. http://0pointer.de/blog/projects/sixfold-announcement.html
+ 26. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
+ 27. http://www.gtk.org/gtk-doc/
+ 28. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
+ 29. http://0pointer.de/lennart/projects/libcanberra/
+ 30. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+ 31. http://git-scm.com/
+ 32. git://git.0pointer.de/libcanberra
+ 33. http://git.0pointer.de/?p=libcanberra.git
+ 34. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
+ 35. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/doc/README.html new/libcanberra-0.16/doc/README.html
--- old/libcanberra-0.15/doc/README.html 2009-08-05 03:19:55.000000000 +0200
+++ new/libcanberra-0.16/doc/README.html 2009-08-27 04:22:02.000000000 +0200
@@ -3,12 +3,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>libcanberra 0.15</title>
+<title>libcanberra 0.16</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
-<h1><a name="top">libcanberra 0.15</a></h1>
+<h1><a name="top">libcanberra 0.16</a></h1>
<p><i>Copyright 2008-2009 Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de></i></p>
@@ -38,7 +38,11 @@
<h2><a name="news">News</a></h2>
-<div class="news-date">Wed 5 Auf 2009: </div> <p class="news-text">http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz">Version 0.16</a> released;
+add new <tt>ca_context_playing()</tt> call</p>
+
+<div class="news-date">Wed 5 Aug 2009: </div> <p class="news-text"><a
href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz">Version 0.15</a> released;
bug fixes</p>
@@ -168,7 +172,7 @@
<p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/libcanberra/">http://0pointer.de/lennart/projects/libcanberra/</a></p>
-<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz">0.15</a></p>
+<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz">0.16</a></p>
<p>Get <tt>libcanberra</tt>'s development sources from the <a href="http://git-scm.com/">GIT</a> <a href="git://git.0pointer.de/libcanberra">repository</a> (<a href="http://git.0pointer.de/?p=libcanberra.git">gitweb</a>): </p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/doc/README.html.in new/libcanberra-0.16/doc/README.html.in
--- old/libcanberra-0.15/doc/README.html.in 2009-08-05 03:19:23.000000000 +0200
+++ new/libcanberra-0.16/doc/README.html.in 2009-08-27 03:58:15.000000000 +0200
@@ -38,7 +38,11 @@
<h2><a name="news">News</a></h2>
-<div class="news-date">Wed 5 Auf 2009: </div> <p class="news-text">Version 0.16</a> released;
+add new <tt>ca_context_playing()</tt> call</p>
+
+<div class="news-date">Wed 5 Aug 2009: </div> <p class="news-text"><a
href="@PACKAGE_URL@libcanberra-0.15.tar.gz">Version 0.15</a> released;
bug fixes</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/gtkdoc/html/ch01.html new/libcanberra-0.16/gtkdoc/html/ch01.html
--- old/libcanberra-0.15/gtkdoc/html/ch01.html 2009-08-05 03:33:29.000000000 +0200
+++ new/libcanberra-0.16/gtkdoc/html/ch01.html 2009-08-27 04:26:00.000000000 +0200
@@ -22,7 +22,7 @@
</tr></table>
<div class="chapter" title="libcanberra">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id369909"></a>libcanberra</h2></div></div></div>
+<a name="id344821"></a>libcanberra</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libcanberra-canberra.html">canberra</a></span><span class="refpurpose"> — General libcanberra API</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/gtkdoc/html/index.sgml new/libcanberra-0.16/gtkdoc/html/index.sgml
--- old/libcanberra-0.15/gtkdoc/html/index.sgml 2009-08-05 03:33:29.000000000 +0200
+++ new/libcanberra-0.16/gtkdoc/html/index.sgml 2009-08-27 04:26:00.000000000 +0200
@@ -54,6 +54,7 @@
<ANCHOR id="ca-context-cancel" href="libcanberra/libcanberra-canberra.html#ca-context-cancel">
<ANCHOR id="ca-context-cache" href="libcanberra/libcanberra-canberra.html#ca-context-cache">
<ANCHOR id="ca-context-cache-full" href="libcanberra/libcanberra-canberra.html#ca-context-cache-full">
+<ANCHOR id="ca-context-playing" href="libcanberra/libcanberra-canberra.html#ca-context-playing">
<ANCHOR id="ca-strerror" href="libcanberra/libcanberra-canberra.html#ca-strerror">
<ANCHOR id="ca-proplist" href="libcanberra/libcanberra-canberra.html#ca-proplist">
<ANCHOR id="ca-proplist-create" href="libcanberra/libcanberra-canberra.html#ca-proplist-create">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/gtkdoc/html/libcanberra-canberra.html new/libcanberra-0.16/gtkdoc/html/libcanberra-canberra.html
--- old/libcanberra-0.15/gtkdoc/html/libcanberra-canberra.html 2009-08-05 03:33:29.000000000 +0200
+++ new/libcanberra-0.16/gtkdoc/html/libcanberra-canberra.html 2009-08-27 04:26:00.000000000 +0200
@@ -107,6 +107,9 @@
...);
int <a class="link" href="libcanberra-canberra.html#ca-context-cache-full" title="ca_context_cache_full ()">ca_context_cache_full</a> (<a class="link" href="libcanberra-canberra.html#ca-context" title="ca_context">ca_context</a> *c,
<a class="link" href="libcanberra-canberra.html#ca-proplist" title="ca_proplist">ca_proplist</a> *p);
+int <a class="link" href="libcanberra-canberra.html#ca-context-playing" title="ca_context_playing ()">ca_context_playing</a> (<a class="link" href="libcanberra-canberra.html#ca-context" title="ca_context">ca_context</a> *c,
+ uint32_t id,
+ int *playing);
const char * <a class="link" href="libcanberra-canberra.html#ca-strerror" title="ca_strerror ()">ca_strerror</a> (int code);
@@ -1050,6 +1053,43 @@
</table></div>
</div>
<hr>
+<div class="refsect2" title="ca_context_playing ()">
+<a name="ca-context-playing"></a><h3>ca_context_playing ()</h3>
+<pre class="programlisting">int ca_context_playing (<a class="link" href="libcanberra-canberra.html#ca-context" title="ca_context">ca_context</a> *c,
+ uint32_t id,
+ int *playing);</pre>
+<p>
+Check if at least one sound with the specified id is still
+playing. Returns 0 in *playing if no sound with this id is playing
+anymore or non-zero if there is at least one playing.</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
+<td> the context to check if sound is still playing
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td> the id that identify the sounds to check
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>playing</code></em> :</span></p></td>
+<td> a pointer to a boolean that will be updated with the play status
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> 0 on success, negative error code on error.
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.16</p>
+</div>
+<hr>
<div class="refsect2" title="ca_strerror ()">
<a name="ca-strerror"></a><h3>ca_strerror ()</h3>
<pre class="programlisting">const char * ca_strerror (int code);</pre>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/gtkdoc/html/libcanberra.devhelp new/libcanberra-0.16/gtkdoc/html/libcanberra.devhelp
--- old/libcanberra-0.15/gtkdoc/html/libcanberra.devhelp 2009-08-05 03:33:29.000000000 +0200
+++ new/libcanberra-0.16/gtkdoc/html/libcanberra.devhelp 2009-08-27 04:26:00.000000000 +0200
@@ -59,6 +59,7 @@
<function name="ca_context_cancel ()" link="libcanberra-canberra.html#ca-context-cancel"/>
<function name="ca_context_cache ()" link="libcanberra-canberra.html#ca-context-cache"/>
<function name="ca_context_cache_full ()" link="libcanberra-canberra.html#ca-context-cache-full"/>
+ <function name="ca_context_playing ()" link="libcanberra-canberra.html#ca-context-playing"/>
<function name="ca_strerror ()" link="libcanberra-canberra.html#ca-strerror"/>
<function name="ca_proplist" link="libcanberra-canberra.html#ca-proplist"/>
<function name="ca_proplist_create ()" link="libcanberra-canberra.html#ca-proplist-create"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/gtkdoc/html/libcanberra.devhelp2 new/libcanberra-0.16/gtkdoc/html/libcanberra.devhelp2
--- old/libcanberra-0.15/gtkdoc/html/libcanberra.devhelp2 2009-08-05 03:33:29.000000000 +0200
+++ new/libcanberra-0.16/gtkdoc/html/libcanberra.devhelp2 2009-08-27 04:26:00.000000000 +0200
@@ -59,6 +59,7 @@
<keyword type="function" name="ca_context_cancel ()" link="libcanberra-canberra.html#ca-context-cancel"/>
<keyword type="function" name="ca_context_cache ()" link="libcanberra-canberra.html#ca-context-cache"/>
<keyword type="function" name="ca_context_cache_full ()" link="libcanberra-canberra.html#ca-context-cache-full"/>
+ <keyword type="function" name="ca_context_playing ()" link="libcanberra-canberra.html#ca-context-playing" since="0.16"/>
<keyword type="function" name="ca_strerror ()" link="libcanberra-canberra.html#ca-strerror"/>
<keyword type="typedef" name="ca_proplist" link="libcanberra-canberra.html#ca-proplist"/>
<keyword type="function" name="ca_proplist_create ()" link="libcanberra-canberra.html#ca-proplist-create"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/gtkdoc/libcanberra-sections.txt new/libcanberra-0.16/gtkdoc/libcanberra-sections.txt
--- old/libcanberra-0.15/gtkdoc/libcanberra-sections.txt 2009-08-05 03:33:29.000000000 +0200
+++ new/libcanberra-0.16/gtkdoc/libcanberra-sections.txt 2009-08-27 04:26:00.000000000 +0200
@@ -63,6 +63,7 @@
ca_context_cancel
ca_context_cache
ca_context_cache_full
+ca_context_playing
<SUBSECTION>
ca_strerror
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/m4/libtool.m4 new/libcanberra-0.16/m4/libtool.m4
--- old/libcanberra-0.15/m4/libtool.m4 2009-08-05 03:10:56.000000000 +0200
+++ new/libcanberra-0.16/m4/libtool.m4 2009-08-27 04:21:02.000000000 +0200
@@ -3450,7 +3450,6 @@
eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
cat <<_LT_EOF >> conftest.$ac_ext
-
/* The mapping between symbol names and symbols. */
const struct {
const char *name;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/alsa.c new/libcanberra-0.16/src/alsa.c
--- old/libcanberra-0.15/src/alsa.c 2009-05-26 02:08:56.000000000 +0200
+++ new/libcanberra-0.16/src/alsa.c 2009-08-27 03:58:15.000000000 +0200
@@ -521,3 +521,32 @@
return CA_SUCCESS;
}
+
+int driver_playing(ca_context *c, uint32_t id, int *playing) {
+ struct private *p;
+ struct outstanding *out;
+
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(c->private, CA_ERROR_STATE);
+ ca_return_val_if_fail(playing, CA_ERROR_INVALID);
+
+ p = PRIVATE(c);
+
+ *playing = 0;
+
+ ca_mutex_lock(p->outstanding_mutex);
+
+ for (out = p->outstanding; out; out = out->next) {
+
+ if (out->dead ||
+ out->id != id)
+ continue;
+
+ *playing = 1;
+ break;
+ }
+
+ ca_mutex_unlock(p->outstanding_mutex);
+
+ return CA_SUCCESS;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/canberra.h new/libcanberra-0.16/src/canberra.h
--- old/libcanberra-0.15/src/canberra.h 2009-08-05 03:11:48.000000000 +0200
+++ new/libcanberra-0.16/src/canberra.h 2009-08-27 04:22:02.000000000 +0200
@@ -46,7 +46,7 @@
*
* Evaluates to the minor version number of libcanberra.
*/
-#define CA_MINOR (15)
+#define CA_MINOR (16)
/**
* CA_CHECK_VERSION:
@@ -485,6 +485,7 @@
int ca_context_cache_full(ca_context *c, ca_proplist *p);
int ca_context_cache(ca_context *c, ...) __attribute__((sentinel));
int ca_context_cancel(ca_context *c, uint32_t id);
+int ca_context_playing(ca_context *c, uint32_t id, int *playing);
const char *ca_strerror(int code);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/canberra.h.in new/libcanberra-0.16/src/canberra.h.in
--- old/libcanberra-0.15/src/canberra.h.in 2009-05-26 20:42:08.000000000 +0200
+++ new/libcanberra-0.16/src/canberra.h.in 2009-08-27 03:58:15.000000000 +0200
@@ -485,6 +485,7 @@
int ca_context_cache_full(ca_context *c, ca_proplist *p);
int ca_context_cache(ca_context *c, ...) __attribute__((sentinel));
int ca_context_cancel(ca_context *c, uint32_t id);
+int ca_context_playing(ca_context *c, uint32_t id, int *playing);
const char *ca_strerror(int code);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/common.c new/libcanberra-0.16/src/common.c
--- old/libcanberra-0.15/src/common.c 2009-04-19 03:23:25.000000000 +0200
+++ new/libcanberra-0.16/src/common.c 2009-08-27 03:58:15.000000000 +0200
@@ -689,3 +689,32 @@
return CA_SUCCESS;
}
+
+/**
+ * ca_context_playing:
+ * @c: the context to check if sound is still playing
+ * @id: the id that identify the sounds to check
+ * @playing: a pointer to a boolean that will be updated with the play status
+ *
+ * Check if at least one sound with the specified id is still
+ * playing. Returns 0 in *playing if no sound with this id is playing
+ * anymore or non-zero if there is at least one playing.
+ *
+ * Returns: 0 on success, negative error code on error.
+ * Since: 0.16
+ */
+int ca_context_playing(ca_context *c, uint32_t id, int *playing) {
+ int ret;
+
+ ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(playing, CA_ERROR_INVALID);
+ ca_mutex_lock(c->mutex);
+ ca_return_val_if_fail_unlock(c->opened, CA_ERROR_STATE, c->mutex);
+
+ ret = driver_playing(c, id, playing);
+
+ ca_mutex_unlock(c->mutex);
+
+ return ret;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/driver.h new/libcanberra-0.16/src/driver.h
--- old/libcanberra-0.15/src/driver.h 2008-10-09 01:59:27.000000000 +0200
+++ new/libcanberra-0.16/src/driver.h 2009-08-27 03:58:15.000000000 +0200
@@ -33,4 +33,6 @@
int driver_cancel(ca_context *c, uint32_t id);
int driver_cache(ca_context *c, ca_proplist *p);
+int driver_playing(ca_context *c, uint32_t id, int *playing);
+
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/dso.c new/libcanberra-0.16/src/dso.c
--- old/libcanberra-0.15/src/dso.c 2009-07-31 18:12:23.000000000 +0200
+++ new/libcanberra-0.16/src/dso.c 2009-08-27 03:58:15.000000000 +0200
@@ -42,6 +42,7 @@
int (*driver_play)(ca_context *c, uint32_t id, ca_proplist *p, ca_finish_callback_t cb, void *userdata);
int (*driver_cancel)(ca_context *c, uint32_t id);
int (*driver_cache)(ca_context *c, ca_proplist *p);
+ int (*driver_playing)(ca_context *c, uint32_t id, int *playing);
};
#define PRIVATE_DSO(c) ((struct private_dso *) ((c)->private_dso))
@@ -73,7 +74,7 @@
#endif
};
- if (code < 0 || code >= CA_ELEMENTSOF(table))
+ if (code < 0 || code >= (int) CA_ELEMENTSOF(table))
return CA_ERROR_INTERNAL;
return table[code];
@@ -257,7 +258,8 @@
!(p->driver_change_props = GET_FUNC_PTR(p->module, driver, "driver_change_props", int, (ca_context *, ca_proplist *, ca_proplist *))) ||
!(p->driver_play = GET_FUNC_PTR(p->module, driver, "driver_play", int, (ca_context*, uint32_t, ca_proplist *, ca_finish_callback_t, void *))) ||
!(p->driver_cancel = GET_FUNC_PTR(p->module, driver, "driver_cancel", int, (ca_context*, uint32_t))) ||
- !(p->driver_cache = GET_FUNC_PTR(p->module, driver, "driver_cache", int, (ca_context*, ca_proplist *)))) {
+ !(p->driver_cache = GET_FUNC_PTR(p->module, driver, "driver_cache", int, (ca_context*, ca_proplist *))) ||
+ !(p->driver_playing = GET_FUNC_PTR(p->module, driver, "driver_playing", int, (ca_context*, uint32_t, int*)))) {
ca_free(driver);
driver_destroy(c);
@@ -361,3 +363,16 @@
return p->driver_cache(c, pl);
}
+
+int driver_playing(ca_context *c, uint32_t id, int *playing) {
+ struct private_dso *p;
+
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(c->private_dso, CA_ERROR_STATE);
+ ca_return_val_if_fail(playing, CA_ERROR_INVALID);
+
+ p = PRIVATE_DSO(c);
+ ca_return_val_if_fail(p->driver_playing, CA_ERROR_STATE);
+
+ return p->driver_playing(c, id, playing);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/gstreamer.c new/libcanberra-0.16/src/gstreamer.c
--- old/libcanberra-0.15/src/gstreamer.c 2009-01-21 21:33:30.000000000 +0100
+++ new/libcanberra-0.16/src/gstreamer.c 2009-08-27 03:58:15.000000000 +0200
@@ -552,3 +552,31 @@
return CA_ERROR_NOTSUPPORTED;
}
+
+int driver_playing(ca_context *c, uint32_t id, int *playing) {
+ struct private *p;
+ struct outstanding *out;
+
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(c->private, CA_ERROR_STATE);
+ ca_return_val_if_fail(playing, CA_ERROR_INVALID);
+
+ p = PRIVATE(c);
+
+ *playing = 0;
+
+ ca_mutex_lock(p->outstanding_mutex);
+
+ for (out = p->outstanding; out; out = out->next) {
+
+ if (out->id != id || out->pipeline == NULL || out->dead == TRUE)
+ continue;
+
+ *playing = 1;
+ break;
+ }
+
+ ca_mutex_unlock(p->outstanding_mutex);
+
+ return CA_SUCCESS;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/libcanberra-login-sound.desktop.in new/libcanberra-0.16/src/libcanberra-login-sound.desktop.in
--- old/libcanberra-0.15/src/libcanberra-login-sound.desktop.in 2009-01-07 02:56:40.000000000 +0100
+++ new/libcanberra-0.16/src/libcanberra-login-sound.desktop.in 2009-08-16 21:00:05.000000000 +0200
@@ -1,6 +1,7 @@
[Desktop Entry]
Type=Application
Name=GNOME Login Sound
+Comment=Plays a sound whenever you log in
Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
OnlyShowIn=GNOME;
AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/multi.c new/libcanberra-0.16/src/multi.c
--- old/libcanberra-0.15/src/multi.c 2008-10-26 01:00:39.000000000 +0200
+++ new/libcanberra-0.16/src/multi.c 2009-08-27 03:58:16.000000000 +0200
@@ -330,3 +330,32 @@
return ret;
}
+
+int driver_playing(ca_context *c, uint32_t id, int *playing) {
+ int ret = CA_SUCCESS;
+ struct private *p;
+ struct backend *b;
+
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(playing, CA_ERROR_INVALID);
+ ca_return_val_if_fail(c->private, CA_ERROR_STATE);
+
+ p = PRIVATE(c);
+
+ *playing = 0;
+
+ for (b = p->backends; b; b = b->next) {
+ int r, _playing = 0;
+
+ r = ca_context_playing(b->context, id, &_playing);
+
+ /* We only return the first failure */
+ if (ret == CA_SUCCESS)
+ ret = r;
+
+ if (_playing)
+ *playing = 1;
+ }
+
+ return ret;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/oss.c new/libcanberra-0.16/src/oss.c
--- old/libcanberra-0.15/src/oss.c 2009-05-26 02:08:56.000000000 +0200
+++ new/libcanberra-0.16/src/oss.c 2009-08-27 03:58:16.000000000 +0200
@@ -499,3 +499,32 @@
return CA_SUCCESS;
}
+
+int driver_playing(ca_context *c, uint32_t id, int *playing) {
+ struct private *p;
+ struct outstanding *out;
+
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(c->private, CA_ERROR_STATE);
+ ca_return_val_if_fail(playing, CA_ERROR_INVALID);
+
+ p = PRIVATE(c);
+
+ *playing = 0;
+
+ ca_mutex_lock(p->outstanding_mutex);
+
+ for (out = p->outstanding; out; out = out->next) {
+
+ if (out->dead ||
+ out->id != id)
+ continue;
+
+ *playing = 1;
+ break;
+ }
+
+ ca_mutex_unlock(p->outstanding_mutex);
+
+ return CA_SUCCESS;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/pulse.c new/libcanberra-0.16/src/pulse.c
--- old/libcanberra-0.15/src/pulse.c 2009-07-30 02:47:10.000000000 +0200
+++ new/libcanberra-0.16/src/pulse.c 2009-08-27 03:58:16.000000000 +0200
@@ -1271,3 +1271,33 @@
return ret;
}
+
+int driver_playing(ca_context *c, uint32_t id, int *playing) {
+ struct private *p;
+ struct outstanding *out;
+
+ ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ ca_return_val_if_fail(c->private, CA_ERROR_STATE);
+ ca_return_val_if_fail(playing, CA_ERROR_INVALID);
+
+ p = PRIVATE(c);
+
+ *playing = 0;
+
+ ca_mutex_lock(p->outstanding_mutex);
+
+ for (out = p->outstanding; out; out = out->next) {
+
+ if (out->type == OUTSTANDING_UPLOAD ||
+ out->id != id ||
+ out->sink_input == PA_INVALID_INDEX)
+ continue;
+
+ *playing = 1;
+ break;
+ }
+
+ ca_mutex_unlock(p->outstanding_mutex);
+
+ return CA_SUCCESS;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.15/src/read-vorbis.c new/libcanberra-0.16/src/read-vorbis.c
--- old/libcanberra-0.15/src/read-vorbis.c 2009-05-26 02:13:20.000000000 +0200
+++ new/libcanberra-0.16/src/read-vorbis.c 2009-08-27 04:16:48.000000000 +0200
@@ -157,11 +157,14 @@
v->channel_map[3] = CA_CHANNEL_REAR_RIGHT;
/* fall through */
- case 1:
+ case 2:
v->channel_map[0] = CA_CHANNEL_FRONT_LEFT;
v->channel_map[1] = CA_CHANNEL_FRONT_RIGHT;
return v->channel_map;
+ case 1:
+ v->channel_map[0] = CA_CHANNEL_MONO;
+ return v->channel_map;
}
return NULL;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
