rpms/audacious/devel audacious-2.1-pluginprio.patch, NONE, 1.1 audacious.spec, 1.50, 1.51
Michael Schwendt
mschwendt at fedoraproject.org
Mon Aug 24 09:21:25 UTC 2009
- Previous message (by thread): rpms/xulrunner/devel xulrunner.spec,1.174,1.175
- Next message (by thread): rpms/glibc/devel .cvsignore, 1.281, 1.282 glibc-fedora.patch, 1.315, 1.316 glibc.spec, 1.408, 1.409 import.log, 1.24, 1.25 sources, 1.306, 1.307
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11560
Modified Files:
audacious.spec
Added Files:
audacious-2.1-pluginprio.patch
Log Message:
* Mon Aug 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-3
- Default to PulseAudio output plugin: Fix pluginenum.c indentation
to make output plugin default/priority init work. Actually, when I
noticed this bug, I went a step further and copied a rewrite from
upstream devel scm.
audacious-2.1-pluginprio.patch:
pluginenum.c | 70 ++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 41 insertions(+), 29 deletions(-)
--- NEW FILE audacious-2.1-pluginprio.patch ---
diff -Nur audacious-2.1-orig/src/audacious/pluginenum.c audacious-2.1/src/audacious/pluginenum.c
--- audacious-2.1-orig/src/audacious/pluginenum.c 2009-07-07 00:39:12.000000000 +0200
+++ audacious-2.1/src/audacious/pluginenum.c 2009-08-24 10:53:57.000000000 +0200
@@ -913,56 +913,68 @@
g_free(cfg.enabled_dplugins);
cfg.enabled_dplugins = NULL;
- if (!cfg.outputplugin) {
- for (prio = 10; prio >= 0; prio--) {
- for (node = op_data.output_list; node; node = g_list_next(node)) {
+ if (!cfg.outputplugin)
+ {
+ for (prio = 10; prio >= 0; prio--)
+ {
+ for (node = op_data.output_list; node; node = g_list_next(node))
+ {
op = OUTPUT_PLUGIN(node->data);
if (op->probe_priority != prio)
continue;
- if (op->init)
- {
- OutputPluginInitStatus ret = op->init();
- if (ret == OUTPUT_PLUGIN_INIT_NO_DEVICES)
- {
- g_message("Plugin %s reports no devices. Attempting to avert disaster, trying others.\n",
- g_path_get_basename(op->filename));
- }
- else if (ret == OUTPUT_PLUGIN_INIT_FAIL)
- {
- g_message("Plugin %s was unable to initialise. Attemping to avert disaster, trying others.\n",
- g_path_get_basename(op->filename));
- }
- else if (ret == OUTPUT_PLUGIN_INIT_FOUND_DEVICES)
- {
+ if (op->init)
+ {
+ OutputPluginInitStatus ret = op->init();
+ gchar *base_filename = g_path_get_basename(op->filename);
+ switch (ret) {
+ case OUTPUT_PLUGIN_INIT_NO_DEVICES:
+ g_message("Plugin %s reports no devices. Attempting to avert disaster, trying others.",
+ base_filename);
+ break;
+ case OUTPUT_PLUGIN_INIT_FAIL:
+ g_message("Plugin %s was unable to initialise. Attemping to avert disaster, trying others.",
+ base_filename);
+ break;
+ case OUTPUT_PLUGIN_INIT_FOUND_DEVICES:
+ g_message("Plugin %s found devices.", base_filename);
if (!op_data.current_output_plugin)
op_data.current_output_plugin = op;
- }
- else if (!op_data.current_output_plugin)
- {
- g_message("Plugin %s did not report status, and no plugin has worked yet. Do you still need to convert it? Selecting for now...\n",
- g_path_get_basename(op->filename));
-
+ break;
+ default:
+ g_message("Plugin %s did not report status, and no plugin has worked yet. "
+ "Do you still need to convert it? Selecting for now...",
+ base_filename);
if (!op_data.current_output_plugin)
op_data.current_output_plugin = op;
+ break;
}
- }
+ g_free(base_filename);
+ }
}
}
}
else
{
- for (node = op_data.output_list; node; node = g_list_next(node)) {
+ for (node = op_data.output_list; node; node = g_list_next(node))
+ {
+ gchar *plugin_base_filename;
+ gchar *op_base_filename;
op = OUTPUT_PLUGIN(node->data);
- if (op->init) {
- plugin_set_current((Plugin *)op);
+ if (op->init)
+ {
+ plugin_set_current((Plugin *) op);
op->init();
}
- if (!g_ascii_strcasecmp(g_path_get_basename(cfg.outputplugin), g_path_get_basename(op->filename)))
+ plugin_base_filename = g_path_get_basename(cfg.outputplugin);
+ op_base_filename = g_path_get_basename(op->filename);
+ if (!g_ascii_strcasecmp(plugin_base_filename, op_base_filename))
op_data.current_output_plugin = op;
+ g_free(plugin_base_filename);
+ g_free(op_base_filename);
}
}
Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- audacious.spec 24 Jul 2009 17:31:27 -0000 1.50
+++ audacious.spec 24 Aug 2009 09:21:24 -0000 1.51
@@ -5,7 +5,7 @@
Name: audacious
Version: 2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3
Summary: GTK2 based media player similar to XMMS
@@ -14,6 +14,9 @@ Group: Applications/Multimedia
Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
+# will be obsolete in > 2.1
+Patch0: audacious-2.1-pluginprio.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -67,7 +70,7 @@ Files needed when building software for
%prep
%setup -q -n %{name}-%{version}
-
+%patch0 -p1 -b .pluginprio
sed -i '\,^.SILENT:,d' buildsys.mk.in
%build
@@ -149,6 +152,12 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Mon Aug 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-3
+- Default to PulseAudio output plugin: Fix pluginenum.c indentation
+ to make output plugin default/priority init work. Actually, when I
+ noticed this bug, I went a step further and copied a rewrite from
+ upstream devel scm.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/xulrunner/devel xulrunner.spec,1.174,1.175
- Next message (by thread): rpms/glibc/devel .cvsignore, 1.281, 1.282 glibc-fedora.patch, 1.315, 1.316 glibc.spec, 1.408, 1.409 import.log, 1.24, 1.25 sources, 1.306, 1.307
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list