Hello community,
here is the log from the commit of package yast2-sound
checked in at Thu Dec 7 21:43:19 CET 2006.
--------
--- yast2-sound/yast2-sound.changes 2006-11-10 10:06:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-sound/yast2-sound.changes 2006-12-05 14:29:09.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Nov 30 13:29:42 CET 2006 - lslezak@suse.cz
+
+- align action buttons to the left in the advanced dialog (#211557)
+- display "Index" in the table header (#211555)
+- enahced description of "Start Sequencer" option (#211559)
+- display kernel module name in driver list
+- use sliders in the mixer dialog, display [OK] button (#211563)
+- added type information, fixed type mismatch (#115256)
+- correctly export volume settings in autoyast (#219399)
+- volume export/import testsuite
+- fixed volume configuration in autoyast (config mode)
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-sound-2.14.0.tar.bz2
New:
----
yast2-sound-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-sound.spec ++++++
--- /var/tmp/diff_new_pack.Bc9PX6/_old 2006-12-07 21:43:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Bc9PX6/_new 2006-12-07 21:43:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-sound (Version 2.14.0)
+# spec file for package yast2-sound (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-sound
-Version: 2.14.0
+Version: 2.15.0
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-sound-2.14.0.tar.bz2
+Source0: yast2-sound-2.15.0.tar.bz2
prefix: /usr
BuildRequires: alsa-devel doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite
Requires: yast2 alsa
@@ -38,7 +38,7 @@
Dan Meszaros
%prep
-%setup -n yast2-sound-2.14.0
+%setup -n yast2-sound-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,17 @@
%doc %{prefix}/share/doc/packages/yast2-sound
%changelog -n yast2-sound
+* Thu Nov 30 2006 - lslezak@suse.cz
+- align action buttons to the left in the advanced dialog (#211557)
+- display "Index" in the table header (#211555)
+- enahced description of "Start Sequencer" option (#211559)
+- display kernel module name in driver list
+- use sliders in the mixer dialog, display [OK] button (#211563)
+- added type information, fixed type mismatch (#115256)
+- correctly export volume settings in autoyast (#219399)
+- volume export/import testsuite
+- fixed volume configuration in autoyast (config mode)
+- 2.15.0
* Fri Nov 10 2006 - lslezak@suse.cz
- added a RNC schema for Autoyast profile validation (#219011)
- 2.14.0
++++++ yast2-sound-2.14.0.tar.bz2 -> yast2-sound-2.15.0.tar.bz2 ++++++
++++ 2802 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/VERSION new/yast2-sound-2.15.0/VERSION
--- old/yast2-sound-2.14.0/VERSION 2006-11-10 07:20:37.000000000 +0100
+++ new/yast2-sound-2.15.0/VERSION 2006-12-05 13:32:55.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/configure.in new/yast2-sound-2.15.0/configure.in
--- old/yast2-sound-2.14.0/configure.in 2006-11-10 10:00:00.000000000 +0100
+++ new/yast2-sound-2.15.0/configure.in 2006-12-05 13:57:07.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-sound, 2.14.0, http://bugs.opensuse.org/, yast2-sound)
+AC_INIT(yast2-sound, 2.15.0, http://bugs.opensuse.org/, yast2-sound)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.0"
+VERSION="2.15.0"
RPMNAME="yast2-sound"
MAINTAINER="Ladislav Slezak volume_settings = [];
/**
* rc settings
@@ -167,7 +167,7 @@
*/
global list<map> modules_conf_b = nil;
map rc_vars_b = nil;
- list volume_settings_b = nil;
+ list
volume_settings_b = nil;
global string selected_uniq = "";
@@ -743,6 +743,94 @@
return true;
}
+ global list
ExportVolumeSettings(list
volume_setup)
+ {
+ y2milestone("ExportVolumeSettings: %1", volume_setup);
+ list
ret = [];
+
+ if (volume_setup == nil)
+ {
+ return ret;
+ }
+
+ foreach(list card, (list<list>)volume_setup,
+ {
+ list<map> channels = [];
+
+ foreach(list channel, (list<list>)card,
+ {
+ map ch = $[
+ "name" : channel[0]:"unknown",
+ "volume" : channel[1]:0,
+ "mute" : channel[2]:false
+ ];
+
+ channels = add(channels, ch);
+ }
+ );
+
+ ret = add(ret, channels);
+ }
+ );
+
+ y2milestone("Exported volume setting: %1", ret);
+
+ return ret;
+ }
+
+ global list
ImportVolumeSettings(list volume_setup)
+ {
+ list
ret = [];
+
+ y2milestone("ImportVolumeSettings: %1", volume_setup);
+
+ if (volume_setup == nil)
+ {
+ return ret;
+ }
+
+ foreach(list card, (list<list>)volume_setup,
+ {
+ list<list> channels = [];
+
+ foreach(any channel, card,
+ {
+ list ch = [];
+
+ if (is(channel, map))
+ {
+ map channel_map = (map)channel;
+
+ // convert map to list
+ ch = add(ch, channel_map["name"]:"unknown");
+ ch = add(ch, channel_map["volume"]:0);
+ ch = add(ch, channel_map["mute"]:false);
+ }
+ else if (is(channel, list))
+ {
+ // use the list
+ ch = (list)channel;
+ }
+ else
+ {
+ // wrong type
+ y2error("Wrong channel configuration '%1', expected list or map!", channel);
+ }
+
+ channels = add(channels, ch);
+ }
+ );
+
+ ret = add(ret, channels);
+ }
+ );
+
+ y2milestone("Imported volume setting: %1", ret);
+
+ return ret;
+ }
+
+
/**
* Just Set module data
* @param settings Sound configuration settings
@@ -751,7 +839,7 @@
global define void Set(map settings) ``{
modules_conf = settings["modules_conf"]:[];
rc_vars = settings["rc_vars"]:$[];
- volume_settings = settings["volume_settings"]:[];
+ volume_settings = ImportVolumeSettings(settings["volume_settings"]:[]);
configure_detected = settings["configure_detected"]:false;
}
@@ -780,7 +868,7 @@
return $[
"modules_conf" : modules_conf,
"rc_vars" : rc_vars,
- "volume_settings" : volume_settings,
+ "volume_settings" : ExportVolumeSettings(volume_settings),
"configure_detected": configure_detected
];
}
@@ -843,13 +931,21 @@
sformat(_("Configured as %1."), card["alias"]:"snd-card-0"))
));
- foreach(map card, detected_cards, ``{
- if (!contains(keys, card["unique_key"]:"..."))
- {
- retlist = add (retlist, Summary::Device (
- get_card_label(card), Summary::NotConfigured()));
- }
- });
+ if (detected_cards != nil)
+ {
+ foreach(map card, detected_cards, ``{
+ if (!contains(keys, card["unique_key"]:"..."))
+ {
+ retlist = add (retlist, Summary::Device (
+ get_card_label(card), Summary::NotConfigured()));
+ }
+ });
+ }
+ else
+ {
+ y2milestone("detected_cards: nil");
+ }
+
return Summary::DevicesList (retlist);
}
@@ -1149,7 +1245,12 @@
{
p = topath (sformat(
".audio.alsa.cards.%1.channels.%2.volume", c, ch));
- volume_settings[tointeger(c)] = [ch, SCR::Read(p), "false"];
+
+ // add the channel
+ list<list> tmp = volume_settings[tointeger(c)]:[];
+ tmp = add(tmp, [ch, SCR::Read(p), "false"]);
+
+ volume_settings[tointeger(c)] = tmp;
}
});
});
@@ -1177,7 +1278,37 @@
// alsa is not running. probably autoinstallation or someone wants
// to change proposed volume
// store volume to volume_settings datastricure in autoinstallation
- volume_settings [c_id] = [ channel, value ];
+
+ list<list> tmp = volume_settings[c_id]:[];
+
+ boolean found = false;
+ list<list> updated_channels = [];
+ foreach(list ch, tmp,
+ {
+ list new_ch = ch;
+
+ if (new_ch[0]:"" == channel)
+ {
+ new_ch[1] = value;
+ found = true;
+ }
+
+ updated_channels = add(updated_channels, new_ch);
+ }
+ );
+
+ if (found)
+ {
+ // the channel has been found, use the updates list
+ tmp = updated_channels;
+ }
+ else
+ {
+ // the channel has not been found, add it to the list
+ tmp = add(tmp, [ channel, value, false ]);
+ }
+
+ volume_settings [c_id] = tmp;
return true;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/sound/src/complex.ycp new/yast2-sound-2.15.0/sound/src/complex.ycp
--- old/yast2-sound-2.14.0/sound/src/complex.ycp 2006-10-12 10:07:54.000000000 +0200
+++ new/yast2-sound-2.15.0/sound/src/complex.ycp 2006-12-05 14:08:41.000000000 +0100
@@ -16,7 +16,7 @@
* String corrections by Christian Steinruecken
get_vol_settings() ``{
if (!Sound::use_alsa)
return [];
@@ -358,10 +361,10 @@
Sound::LoadDatabase(true);
integer bound = size(SCR::Dir(.audio.alsa.cards));
integer i = 0;
- list retlist = [];
+ list
retlist = [];
while (i < bound)
{
- list sublist = [];
+ list<list> sublist = [];
string modname = Sound::modules_conf[i,"module"]:"snd-dummy";
list<string> chans = Sound::db_modules[modname, "mixer_elements"]:[];
@@ -384,6 +387,7 @@
sublist = add(sublist, [e, SCR::Read(pth1), SCR::Read(pth2)]);
});
retlist = add (retlist, sublist);
+
i = i + 1;
}
return retlist;
@@ -657,6 +661,8 @@
ret = add(ret, "name", modname);
}
+ y2milestone("card: '%1', using module %2", card["model"]:"", ret["name"]:"");
+
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/sound/src/sound_auto.ycp new/yast2-sound-2.15.0/sound/src/sound_auto.ycp
--- old/yast2-sound-2.14.0/sound/src/sound_auto.ycp 2005-08-22 13:20:51.000000000 +0200
+++ new/yast2-sound-2.15.0/sound/src/sound_auto.ycp 2006-12-05 14:08:41.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Dan Meszaros
vol_settings = get_vol_settings();
if (Mode::config())
vol_settings = Sound::volume_settings;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/sound/testsuite/tests/export_volume.out new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.out
--- old/yast2-sound-2.14.0/sound/testsuite/tests/export_volume.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.out 2006-12-04 14:36:06.000000000 +0100
@@ -0,0 +1,3 @@
+Return []
+Return []
+Return [[$["mute":false, "name":"Master", "volume":80], $["mute":false, "name":"CD", "volume":90]]]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/sound/testsuite/tests/export_volume.ycp new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.ycp
--- old/yast2-sound-2.14.0/sound/testsuite/tests/export_volume.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-sound-2.15.0/sound/testsuite/tests/export_volume.ycp 2006-12-04 14:37:22.000000000 +0100
@@ -0,0 +1,11 @@
+{
+ // testedfiles: Sound.ycp
+ include "testsuite.ycp";
+
+ import "Sound";
+
+ list
input = [[ ["Master", 80, false], ["CD", 90, false] ]];
+ TEST(``(Sound::ExportVolumeSettings(nil)), [], nil);
+ TEST(``(Sound::ExportVolumeSettings([])), [], nil);
+ TEST(``(Sound::ExportVolumeSettings(input)), [], nil);
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/sound/testsuite/tests/import_volume.out new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.out
--- old/yast2-sound-2.14.0/sound/testsuite/tests/import_volume.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.out 2006-12-04 14:44:56.000000000 +0100
@@ -0,0 +1,4 @@
+Return []
+Return []
+Return [[["Master", 80, false], ["CD", 90, false]]]
+Return [[["Master", 80, false], ["CD", 90, false]]]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sound-2.14.0/sound/testsuite/tests/import_volume.ycp new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.ycp
--- old/yast2-sound-2.14.0/sound/testsuite/tests/import_volume.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-sound-2.15.0/sound/testsuite/tests/import_volume.ycp 2006-12-04 14:47:20.000000000 +0100
@@ -0,0 +1,19 @@
+{
+ // testedfiles: Sound.ycp
+ include "testsuite.ycp";
+
+ import "Sound";
+
+
+ // Important: import of the new and the old format must produce the same output!
+
+ list input_old_format = [[ ["Master", 80, false], ["CD", 90, false] ]];
+
+ TEST(``(Sound::ImportVolumeSettings(nil)), [], nil);
+ TEST(``(Sound::ImportVolumeSettings([])), [], nil);
+ TEST(``(Sound::ImportVolumeSettings(input_old_format)), [], nil);
+
+ list input_new_format = [ [$["mute":false, "name":"Master", "volume":80], $["mute":false, "name":"CD", "volume":90]] ];
+
+ TEST(``(Sound::ImportVolumeSettings(input_new_format)), [], nil);
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org