rpms/audacious-plugins/F-11 audacious-plugins-1.5.1-alsaplug-id.patch, NONE, 1.1 audacious-plugins-1.5.1-mixer-not-ready.patch, NONE, 1.1 audacious-plugins.spec, 1.36, 1.37

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8493

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-alsaplug-id.patch 
	audacious-plugins-1.5.1-mixer-not-ready.patch 
Log Message:
sync with Rawhide

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: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- audacious-plugins.spec	29 Jun 2009 16:15:50 -0000	1.36
+++ audacious-plugins.spec	29 Jun 2009 19:06:50 -0000	1.37
@@ -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