[audacious-plugin-fc] Add missing preferences widget config types.
Michael Schwendt
mschwendt at fedoraproject.org
Wed Jul 6 20:19:45 UTC 2011
commit 98ff87f9eea79849323b768b4a5f5c507b2c9a50
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Wed Jul 6 22:19:31 2011 +0200
Add missing preferences widget config types.
audacious-plugin-fc-0.6-aud30.patch | 56 ++++++++++++++++++----------------
audacious-plugin-fc.spec | 5 ++-
2 files changed, 34 insertions(+), 27 deletions(-)
---
diff --git a/audacious-plugin-fc-0.6-aud30.patch b/audacious-plugin-fc-0.6-aud30.patch
index 92a9eb4..6625fe2 100644
--- a/audacious-plugin-fc-0.6-aud30.patch
+++ b/audacious-plugin-fc-0.6-aud30.patch
@@ -1,7 +1,11 @@
-diff -Nur audacious-plugin-fc-0.6-orig/ChangeLog audacious-plugin-fc-0.6.2/ChangeLog
---- audacious-plugin-fc-0.6-orig/ChangeLog 2010-07-23 09:55:26.000000000 +0200
-+++ audacious-plugin-fc-0.6.2/ChangeLog 2011-06-15 11:37:15.000000000 +0200
-@@ -1,3 +1,17 @@
+diff -Nur audacious-plugin-fc-0.6/ChangeLog audacious-plugin-fc-0.6-aud30/ChangeLog
+--- audacious-plugin-fc-0.6/ChangeLog 2010-07-23 09:55:26.000000000 +0200
++++ audacious-plugin-fc-0.6-aud30/ChangeLog 2011-07-06 22:13:24.000000000 +0200
+@@ -1,3 +1,21 @@
++2011-07-06 Michael Schwendt <mschwendt at users.sf.net>
++
++ * src/configure.c: add widget config types
++
+2011-06-15 Michael Schwendt <mschwendt at users.sf.net>
+
+ * use Audacious GUI API instead of native GTK+
@@ -19,9 +23,9 @@ diff -Nur audacious-plugin-fc-0.6-orig/ChangeLog audacious-plugin-fc-0.6.2/Chang
2010-07-23 Michael Schwendt <mschwendt at users.sf.net>
* src/plugin.c: use probe_for_tuple instead of get_song_tuple,
-diff -Nur audacious-plugin-fc-0.6-orig/src/about.c audacious-plugin-fc-0.6.2/src/about.c
---- audacious-plugin-fc-0.6-orig/src/about.c 2010-06-20 19:00:14.000000000 +0200
-+++ audacious-plugin-fc-0.6.2/src/about.c 2011-06-15 11:34:19.000000000 +0200
+diff -Nur audacious-plugin-fc-0.6/src/about.c audacious-plugin-fc-0.6-aud30/src/about.c
+--- audacious-plugin-fc-0.6/src/about.c 2010-06-20 19:00:14.000000000 +0200
++++ audacious-plugin-fc-0.6-aud30/src/about.c 2011-07-06 22:15:38.812388496 +0200
@@ -1,66 +1,12 @@
+#include <audacious/i18n.h>
+#include <libaudgui/libaudgui-gtk.h>
@@ -96,9 +100,9 @@ diff -Nur audacious-plugin-fc-0.6-orig/src/about.c audacious-plugin-fc-0.6.2/src
+ audgui_simple_message(&about_window, GTK_MESSAGE_INFO,
+ g_strdup_printf(_("Future Composer player plugin %s"), VERSION),_("http://xmms-fc.sourceforge.net\nCreated by Michael Schwendt.\n\nMuch room for improvement.\nHave a go if you like to.\n"));
}
-diff -Nur audacious-plugin-fc-0.6-orig/src/configure.c audacious-plugin-fc-0.6.2/src/configure.c
---- audacious-plugin-fc-0.6-orig/src/configure.c 2010-07-21 17:02:14.000000000 +0200
-+++ audacious-plugin-fc-0.6.2/src/configure.c 2011-06-15 12:10:55.000000000 +0200
+diff -Nur audacious-plugin-fc-0.6/src/configure.c audacious-plugin-fc-0.6-aud30/src/configure.c
+--- audacious-plugin-fc-0.6/src/configure.c 2010-07-21 17:02:14.000000000 +0200
++++ audacious-plugin-fc-0.6-aud30/src/configure.c 2011-07-06 22:12:04.000000000 +0200
@@ -1,227 +1,150 @@
#include <audacious/configdb.h>
#include <audacious/plugin.h>
@@ -402,19 +406,19 @@ diff -Nur audacious-plugin-fc-0.6-orig/src/configure.c audacious-plugin-fc-0.6.2
+}
+
+static PreferencesWidget prefs_precision[] = {
-+ {WIDGET_RADIO_BTN, "16", &config.bits16, NULL, NULL, FALSE},
-+ {WIDGET_RADIO_BTN, "8", &config.bits8, NULL, NULL, FALSE},
++ {WIDGET_RADIO_BTN, "16", &config.bits16, NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
++ {WIDGET_RADIO_BTN, "8", &config.bits8, NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
+};
+
+static PreferencesWidget prefs_channels[] = {
-+ {WIDGET_RADIO_BTN, "Stereo", &config.stereo, NULL, NULL, FALSE},
-+ {WIDGET_RADIO_BTN, "Mono", &config.mono, NULL, NULL, FALSE},
++ {WIDGET_RADIO_BTN, "Stereo", &config.stereo, NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
++ {WIDGET_RADIO_BTN, "Mono", &config.mono, NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
+};
+
+static PreferencesWidget prefs_frequency[] = {
-+ {WIDGET_RADIO_BTN, "48000", &config.freq48, NULL, NULL, FALSE},
-+ {WIDGET_RADIO_BTN, "44100", &config.freq44, NULL, NULL, FALSE},
-+ {WIDGET_RADIO_BTN, "22050", &config.freq22, NULL, NULL, FALSE},
++ {WIDGET_RADIO_BTN, "48000", &config.freq48, NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
++ {WIDGET_RADIO_BTN, "44100", &config.freq44, NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
++ {WIDGET_RADIO_BTN, "22050", &config.freq22, NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
+};
+
+static PreferencesWidget prefs_top_row[] = {
@@ -440,9 +444,9 @@ diff -Nur audacious-plugin-fc-0.6-orig/src/configure.c audacious-plugin-fc-0.6.2
+ .init = configure_init,
+ .apply = configure_apply,
+};
-diff -Nur audacious-plugin-fc-0.6-orig/src/configure.h audacious-plugin-fc-0.6.2/src/configure.h
---- audacious-plugin-fc-0.6-orig/src/configure.h 2002-02-06 02:11:56.000000000 +0100
-+++ audacious-plugin-fc-0.6.2/src/configure.h 2011-06-15 11:34:19.000000000 +0200
+diff -Nur audacious-plugin-fc-0.6/src/configure.h audacious-plugin-fc-0.6-aud30/src/configure.h
+--- audacious-plugin-fc-0.6/src/configure.h 2002-02-06 02:11:56.000000000 +0100
++++ audacious-plugin-fc-0.6-aud30/src/configure.h 2011-07-06 22:15:38.813388457 +0200
@@ -1,16 +1,19 @@
#ifndef CONFIGURE_H
#define CONFIGURE_H
@@ -465,9 +469,9 @@ diff -Nur audacious-plugin-fc-0.6-orig/src/configure.h audacious-plugin-fc-0.6.2
extern void fc_ip_load_config(void);
extern FCpluginConfig fc_myConfig;
-diff -Nur audacious-plugin-fc-0.6-orig/src/main.c audacious-plugin-fc-0.6.2/src/main.c
---- audacious-plugin-fc-0.6-orig/src/main.c 2010-07-23 09:51:35.000000000 +0200
-+++ audacious-plugin-fc-0.6.2/src/main.c 2011-06-15 11:34:19.000000000 +0200
+diff -Nur audacious-plugin-fc-0.6/src/main.c audacious-plugin-fc-0.6-aud30/src/main.c
+--- audacious-plugin-fc-0.6/src/main.c 2010-07-23 09:51:35.000000000 +0200
++++ audacious-plugin-fc-0.6-aud30/src/main.c 2011-07-06 22:15:38.814388419 +0200
@@ -22,8 +22,8 @@
#include <glib.h>
#include <fc14audiodecoder.h>
@@ -594,9 +598,9 @@ diff -Nur audacious-plugin-fc-0.6-orig/src/main.c audacious-plugin-fc-0.6.2/src/
jumpToTime = msec;
playback->output->abort_write();
g_cond_signal(seek_cond);
-diff -Nur audacious-plugin-fc-0.6-orig/src/plugin.c audacious-plugin-fc-0.6.2/src/plugin.c
---- audacious-plugin-fc-0.6-orig/src/plugin.c 2010-07-23 09:38:18.000000000 +0200
-+++ audacious-plugin-fc-0.6.2/src/plugin.c 2011-06-15 11:34:19.000000000 +0200
+diff -Nur audacious-plugin-fc-0.6/src/plugin.c audacious-plugin-fc-0.6-aud30/src/plugin.c
+--- audacious-plugin-fc-0.6/src/plugin.c 2010-07-23 09:38:18.000000000 +0200
++++ audacious-plugin-fc-0.6-aud30/src/plugin.c 2011-07-06 22:15:38.815388378 +0200
@@ -1,28 +1,29 @@
#include <audacious/plugin.h>
diff --git a/audacious-plugin-fc.spec b/audacious-plugin-fc.spec
index ddcc369..f38dd81 100644
--- a/audacious-plugin-fc.spec
+++ b/audacious-plugin-fc.spec
@@ -13,7 +13,7 @@
Summary: Future Composer input plugin for Audacious
Name: audacious-plugin-fc
Version: 0.6
-Release: 8%{?dist}
+Release: 9%{?dist}
Provides: audacious-plugins-fc = %{version}-%{release}
URL: http://xmms-fc.sourceforge.net/
License: GPLv2+
@@ -57,6 +57,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
%changelog
+* Wed Jul 6 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6-9
+- Add missing preferences widget config types.
+
* Mon Jul 4 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6-8
- Rebuild for Audacious 3.0-beta1 generic plugin API/ABI bump.
More information about the scm-commits
mailing list