Attachment #73421 for bug #106448

View | Details | Raw Unified | Return to bug 106448
Collapse All | Expand All

Lines 5-12 Link Here

(-)/home/trasz/xmms-jack/Makefile (-2 / +2 lines)
5	# $FreeBSD: ports/audio/xmms-jack/Makefile,v 1.7 2006/05/03 05:14:32 edwin Exp $	5	# $FreeBSD: ports/audio/xmms-jack/Makefile,v 1.7 2006/05/03 05:14:32 edwin Exp $
6		6
7	PORTNAME= jack	7	PORTNAME= jack
8	PORTVERSION= 0.9	8	PORTVERSION= 0.17
9	PORTREVISION= 1
10	CATEGORIES= audio	9	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= xmms-jack	11	MASTER_SITE_SUBDIR= xmms-jack
Lines 25-30 Link Here
25	USE_GNOME= gtk12 gnometarget	24	USE_GNOME= gtk12 gnometarget
26	USE_GMAKE= yes	25	USE_GMAKE= yes
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
		27	USE_LDCONFIG= yes
28		28
29	PLIST_FILES= lib/xmms/Output/libjackout.a \	29	PLIST_FILES= lib/xmms/Output/libjackout.a \
30	lib/xmms/Output/libjackout.la \	30	lib/xmms/Output/libjackout.la \

Lines 1-3 Link Here

(-)/home/trasz/xmms-jack/distinfo (-3 / +3 lines)
1	MD5 (xmms-jack-0.9.tar.gz) = d7500fd15e7b58e8ad5b6a655e9b37cf	1	MD5 (xmms-jack-0.17.tar.gz) = 6e4ba99afaf675bbc667755f3a741c92
2	SHA256 (xmms-jack-0.9.tar.gz) = 2d11cd2bf8d486c5ad0c2cee8c2ad65d50f044ac62a0c88a89e68413ec994845	2	SHA256 (xmms-jack-0.17.tar.gz) = 2fbf6205fdfe08d01e57cd31c11efb677acb43e0fb50a8ffe2f2430720c5c176
3	SIZE (xmms-jack-0.9.tar.gz) = 652989	3	SIZE (xmms-jack-0.17.tar.gz) = 527149




--- bio2jack.c.orig	Thu Apr  8 10:03:08 2004
+++ bio2jack.c	Thu Apr  8 10:07:28 2004
@@ -585,6 +585,7 @@
       /* and transition to STOPPED */
       if(this->state == RESET)
       {
+		wave_header_t *wh;
           this->written_client_bytes    = 0;
           this->played_client_bytes     = 0;  /* number of the clients bytes that jack has played */
 
@@ -598,7 +599,7 @@
           /* free up all of the buffers of audio that are queued */
           /* NOTE: this needs to be done inside of the callback because */
           /*  the callback could be using any of these buffers */
-          wave_header_t *wh = this->pPlayPtr;
+		wh = this->pPlayPtr;
           while(wh)
           {
               wh = wh->pNext;




--- bio2jack.c.orig	Sat Jun 17 18:58:16 2006
+++ bio2jack.c	Thu Dec  7 12:51:17 2006
@@ -2512,11 +2512,12 @@
   {
     drv = &outDev[x];
 
+    memset(drv, 0, sizeof(jack_driver_t));
+
     pthread_mutex_init(&drv->mutex, NULL);
 
     getDriver(x);
 
-    memset(drv, 0, sizeof(jack_driver_t));
     drv->volumeEffectType = linear;
     drv->deviceID = x;
 

Return to bug 106448

Lines 1-19 Link Here

(-)/home/trasz/xmms-jack/files/patch-bio2jack.c (-19 lines)
1	--- bio2jack.c.orig Thu Apr 8 10:03:08 2004
2	+++ bio2jack.c Thu Apr 8 10:07:28 2004
3	@@ -585,6 +585,7 @@
4	/* and transition to STOPPED */
5	if(this->state == RESET)
6	{
7	+ wave_header_t *wh;
8	this->written_client_bytes = 0;
9	this->played_client_bytes = 0; /* number of the clients bytes that jack has played */
10
11	@@ -598,7 +599,7 @@
12	/* free up all of the buffers of audio that are queued */
13	/* NOTE: this needs to be done inside of the callback because */
14	/* the callback could be using any of these buffers */
15	- wave_header_t *wh = this->pPlayPtr;
16	+ wh = this->pPlayPtr;
17	while(wh)
18	{
19	wh = wh->pNext;

Line 0 Link Here

(-)/home/trasz/xmms-jack/files/patch-bio2jack.diff (+16 lines)
	1	--- bio2jack.c.orig Sat Jun 17 18:58:16 2006
	2	+++ bio2jack.c Thu Dec 7 12:51:17 2006
	3	@@ -2512,11 +2512,12 @@
	4	{
	5	drv = &outDev[x];
	6
	7	+ memset(drv, 0, sizeof(jack_driver_t));
	8	+
	9	pthread_mutex_init(&drv->mutex, NULL);
	10
	11	getDriver(x);
	12
	13	- memset(drv, 0, sizeof(jack_driver_t));
	14	drv->volumeEffectType = linear;
	15	drv->deviceID = x;
	16