Mailinglist Archive: opensuse-commit (918 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package gamix
checked in at Thu Feb 15 18:20:48 CET 2007.

--------
--- gamix/gamix.changes	2006-02-23 16:50:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/gamix/gamix.changes	2007-02-14 18:26:37.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 14 18:25:58 CET 2007 - tiwai@xxxxxxx
+
+- fix inifinite loop with USB-audio disconnection (#245266)
+
+-------------------------------------------------------------------

New:
----
  gamix-disconnect-redraw.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gamix.spec ++++++
--- /var/tmp/diff_new_pack.d10710/_old	2007-02-15 18:20:44.000000000 +0100
+++ /var/tmp/diff_new_pack.d10710/_new	2007-02-15 18:20:44.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gamix (Version 1.99.p14)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -14,8 +14,8 @@
 BuildRequires:  alsa-devel gtk2-devel update-desktop-files
 Summary:        GTK ALSA Audio Mixer
 Version:        1.99.p14
-Release:        46
-License:        GPL
+Release:        90
+License:        GNU General Public License (GPL)
 Group:          Productivity/Multimedia/Sound/Mixers
 Autoreqprov:    on
 Source:         http://www1.tcnet.ne.jp/fmurata/linux/down/gamix-%{version}.tar.bz2
@@ -23,6 +23,7 @@
 Source2:        gamix.png
 Patch:          gamix-gtk2-fix.diff
 Patch1:         gamix-nogtk1.diff
+Patch2:         gamix-disconnect-redraw.diff
 URL:            http://www1.tcnet.ne.jp/fmurata/linux/down/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -39,6 +40,7 @@
 %setup
 %patch
 %patch1
+%patch2
 %{?suse_update_config:%{suse_update_config -f}}
 
 %build
@@ -71,6 +73,8 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog -n gamix
+* Wed Feb 14 2007 - tiwai@xxxxxxx
+- fix inifinite loop with USB-audio disconnection (#245266)
 * Thu Feb 23 2006 - tiwai@xxxxxxx
 - added GTK to Categories
 * Wed Jan 25 2006 - mls@xxxxxxx


++++++ gamix-disconnect-redraw.diff ++++++
--- gamix2/catch.c-dist	2007-02-14 18:05:19.000000000 +0100
+++ gamix2/catch.c	2007-02-14 18:23:52.000000000 +0100
@@ -120,6 +120,7 @@ int time_init(void) {
 gint time_callback(gpointer data) {
 	int i,n,err;
 	unsigned int mask;
+	int disconnected = 0;
 
 	for( i=0 ; i<card_last ; i++ ) {
 		if( cards[i].handle == NULL ) continue;
@@ -136,6 +137,11 @@ gint time_callback(gpointer data) {
 #endif
 		while((n=poll(&cards[i].pfd,1,0))> 0 ) {
 			if( (err=snd_ctl_read(cards[i].handle,ev))<0 ) {
+				if (err == -ENODEV) { /* disconnected */
+					cards[i].enable = 0;
+					disconnected = 1;
+					break;
+				}
 				printf("hoe %d: %s\n",err,snd_strerror(err));
 				continue;
 			}
@@ -153,5 +159,12 @@ gint time_callback(gpointer data) {
 		}
 	}
 	
+	if (disconnected) {
+		extern GtkWidget *main_vbox;
+		extern GtkWidget *mixer_container;
+		gtk_container_remove(GTK_CONTAINER(main_vbox), mixer_container);
+		disp_mixer();
+	}
+
 	return 1;
 }


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx