rpms/audacious-plugins/devel audacious-plugins-1.5.1-alsaplug-id.patch, NONE, 1.1 audacious-plugins-1.5.1-mixer-not-ready.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 audacious-plugins.spec, 1.45, 1.46 sources, 1.17, 1.18
Michael Schwendt
mschwendt at fedoraproject.org
Mon Jun 29 19:00:31 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6222
Modified Files:
.cvsignore audacious-plugins.spec sources
Added Files:
audacious-plugins-1.5.1-alsaplug-id.patch
audacious-plugins-1.5.1-mixer-not-ready.patch
Log Message:
* Mon Jun 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-9
- Use old "ALSA" plugin id for config file.
- Keep old mixer level even if mixer isn't ready.
audacious-plugins-1.5.1-alsaplug-id.patch:
--- NEW FILE audacious-plugins-1.5.1-alsaplug-id.patch ---
diff -Nur audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-configure.c audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-configure.c
--- audacious-plugins-1.5.1-alsa-ng/src/alsa/alsa-configure.c 2009-06-29 18:01:20.000000000 +0200
+++ audacious-plugins-1.5.1-alsa-ng2/src/alsa/alsa-configure.c 2009-06-29 20:24:34.000000000 +0200
@@ -46,18 +46,18 @@
/* Save configuration */
mcs_handle_t *cfgfile = aud_cfg_db_open();
- aud_cfg_db_set_string(cfgfile, "alsaplug", "pcm_device", alsaplug_cfg.pcm_device);
- aud_cfg_db_set_string(cfgfile, "alsaplug", "mixer_card", alsaplug_cfg.mixer_card);
- aud_cfg_db_set_string(cfgfile, "alsaplug","mixer_device", alsaplug_cfg.mixer_device);
+ aud_cfg_db_set_string(cfgfile, "ALSA", "pcm_device", alsaplug_cfg.pcm_device);
+ aud_cfg_db_set_string(cfgfile, "ALSA", "mixer_card", alsaplug_cfg.mixer_card);
+ aud_cfg_db_set_string(cfgfile, "ALSA","mixer_device", alsaplug_cfg.mixer_device);
aud_cfg_db_close(cfgfile);
}
void alsaplug_get_config(void)
{
mcs_handle_t *cfgfile = aud_cfg_db_open();
- aud_cfg_db_get_string(cfgfile, "alsaplug", "pcm_device", &alsaplug_cfg.pcm_device);
- aud_cfg_db_get_string(cfgfile, "alsaplug", "mixer_card", &alsaplug_cfg.mixer_card);
- aud_cfg_db_get_string(cfgfile, "alsaplug","mixer_device", &alsaplug_cfg.mixer_device);
+ aud_cfg_db_get_string(cfgfile, "ALSA", "pcm_device", &alsaplug_cfg.pcm_device);
+ aud_cfg_db_get_string(cfgfile, "ALSA", "mixer_card", &alsaplug_cfg.mixer_card);
+ aud_cfg_db_get_string(cfgfile, "ALSA","mixer_device", &alsaplug_cfg.mixer_device);
aud_cfg_db_close(cfgfile);
}
audacious-plugins-1.5.1-mixer-not-ready.patch:
--- NEW FILE audacious-plugins-1.5.1-mixer-not-ready.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1/src/alsa/alsa-core.c
--- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c 2009-06-29 18:01:20.000000000 +0200
+++ audacious-plugins-fedora-1.5.1/src/alsa/alsa-core.c 2009-06-29 20:12:36.000000000 +0200
@@ -45,6 +45,7 @@
static snd_mixer_t *amixer = NULL;
static gboolean mixer_ready = FALSE;
+static gint mixer_left, mixer_right;
static snd_mixer_elem_t *
alsaplug_get_mixer_elem_by_name(snd_mixer_t *mixer, gchar *name)
@@ -140,6 +141,8 @@
{
snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
+ mixer_left = l;
+ mixer_right = r;
if (elem == NULL)
return;
@@ -172,6 +175,11 @@
{
snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
+ *l = mixer_left;
+ *r = mixer_right;
+ if (!mixer_ready) {
+ return;
+ }
if (elem == NULL)
return;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore 8 Jun 2008 08:49:28 -0000 1.16
+++ .cvsignore 29 Jun 2009 19:00:01 -0000 1.17
@@ -1 +1 @@
-audacious-plugins-fedora-1.5.1.tar.gz
+audacious-plugins-fedora-2.0.1.tar.bz2
Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- audacious-plugins.spec 29 Jun 2009 16:14:17 -0000 1.45
+++ audacious-plugins.spec 29 Jun 2009 19:00:01 -0000 1.46
@@ -4,7 +4,7 @@
Name: audacious-plugins
Version: 1.5.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Plugins for the Audacious media player
Group: Applications/Multimedia
@@ -29,6 +29,8 @@ Patch8: audacious-plugins-1.5.1-
# alsa-ng plugin from 2.1 devel
Patch50: audacious-plugins-1.5.1-alsa-ng.patch
+Patch51: audacious-plugins-1.5.1-alsaplug-id.patch
+Patch52: audacious-plugins-1.5.1-mixer-not-ready.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -174,6 +176,8 @@ vortex compressed files.
%patch8 -p1 -b .sndfile-cleanup
%patch50 -p1 -b .alsa-ng
+%patch51 -p1 -b .alsa-ng2
+%patch52 -p1 -b .mixer-not-ready
sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -268,6 +272,10 @@ update-desktop-database &> /dev/null ||
%changelog
+* Mon Jun 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-9
+- Use old "ALSA" plugin id for config file.
+- Keep old mixer level even if mixer isn't ready.
+
* Mon Jun 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-8
- Replace old ALSA output plugin and related patches with the
"alsa-ng" code from Audacious 2.1 development. This is supposed to
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 8 Jun 2008 09:07:01 -0000 1.17
+++ sources 29 Jun 2009 19:00:01 -0000 1.18
@@ -1 +1 @@
-41cd1e4bf7ba15fff449e877f9be2d7f audacious-plugins-fedora-1.5.1.tar.gz
+2a11f103a3ab39e18927b4318de63802 audacious-plugins-fedora-2.0.1.tar.bz2
More information about the fedora-extras-commits
mailing list