|
»
jack doesn't build with current CELT anymore
|
View:
New views
11 Messages
—
Rating Filter:
Alert me
|
 |
Re: jack doesn't build with current CELT anymore
by Geoff Beasley-2
::
Rate this Message:
On Monday 26 October 2009 08:15:24 Jörn Nettingsmeier wrote:
> the attached patch lets jack compile with the latest celt git. > a celt git eh?... don't say that in Scotland! :D g. _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
Re: jack doesn't build with current CELT anymore
by Geoff Beasley-2
::
Rate this Message:
On Monday 26 October 2009 19:22:53 Jörn Nettingsmeier wrote:
> true. i daren't imagine what "jack head" might mean to an australian... well, never heard it used, but it sure looks rude to me :D g. _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
|
|
|
jack doesn't build with current CELT anymore
by Jörn Nettingsmeier-5
::
Rate this Message:
hi everyone!
i just updated my celt git tree, and it looks like the api has changed: net_driver.c: In function ‘net_driver_attach’: net_driver.c:552: error: ‘celt_int32_t’ undeclared (first use in this function) net_driver.c:552: error: (Each undeclared identifier is reported only once net_driver.c:552: error: for each function it appears in.) net_driver.c:552: error: expected ‘;’ before ‘lookahead’ net_driver.c:554: warning: passing argument 3 of ‘celt_mode_create’ makes pointer from integer without a cast net_driver.c:554: error: too many arguments to function ‘celt_mode_create’ net_driver.c:555: error: ‘lookahead’ undeclared (first use in this function) net_driver.c:558: error: too few arguments to function ‘celt_decoder_create’ net_driver.c:600: warning: passing argument 3 of ‘celt_mode_create’ makes pointer from integer without a cast net_driver.c:600: error: too many arguments to function ‘celt_mode_create’ net_driver.c:601: error: too few arguments to function ‘celt_encoder_create’ make[3]: *** [jack_net_la-net_driver.lo] Error 1 make[3]: Leaving directory `/build/jack/drivers/netjack' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/build/jack/drivers' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/build/jack' make: *** [all] Error 2 best, jörn -- Jörn Nettingsmeier Meister für Veranstaltungstechnik Audio and event engineer Ambisonic surround recordings http://stackingdwarves.net +49 177 7937487 _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
Re: jack doesn't build with current CELT anymore
by Jörn Nettingsmeier-5
::
Rate this Message:
On 10/22/2009 08:28 PM, Jörn Nettingsmeier wrote:
> hi everyone! > > > i just updated my celt git tree, and it looks like the api has changed: the attached patch lets jack compile with the latest celt git. best, jörn -- Jörn Nettingsmeier Audio engineer Meister für Veranstaltungstechnik (Bühne/Studio) Lortzingstr. 11, D-45128 Essen, Germany +49 177 7937487 http://stackingdwarves.net [celt-update.diff] Index: tools/netsource.c =================================================================== --- tools/netsource.c (revision 3671) +++ tools/netsource.c (working copy) @@ -124,8 +124,8 @@ 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 @@ 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 Index: drivers/netjack/net_driver.c =================================================================== --- drivers/netjack/net_driver.c (revision 3671) +++ drivers/netjack/net_driver.c (working copy) @@ -549,13 +549,13 @@ 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 @@ -597,8 +597,8 @@ 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 _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
Re: jack doesn't build with current CELT anymore
by Jörn Nettingsmeier-5
::
Rate this Message:
On 12/31/2004 04:39 PM, Geoff Beasley wrote:
> On Monday 26 October 2009 08:15:24 Jörn Nettingsmeier wrote: >> the attached patch lets jack compile with the latest celt git. >> > a celt git eh?... don't say that in Scotland! :D true. i daren't imagine what "jack head" might mean to an australian... -- Jörn Nettingsmeier Audio engineer Meister für Veranstaltungstechnik (Bühne/Studio) Lortzingstr. 11, D-45128 Essen, Germany +49 177 7937487 http://stackingdwarves.net _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
Re: jack doesn't build with current CELT anymore
by Jörn Nettingsmeier-5
::
Rate this Message:
On 10/25/2009 10:15 PM, Jörn Nettingsmeier wrote:
> On 10/22/2009 08:28 PM, Jörn Nettingsmeier wrote: >> hi everyone! >> >> >> i just updated my celt git tree, and it looks like the api has changed: > > the attached patch lets jack compile with the latest celt git. gmaxwell indicated on #celt that a 0.7.0 tarball release is imminent (and has in fact already been tagged). the api change that my trival patch is adressing will stay. best, jörn -- Jörn Nettingsmeier Audio engineer Meister für Veranstaltungstechnik (Bühne/Studio) Lortzingstr. 11, D-45128 Essen, Germany +49 177 7937487 http://stackingdwarves.net _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
Re: jack doesn't build with current CELT anymore
by Ralf Mardorf
::
Rate this Message:
Geoff Beasley wrote:
> On Tuesday 27 October 2009 12:12:06 you wrote: > > >> Please check your system clock, 2005 is over now. Thanks. :) >> > is it? damn! roll on 2006 ;) > > (!@#$ cmos battery) > > thanks > > g I discovered the "order received" feature for Thunderbird because of your 2 mails from 12/31/2004 and the 2 from 01/01/2005. I guess I'll add it to all folders for incoming mails and sort by this option instead of sorting by date. _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
[PATCH] move jack2/netone-isolateion to CELT 0.7.0
by Jörn Nettingsmeier-5
::
Rate this Message:
Jörn Nettingsmeier wrote:
> On 10/22/2009 08:28 PM, Jörn Nettingsmeier wrote: >> hi everyone! >> >> >> i just updated my celt git tree, and it looks like the api has changed: now that CELT 0.7.0 is released (which is not bitstream-compatible to earlier versions anyway), i feel that rather than messing with #ifdefs, we might as well mandate that all users upgrade. the attached patch moves the netone-isolateion branch of the jack2 repository to CELT 0.7.0. it includes the appropriate fixes to wscripts. i also pushed those changes to torben's private repository, but as you know, sometimes a man gits it wrong, hence the additional patch to the list. best, jörn -- Jörn Nettingsmeier Meister für Veranstaltungstechnik Audio and event engineer Ambisonic surround recordings http://stackingdwarves.net +49 177 7937487 diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp index b9de94d..0096f65 100644 --- a/common/JackNetOneDriver.cpp +++ b/common/JackNetOneDriver.cpp @@ -163,13 +163,13 @@ namespace Jack if( netj.bitdepth == 1000 ) { #if HAVE_CELT - celt_int32_t lookahead; + celt_int32 lookahead; // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( netj.sample_rate, 1, netj.period_size, NULL ); + CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL ); celt_mode_info( celt_mode, CELT_GET_LOOKAHEAD, &lookahead ); netj.codec_latency = 2*lookahead; - netj.capture_srcs = jack_slist_append(netj.capture_srcs, (void *)celt_decoder_create( celt_mode ) ); + netj.capture_srcs = jack_slist_append(netj.capture_srcs, (void *)celt_decoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE @@ -211,8 +211,8 @@ namespace Jack if( netj.bitdepth == 1000 ) { #if HAVE_CELT // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( netj.sample_rate, 1, netj.period_size, NULL ); - netj.playback_srcs = jack_slist_append(netj.playback_srcs, (void *)celt_encoder_create( celt_mode ) ); + CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL ); + netj.playback_srcs = jack_slist_append(netj.playback_srcs, (void *)celt_encoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE diff --git a/common/netjack.c b/common/netjack.c index ccca8b3..d0641a3 100644 --- a/common/netjack.c +++ b/common/netjack.c @@ -149,7 +149,7 @@ void netjack_wait( netjack_driver_state_t *netj ) netj->running_free = 0; if( !we_have_the_expected_frame ) - jack_error( "netxrun... %d", netj->expected_framecnt ); + jack_log( "xrun... %d", netj->expected_framecnt ); if( we_have_the_expected_frame ) { netj->time_to_deadline = netj->next_deadline - jack_get_time() - netj->period_usecs; @@ -171,11 +171,11 @@ void netjack_wait( netjack_driver_state_t *netj ) */ if( netj->deadline_goodness < (netj->period_usecs/4+10*(int)netj->period_usecs*netj->latency/100) ) { - netj->next_deadline -= netj->period_usecs/100; + netj->next_deadline += netj->period_usecs/100; //jack_log( "goodness: %d, Adjust deadline: --- %d\n", netj->deadline_goodness, (int) netj->period_usecs*netj->latency/100 ); } if( netj->deadline_goodness > (netj->period_usecs/4+10*(int)netj->period_usecs*netj->latency/100) ) { - netj->next_deadline += netj->period_usecs/100; + netj->next_deadline -= netj->period_usecs/100; //jack_log( "goodness: %d, Adjust deadline: +++ %d\n", netj->deadline_goodness, (int) netj->period_usecs*netj->latency/100 ); } } else { @@ -366,13 +366,13 @@ void netjack_attach( netjack_driver_state_t *netj ) if( netj->bitdepth == 1000 ) { #if HAVE_CELT - celt_int32_t lookahead; + celt_int32 lookahead; // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( netj->sample_rate, 1, netj->period_size, NULL ); + CELTMode *celt_mode = celt_mode_create( netj->sample_rate, netj->period_size, NULL ); celt_mode_info( celt_mode, CELT_GET_LOOKAHEAD, &lookahead ); netj->codec_latency = 2*lookahead; - netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create( celt_mode ) ); + netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE @@ -414,8 +414,8 @@ void netjack_attach( netjack_driver_state_t *netj ) if( netj->bitdepth == 1000 ) { #if HAVE_CELT // XXX: memory leak - CELTMode *celt_mode = celt_mode_create( netj->sample_rate, 1, netj->period_size, NULL ); - netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create( celt_mode ) ); + CELTMode *celt_mode = celt_mode_create( netj->sample_rate, netj->period_size, NULL ); + netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) ); #endif } else { #if HAVE_SAMPLERATE diff --git a/common/wscript b/common/wscript index 46d7b12..e5c79e3 100644 --- a/common/wscript +++ b/common/wscript @@ -11,7 +11,7 @@ def configure(conf): if conf.is_defined('HAVE_SAMPLERATE'): conf.env['LIB_SAMPLERATE'] = ['samplerate'] - conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs') + conf.check_cfg(package='celt', atleast_version='0.7.0', args='--cflags --libs') conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE') diff --git a/example-clients/netsource.c b/example-clients/netsource.c index 40da134..e10fd07 100644 --- a/example-clients/netsource.c +++ b/example-clients/netsource.c @@ -136,8 +136,8 @@ alloc_ports (int n_capture_audio, int n_playback_audio, int n_capture_midi, int 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 @@ -175,8 +175,8 @@ alloc_ports (int n_capture_audio, int n_playback_audio, int n_capture_midi, int 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 diff --git a/example-clients/wscript b/example-clients/wscript index 6fda348..e900f65 100644 --- a/example-clients/wscript +++ b/example-clients/wscript @@ -38,7 +38,7 @@ def configure(conf): if conf.is_defined('HAVE_SNDFILE'): conf.env['LIB_SNDFILE'] = ['sndfile'] - conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs') + conf.check_cfg(package='celt', atleast_version='0.7.0', args='--cflags --libs') e = conf.check_cc(header_name='ncurses.h', define_name="HAVE_NCURSES") _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
Re: [PATCH] move jack2/netone-isolateion to CELT 0.7.0
by Stéphane Letz
::
Rate this Message:
Le 29 oct. 2009 à 12:02, Jörn Nettingsmeier a écrit : > Jörn Nettingsmeier wrote: >> On 10/22/2009 08:28 PM, Jörn Nettingsmeier wrote: >>> hi everyone! >>> >>> >>> i just updated my celt git tree, and it looks like the api has >>> changed: > > now that CELT 0.7.0 is released (which is not bitstream-compatible to > earlier versions anyway), i feel that rather than messing with > #ifdefs, > we might as well mandate that all users upgrade. the attached patch > moves the netone-isolateion branch of the jack2 repository to CELT > 0.7.0. it includes the appropriate fixes to wscripts. > > i also pushed those changes to torben's private repository, but as you > know, sometimes a man gits it wrong, hence the additional patch to > the list. > > best, > > jörn > > Ok i see the new netone-isolateion-celt-0.7.0 http://repo.or.cz/w/jack2.git?a=shortlog;h=refs/heads/netone-isolateion-celt-0.7.0 I guess new cleanup/fixes well be done on this branch yes? Thanks Stephane _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
|
|
Re: [PATCH] move jack2/netone-isolateion to CELT 0.7.0
by Jörn Nettingsmeier-5
::
Rate this Message:
Stéphane Letz wrote:
> > Ok i see the new netone-isolateion-celt-0.7.0 > > http://repo.or.cz/w/jack2.git?a=shortlog;h=refs/heads/netone-isolateion-celt-0.7.0 > > > I guess new cleanup/fixes well be done on this branch yes? that's torben's decision. last i heard he was reluctant to break backwards compatibility to older celt versions and thought about adding #ifdefs to deal with it. i'm being more anti-social about this :) the netone-isolateion-celt-0.7.0 branch which i pushed to torben will work only with celt 0.7.0 or later :-D makes the code easier to read and avoids user disappointment by failing early (during compilation) and not later when incompatible bitstream formats clash :) -- Jörn Nettingsmeier Meister für Veranstaltungstechnik Audio and event engineer Ambisonic surround recordings http://stackingdwarves.net +49 177 7937487 _______________________________________________ Jack-Devel mailing list Jack-Devel@... http://lists.jackaudio.org/listinfo.cgi/jack-devel-jackaudio.org |
| Free embeddable forum powered by Nabble | Forum Help |
