[PATCH] audio/jack: fix build after audio/celt update

[Edward Tomasz Napierala]

>Submitter-Id:	current-users
>Originator:	Edward Tomasz Napierala
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] audio/jack: fix build after audio/celt update
>Severity:	serious
>Priority:	high
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 7.2-STABLE i386
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 7.2-STABLE FreeBSD 7.2-STABLE #0: Sat Oct  3 02:15:11 CEST
>Description:
Attached patch fixes build breakage caused by updating audio/celt.

Added file(s):
- files/patch-tools-netsource.c

Port maintainer (multimedia at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- jackit-0.116.2_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/jack/files/patch-drivers-netjack-net_driver.c /home/trasz/jack/files/patch-drivers-netjack-net_driver.c
--- /usr/ports/audio/jack/files/patch-drivers-netjack-net_driver.c	2009-03-30 20:21:21.000000000 +0200
+++ /home/trasz/jack/files/patch-drivers-netjack-net_driver.c	2009-11-13 10:12:23.000000000 +0100
@@ -1,6 +1,6 @@
---- drivers/netjack/net_driver.c.orig	2009-02-11 20:49:54.000000000 +0100
-+++ drivers/netjack/net_driver.c	2009-02-11 20:50:05.000000000 +0100
-@@ -497,7 +497,7 @@
+--- drivers/netjack/net_driver.c.orig	2009-02-06 11:34:50.000000000 +0100
++++ drivers/netjack/net_driver.c	2009-11-13 10:04:27.282082404 +0100
+@@ -497,7 +497,7 @@ net_driver_write (net_driver_t* driver, 
      {
  	int r;
  
@@ -9,3 +9,31 @@
  	static const int flag = 0;
  #else
  	static const int flag = MSG_CONFIRM;
+@@ -548,13 +548,13 @@ net_driver_attach (net_driver_t *driver)
+ 
+ 	if( driver->bitdepth == 1000 ) {
+ #if HAVE_CELT
+-	    celt_int32_t lookahead;
++	    celt_int32 lookahead;
+ 	    // XXX: memory leak
+-	    CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL );
++	    CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL );
+ 	    celt_mode_info( celt_mode, CELT_GET_LOOKAHEAD, &lookahead );
+ 	    driver->codec_latency = 2*lookahead;
+ 
+-	    driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode ) );
++	    driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
+ #endif
+ 	} else {
+ #if HAVE_SAMPLERATE 
+@@ -596,8 +596,8 @@ net_driver_attach (net_driver_t *driver)
+ 	if( driver->bitdepth == 1000 ) {
+ #if HAVE_CELT
+ 	    // XXX: memory leak
+-	    CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL );
+-	    driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode ) );
++	    CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL );
++	    driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
+ #endif
+ 	} else {
+ #if HAVE_SAMPLERATE
diff -ruN --exclude=CVS /usr/ports/audio/jack/files/patch-tools-netsource.c /home/trasz/jack/files/patch-tools-netsource.c
--- /usr/ports/audio/jack/files/patch-tools-netsource.c	1970-01-01 01:00:00.000000000 +0100
+++ /home/trasz/jack/files/patch-tools-netsource.c	2009-11-13 10:12:23.000000000 +0100
@@ -0,0 +1,24 @@
+--- tools/netsource.c.orig	2009-11-13 09:59:11.301019727 +0100
++++ tools/netsource.c	2009-11-13 09:59:42.991223929 +0100
+@@ -124,8 +124,8 @@ alloc_ports (int n_capture_audio, int n_
+ 	if( bitdepth == 1000 ) {
+ #if HAVE_CELT
+ 	    // XXX: memory leak
+-	    CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), 1, jack_get_buffer_size(client), NULL );
+-	    capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode ) );
++	    CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), jack_get_buffer_size(client), NULL );
++	    capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
+ #endif
+ 	} else {
+ #if HAVE_SAMPLERATE
+@@ -163,8 +163,8 @@ alloc_ports (int n_capture_audio, int n_
+ 	if( bitdepth == 1000 ) {
+ #if HAVE_CELT
+ 	    // XXX: memory leak
+-	    CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), 1, jack_get_buffer_size(client), NULL );
+-	    playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode ) );
++	    CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), jack_get_buffer_size(client), NULL );
++	    playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
+ #endif
+ 	} else {
+ #if HAVE_SAMPLERATE
--- jackit-0.116.2_2.patch ends here ---