Author: baggins Date: Tue Jun 8 12:40:11 2010 GMT Module: packages Tag: HEAD ---- Log message: - diff against http://svn.gnome.org/svn/gnome-alsamixer/trunk/
---- Files affected: packages/gnome-alsamixer: gnome-alsamixer-svn.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gnome-alsamixer/gnome-alsamixer-svn.patch diff -u /dev/null packages/gnome-alsamixer/gnome-alsamixer-svn.patch:1.1 --- /dev/null Tue Jun 8 14:40:11 2010 +++ packages/gnome-alsamixer/gnome-alsamixer-svn.patch Tue Jun 8 14:40:06 2010 @@ -0,0 +1,12012 @@ +Index: stamp-h.in +=================================================================== +--- stamp-h.in (.../tags/pre1-0-9-6) (revision 219) ++++ stamp-h.in (.../trunk) (revision 219) +@@ -1 +0,0 @@ +-timestamp +Index: configure.ac +=================================================================== +--- configure.ac (.../tags/pre1-0-9-6) (revision 219) ++++ configure.ac (.../trunk) (revision 219) +@@ -1,7 +1,8 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(configure.ac) +-AM_INIT_AUTOMAKE(gnome-alsamixer, 0.9.6) ++AC_INIT(gnome-alsamixer, 0.9.7) ++AC_CONFIG_SRCDIR(src/gam-main.c) ++AM_INIT_AUTOMAKE(dist-bzip2) + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(config.h) + +@@ -25,15 +26,23 @@ + + GNOME_COMPILE_WARNINGS + +-pkg_modules="libgnomeui-2.0 alsa" ++PKG_CHECK_MODULES(DBUS_GTK, gtk+-2.0 >= 2.6.0, have_gtk26=yes, have_gtk26=no) ++ ++if test x$have_gtk26 = xyes ; then ++ AC_DEFINE_UNQUOTED(HAVE_GTK26, , "") ++fi ++ ++pkg_modules="libgnomeui-2.0 gconf-2.0 alsa" + PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) + AC_SUBST(PACKAGE_CFLAGS) + AC_SUBST(PACKAGE_LIBS) + ++AM_GCONF_SOURCE_2 ++ + GETTEXT_PACKAGE=gnome-alsamixer + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", "") +-ALL_LINGUAS="" ++ALL_LINGUAS="ar az ca cs da de dz el en_CA en_GB es eu fi fr gl hr hu ja mn mk nb ne nl oc pa pt pt_BR ru sk sl sq sr s...@latn sv th uk vi zh_CN zh_TW" + AM_GLIB_GNU_GETTEXT + + AC_CONFIG_FILES([Makefile +Index: AUTHORS +=================================================================== +--- AUTHORS (.../tags/pre1-0-9-6) (revision 219) ++++ AUTHORS (.../trunk) (revision 219) +@@ -1,5 +1,5 @@ + Maintainer and main developer +- Dennis J Houy <[email protected]> ++ Derrick J Houy <[email protected]> + + Contibutors + David Fort <[email protected]> +Index: gnome-alsamixer.spec.in +=================================================================== +--- gnome-alsamixer.spec.in (.../tags/pre1-0-9-6) (revision 219) ++++ gnome-alsamixer.spec.in (.../trunk) (revision 219) +@@ -16,12 +16,14 @@ + URL: http://www.paw.za.org/projects/@PACKAGE@ + BuildRoot: /var/tmp/@pack...@-%{package_version}-root + +-Requires: gtk2 >= 2.0.0 +-Requires: libgnomeui >= 2.0.0 ++Requires: gtk2 >= 2.4.0 ++Requires: libgnomeui >= 2.4.0 ++Requires: GConf2 >= 2.8.0 + Requires: alsa-lib >= 0.9.0 + + BuildRequires: gtk2-devel >= 2.0.0 + BuildRequires: libgnomeui-devel >= 2.0.0 ++BuildRequires: GConf2-devel >= 2.8.0 + BuildRequires: alsa-lib >= 0.9.0 + BuildRequires: desktop-file-utils + +@@ -30,7 +32,7 @@ + Architecture (ALSA), which supports ALSA 0.9.x. + + %prep +-%setup -q -n gnome-alsamixer-%{version} ++%setup -q -n %{name}-%{version} + + %build + %configure +@@ -38,7 +40,9 @@ + + %install + rm -rf $RPM_BUILD_ROOT ++export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + make DESTDIR=$RPM_BUILD_ROOT install-strip ++unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + + cat << EOF > gnome-alsamixer.desktop + [Desktop Entry] +@@ -64,6 +68,16 @@ + --add-category X-Red-Hat-Base \ + gnome-alsamixer.desktop + ++%post ++export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &> /dev/null || : ++/usr/bin/killall -HUP gconfd-2 ++ ++%postun ++export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &> /dev/null || : ++/usr/bin/killall -HUP gconfd-2 ++ + %clean + rm -rf $RPM_BUILD_ROOT + +@@ -71,10 +85,18 @@ + %defattr(-, root, root) + %doc README COPYING ChangeLog NEWS AUTHORS INSTALL TODO + %{_bindir}/%{name} ++%{_sysconfdir}/gconf/schemas/%{name}.schemas + %{_datadir}/applications/*%{name}.desktop + %{_datadir}/pixmaps/%{name} ++%{_datadir}/locale/* + + %changelog ++* Thu Jul 7 2005 Derrick J Houy <[email protected]> ++- Added GConf stuff, and gnome-alsamixer.schemas to files section. ++ ++* Wed Sep 10 2003 Dennis J Houy <[email protected]> ++- Added locale directory. ++ + * Mon Sep 8 2003 Dennis J Houy <[email protected]> + - Added creation of Red Hat menu entry to spec file. + +Index: ChangeLog +=================================================================== +--- ChangeLog (.../tags/pre1-0-9-6) (revision 219) ++++ ChangeLog (.../trunk) (revision 219) +@@ -1,5 +1,202 @@ +-Tue Sep 9 2003 Dennis J Houy <[email protected]> ++2007-10-14 Yannig Marchegay <[email protected]> + ++ * configure.ac: Added 'oc' to ALL_LINGUAS. ++ ++2007-01-24 Matic Zgur <[email protected]> ++ ++ * configure.ac: Added 'sl' to ALL_LINGUAS. ++ ++2006-09-19 Martin Willemoes Hansen <[email protected]> ++ ++ * configure.ac: Added Danish (da) to ALL_LINGUAS. ++ ++2006-08-06 Arangel Angov <[email protected]> ++ ++ * configure.ac: Added 'mk' for Macedonian to ALL_LINGUAS. ++ ++2006-04-18 Kjartan Maraas <[email protected]> ++ ++ * configure.ac: Cruft removal. ++ * po/no.po: ++ ++2006-04-11 Pema Geyleg <[email protected]> ++ ++ * configure.ac: Added dz (Dzongkha) in ALL_LINGUAS. ++ ++2006-01-24 Clytie Siddall <[email protected]> ++ ++ * configure.in Added vi in ALL_LINGUAS line. ++ ++ 2006-01-07 Kjartan Maraas <[email protected]> ++ ++ * configure.ac: Add nb to ALL_LINGUAS. ++ ++2005-08-24 Pawan Chitrakar <[email protected]> ++ ++ * configure.ac: Added ne in ALL_LINGUAS ++ ++Mon Aug 15 2005 Ilkka Tuohela <[email protected]> ++ ++ * configure.ac: Added Finnish translation to ALL_LINGUAS. ++ ++Fri Jul 7 2005 Derrick J Houy <[email protected]> ++ ++ * completed migration to GConf ++ * configure.ac: ++ - define HAVE_GTK26 if GTK+ version >= 2.6 ++ * src/gam-app.c: ++ - use gtk_show_about_dialog if GTK+ version >= 2.6 ++ * src/gam-app.h, src/gam-mixer.c, src/gam-slider.c, src/gam-toggle.c: ++ - added GAM_CONFIG_DELIMITERS to specify the characters to be replaced ++ in keys used by GConf ++ ++Thu Jul 7 2005 Derrick J Houy <[email protected]> ++ ++ * src/gam-app.c, src/gam-mixer.c: ++ - fixed a bug where priv-> is used before it is set. ++ ++Wed Jul 6 2005 Derrick J Houy <[email protected]> ++ ++ * re-write of autogen.sh to not rely on gnome-common ++ * re-structured configure.in -- bumped version number to 0.9.7 ++ * removed gam_app_finalize, added gam_app_destroy ++ * changed gam_app_delete_cd to gam_app_delete ++ * changed menus and toolbar to work with GtkUIManager instead of GnomeUIInfo ++ - changed layout of menus to be more clear ++ * changed private data structures to use GType private data functionality ++ * including <glib/gi18n.h> instead of <libgnome/gnome-i18n.h> ++ * started migration to GConf ++ ++2005-06-14 Christian Rose <[email protected]> ++ ++ * configure.ac: Added "gl" to ALL_LINGUAS. ++ ++2005-04-14 Abel Cheung <[email protected]> ++ ++ * configure.ac: Added "zh_TW" to ALL_LINGUAS. ++ ++2004-07-31 Jordi Mallach <[email protected]> ++ ++ * configure.ac (ALL_LINGUAS): Added "ca" (Catalan). ++ ++2004-05-01 Adam Weinberger <[email protected]> ++ ++ * configure.in: Added en_CA to ALL_LINGUAS. ++ ++2004-04-24 Andras Timar <[email protected]> ++ ++ * configure.ac: Added hu to ALL_LINGUAS. ++ ++2004-04-07 Yuriy Syrota <[email protected]> ++ ++ * configure.ac: Added "uk" (Ukrainian) into ALL_LINGUAS. ++ ++2004-03-29 Gareth Owen <[email protected]> ++ ++ * configure.ac: Added en_GB to ALL_LINGUAS ++ ++2004-03-28 Takeshi AIHANA <[email protected]> ++ ++ * configure.ac: Added ja "Japanese" into ALL_LINGUAS. ++ ++2004-03-15 Gustavo Noronha Silva <[email protected]> ++ ++ * configure.ac: added pt_BR (Brazilian Portuguese) to ++ ALL_LINGUAS. ++ ++2004-03-04 Guntupalli Karunakar <[email protected]> ++ ++ * configure.ac: Added "pa" (Punjabi) to ALL_LINGUAS. ++ ++2004-02-21 Paisa Seeluangsawat <[email protected]> ++ ++ * configure.ac: Added Thai (th) to ALL_LINGUAS. ++ ++2004-02-05 Robert Sedak <[email protected]> ++ ++ * configure.ac: Added "hr" (Croatian) to ALL_LINGUAS. ++ ++2004-01-17 Kjartan Maraas <[email protected]> ++ ++ * configure.ac: Added "no" to ALL_LINGUAS. ++ ++2004-01-08 Iñaki Larrañaga <[email protected]> ++ ++ * configure.ac: Added "eu" (Basque) to ALL_LINGUAS. ++ ++2003-12-16 Stanislav Visnovsky <[email protected]> ++ ++ * configure.ac: Added Slovak "sk" to ALL_LINGUAS. ++ ++2003-12-04 Sanlig Badral <[email protected]> ++ ++ * configure.ac: Added Mongolian "mn" to ALL_LINGUAS. ++ ++2003-11-23 Christian Neumair <[email protected]> ++ ++ * configure.ac: Added German (de) to ALL_LINGUAS. ++ ++2003-11-12 Duarte Loreto <[email protected]> ++ ++ * configure.ac: Added pt (Portuguese) to ALL_LINGUAS. ++ ++2003-11-11 Pablo Gonzalo del Campo <[email protected]> ++ ++ * configure.ac: Added es (Spanish) to ALL_LINGUAS. ++ ++2003-10-28 Derrick J Houy <[email protected]> ++ ++ * src/gam-app.c: ++ Changed hyphen in about box copyright message to en-dash. ++ ++2003-10-28 Miloslav Trmac <[email protected]> ++ ++ * configure.ac: Added cs (Czech) to ALL_LINGUAS. ++ ++2003-10-27 Derrick J Houy <[email protected]> ++ ++ * src/gam-prefs-dlg.c, src/gam-props-dlg.c: ++ Bug 125377 - Remove unnecessary markup from messages. ++ ++ * po.POTFILES.in: ++ Removed the UTF-8 encoding requirement. ++ ++ * src/gam-app.c: ++ Removed the about box copyright message from translation. ++ ++2003-10-26 Metin Amiroff <[email protected]> ++ ++ * configure.in: Added az to ALL_LINGUAS. ++ ++2003-10-25 Danilo Šegan <[email protected]> ++ ++ * configure.ac: Added "sr" and "s...@latn" to ALL_LINGUAS. ++ ++2003-10-24 Christian Rose <[email protected]> ++ ++ * configure.ac: Added "sv" to ALL_LINGUAS. ++ ++Fri Sep 12 2003 Derrick J Houy <[email protected]> ++ ++ * src/gam-app.c: ++ Added localization where it was missing. ++ Added g_free () for some gchar variables. ++ Extra cleanup in gam_mixer_finalize. ++ Replaced some g_return_if_fail macros with if statements, so the logic ++ still works when G_DISABLE_CHECKS is used. ++ Added extra g_return_[val_]if_fail macros where needed. ++ ++ * src/gam-slider: ++ Removed gam_slider_real_resfresh, placing code in gam_slider_refresh -- ++ fixes bug where mute and capture buttons were not updating. ++ ++Wed Sep 10 2003 Derrick J Houy <[email protected]> ++ ++ * configure.za, po/fr.po: added French translation from ++ Stephane Tranchemer <[email protected]> ++ ++Tue Sep 9 2003 Derrick J Houy <[email protected]> ++ + * src/gam-slider.c, src/gam-slider-dual.c, src/gam-prefs-dlg.c: + Added option to change slider toggles to checkboxes instead of buttons. + Set this as the application default. +@@ -8,7 +205,7 @@ + + * src/gam-props-dlg.c: HIG'ified dialog. + +-Mon Sep 8 2003 Dennis J Houy <[email protected]> ++Mon Sep 8 2003 Derrick J Houy <[email protected]> + + * Changelog: changed format. + +@@ -28,12 +225,12 @@ + Added extra BuildRequires. + Added -q -n gnome-alsamixer-%{version} to %setup. + +-* Mon Sep 8 2003 Dennis J Houy <[email protected]> - 0.9.5 ++* Mon Sep 8 2003 Derrick J Houy <[email protected]> - 0.9.5 + - Added new optional dual slider with lock button + - Added slider style option to preferences dialog + - HIG'ified preferences dialog + +-* Wed Aug 27 2003 Dennis J Houy <[email protected]> - 0.9.4 ++* Wed Aug 27 2003 Derrick J Houy <[email protected]> - 0.9.4 + - Moved various gam_app data to private structure + - Replaced gam_app_destroy with gam_app_finalize + - Added gam_app_ prefix to functions that were missing it +@@ -66,30 +263,30 @@ + + - Removed app property from gam_mixer + +-* Wed Dec 18 2002 Dennis J Houy <[email protected]> - 0.9.3 ++* Wed Dec 18 2002 Derrick J Houy <[email protected]> - 0.9.3 + - Improved toggle layout + - Improved state updating + - Improved toggle state handling + +-* Tue Dec 10 2002 Dennis J Houy <[email protected]> - 0.9.2 ++* Tue Dec 10 2002 Derrick J Houy <[email protected]> - 0.9.2 + - Added state update capability + +-* Fri Nov 22 2002 Dennis J Houy <[email protected]> - 0.9.1 ++* Fri Nov 22 2002 Derrick J Houy <[email protected]> - 0.9.1 + - Added support for multiple sound cards + - Added program preferences dialog + - Started mixer properties dailog + +-* Fri Nov 15 2002 Dennis J Houy <[email protected]> - 0.9.0 ++* Fri Nov 15 2002 Derrick J Houy <[email protected]> - 0.9.0 + - Re-coded for GNOME2 + +-* Fri Sep 22 2002 Dennis J Houy <[email protected]> - 0.1.2beta ++* Fri Sep 22 2002 Derrick J Houy <[email protected]> - 0.1.2beta + - Fixed preferences dialog crash + - Fixed exclusive mode record buttons + - Changed call back for capture mode switches + +-* Thu Sep 22 2002 Dennis J Houy <[email protected]> - 0.1.1beta ++* Thu Sep 22 2002 Derrick J Houy <[email protected]> - 0.1.1beta + - Added preferences dialog to change visibility and named of controls + - Added scollable region for sliders, so mixer does not go wider than screen + - Added save and restore of application window size + - Hopefully fixed startup issues with SBLive and Ensoniq cards +-- Lots of bug fixes +\ No newline at end of file ++- Lots of bug fixes +Index: src/gam-slider-pan.c +=================================================================== +--- src/gam-slider-pan.c (.../tags/pre1-0-9-6) (revision 219) ++++ src/gam-slider-pan.c (.../trunk) (revision 219) +@@ -1,7 +1,7 @@ + /* + * (gnome-alsamixer) An ALSA mixer for GNOME + * +- * Copyright (C) 2001-2003 Dennis J Houy <[email protected]>. ++ * Copyright (C) 2001-2005 Derrick J Houy <[email protected]>. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -28,6 +28,10 @@ + + #include "gam-slider-pan.h" + ++#define GAM_SLIDER_PAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GAM_TYPE_SLIDER_PAN, GamSliderPanPrivate)) ++ ++typedef struct _GamSliderPanPrivate GamSliderPanPrivate; ++ + struct _GamSliderPanPrivate + { + GtkWidget *pan_slider; +@@ -94,39 +98,42 @@ + gobject_class->constructor = gam_slider_pan_constructor; + + object_class->refresh = gam_slider_pan_refresh; ++ ++ g_type_class_add_private (gobject_class, sizeof (GamSliderPanPrivate)); + } + + static void + gam_slider_pan_init (GamSliderPan *gam_slider_pan) + { ++ GamSliderPanPrivate *priv; ++ + g_return_if_fail (GAM_IS_SLIDER_PAN (gam_slider_pan)); + +- gam_slider_pan->priv = g_new0 (GamSliderPanPrivate, 1); ++ priv = GAM_SLIDER_PAN_GET_PRIVATE (gam_slider_pan); + +- gam_slider_pan->priv->pan_slider = NULL; +- gam_slider_pan->priv->vol_slider = NULL; +- gam_slider_pan->priv->pan_adjustment = NULL; +- gam_slider_pan->priv->vol_adjustment = NULL; ++ priv->pan_slider = NULL; ++ priv->vol_slider = NULL; ++ priv->pan_adjustment = NULL; ++ priv->vol_adjustment = NULL; + } + + static void + gam_slider_pan_finalize (GObject *object) + { + GamSliderPan *gam_slider_pan; ++ GamSliderPanPrivate *priv; + + g_return_if_fail (GAM_IS_SLIDER_PAN (object)); + + gam_slider_pan = GAM_SLIDER_PAN (object); + +- gam_slider_pan->priv->pan_adjustment = NULL; +- gam_slider_pan->priv->vol_adjustment = NULL; +- gam_slider_pan->priv->pan_slider = NULL; +- gam_slider_pan->priv->vol_slider = NULL; ++ priv = GAM_SLIDER_PAN_GET_PRIVATE (gam_slider_pan); + +- g_free (gam_slider_pan->priv); ++ priv->pan_adjustment = NULL; ++ priv->vol_adjustment = NULL; ++ priv->pan_slider = NULL; ++ priv->vol_slider = NULL; + +- gam_slider_pan->priv = NULL; +- + G_OBJECT_CLASS (parent_class)->finalize (object); + } + +@@ -135,9 +142,10 @@ + guint n_construct_properties, + GObjectConstructParam *construct_params) + { +- gint value; + GObject *object; + GamSliderPan *gam_slider_pan; ++ GamSliderPanPrivate *priv; ++ gint value; + + object = (* G_OBJECT_CLASS (parent_class)->constructor) (type, + n_construct_properties, +@@ -145,37 +153,39 @@ + + gam_slider_pan = GAM_SLIDER_PAN (object); + ++ priv = GAM_SLIDER_PAN_GET_PRIVATE (gam_slider_pan); ++ + if (!snd_mixer_selem_is_playback_mono (gam_slider_get_elem (GAM_SLIDER (gam_slider_pan)))) { +- gam_slider_pan->priv->pan_adjustment = gtk_adjustment_new (gam_slider_pan_get_pan (gam_slider_pan), -100, 101, 1, 5, 1); ++ priv->pan_adjustment = gtk_adjustment_new (gam_slider_pan_get_pan (gam_slider_pan), -100, 101, 1, 5, 1); + +- g_signal_connect (G_OBJECT (gam_slider_pan->priv->pan_adjustment), "value-changed", ++ g_signal_connect (G_OBJECT (priv->pan_adjustment), "value-changed", + G_CALLBACK (gam_slider_pan_pan_value_changed_cb), gam_slider_pan); + +- gam_slider_pan->priv->pan_slider = gtk_hscale_new (GTK_ADJUSTMENT (gam_slider_pan->priv->pan_adjustment)); +- gtk_scale_set_draw_value (GTK_SCALE (gam_slider_pan->priv->pan_slider), FALSE); ++ priv->pan_slider = gtk_hscale_new (GTK_ADJUSTMENT (priv->pan_adjustment)); ++ gtk_scale_set_draw_value (GTK_SCALE (priv->pan_slider), FALSE); + +- g_signal_connect (G_OBJECT (gam_slider_pan->priv->pan_slider), "event", ++ g_signal_connect (G_OBJECT (priv->pan_slider), "event", + G_CALLBACK (gam_slider_pan_pan_event_cb), gam_slider_pan); + } else +- gam_slider_pan->priv->pan_slider = gtk_label_new (NULL); ++ priv->pan_slider = gtk_label_new (NULL); + +- gtk_widget_show (gam_slider_pan->priv->pan_slider); ++ gtk_widget_show (priv->pan_slider); + +- gam_slider_add_pan_widget (GAM_SLIDER (gam_slider_pan), gam_slider_pan->priv->pan_slider); ++ gam_slider_add_pan_widget (GAM_SLIDER (gam_slider_pan), priv->pan_slider); + +- gam_slider_pan->priv->vol_adjustment = gtk_adjustment_new (gam_slider_pan_get_volume (gam_slider_pan), 0, 101, 1, 5, 1); ++ priv->vol_adjustment = gtk_adjustment_new (gam_slider_pan_get_volume (gam_slider_pan), 0, 101, 1, 5, 1); + +- g_signal_connect (G_OBJECT (gam_slider_pan->priv->vol_adjustment), "value-changed", ++ g_signal_connect (G_OBJECT (priv->vol_adjustment), "value-changed", + G_CALLBACK (gam_slider_pan_volume_value_changed_cb), gam_slider_pan); + +- gam_slider_pan->priv->vol_slider = gtk_vscale_new (GTK_ADJUSTMENT (gam_slider_pan->priv->vol_adjustment)); +- gtk_widget_show (gam_slider_pan->priv->vol_slider); +- gtk_scale_set_draw_value (GTK_SCALE (gam_slider_pan->priv->vol_slider), FALSE); ++ priv->vol_slider = gtk_vscale_new (GTK_ADJUSTMENT (priv->vol_adjustment)); ++ gtk_widget_show (priv->vol_slider); ++ gtk_scale_set_draw_value (GTK_SCALE (priv->vol_slider), FALSE); + +- gam_slider_add_volume_widget (GAM_SLIDER (gam_slider_pan), gam_slider_pan->priv->vol_slider); ++ gam_slider_add_volume_widget (GAM_SLIDER (gam_slider_pan), priv->vol_slider); + + gtk_label_set_mnemonic_widget (gam_slider_get_label_widget (GAM_SLIDER (gam_slider_pan)), +- gam_slider_pan->priv->vol_slider); ++ priv->vol_slider); + + return object; + } +@@ -233,21 +243,25 @@ + static void + gam_slider_pan_update_volume (GamSliderPan *gam_slider_pan) + { ++ GamSliderPanPrivate *priv; ++ + gint left_chn = 0, right_chn = 0; + glong pmin, pmax; + ++ priv = GAM_SLIDER_PAN_GET_PRIVATE (gam_slider_pan); ++ + if (snd_mixer_selem_has_playback_volume (gam_slider_get_elem (GAM_SLIDER (gam_slider_pan)))) + snd_mixer_selem_get_playback_volume_range (gam_slider_get_elem (GAM_SLIDER (gam_slider_pan)), &pmin, &pmax); + else + snd_mixer_selem_get_capture_volume_range (gam_slider_get_elem (GAM_SLIDER (gam_slider_pan)), &pmin, &pmax); + +- left_chn = right_chn = rint ((100 - GTK_ADJUSTMENT (gam_slider_pan->priv->vol_adjustment)->value) / (100 / (gfloat)pmax)); ++ left_chn = right_chn = rint ((100 - GTK_ADJUSTMENT (priv->vol_adjustment)->value) / (100 / (gfloat)pmax)); + + if (!snd_mixer_selem_is_playback_mono (gam_slider_get_elem (GAM_SLIDER (gam_slider_pan)))) { +- if (GTK_ADJUSTMENT (gam_slider_pan->priv->pan_adjustment)->value < 0) { +- right_chn = rint (left_chn - ((gfloat)ABS(GTK_ADJUSTMENT (gam_slider_pan->priv->pan_adjustment)->value) / 100) * left_chn); +- } else if (GTK_ADJUSTMENT (gam_slider_pan->priv->pan_adjustment)->value > 0) { +- left_chn = rint (right_chn - ((gfloat)GTK_ADJUSTMENT (gam_slider_pan->priv->pan_adjustment)->value / 100) * right_chn); ++ if (GTK_ADJUSTMENT (priv->pan_adjustment)->value < 0) { ++ right_chn = rint (left_chn - ((gfloat)ABS(GTK_ADJUSTMENT (priv->pan_adjustment)->value) / 100) * left_chn); ++ } else if (GTK_ADJUSTMENT (priv->pan_adjustment)->value > 0) { ++ left_chn = rint (right_chn - ((gfloat)GTK_ADJUSTMENT (priv->pan_adjustment)->value / 100) * right_chn); + } + } + +@@ -265,9 +279,13 @@ + static gint + gam_slider_pan_pan_event_cb (GtkWidget *widget, GdkEvent *event, GamSliderPan *gam_slider_pan) + { ++ GamSliderPanPrivate *priv; ++ ++ priv = GAM_SLIDER_PAN_GET_PRIVATE (gam_slider_pan); ++ + if (event->type == GDK_2BUTTON_PRESS) { <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
