Orcan Ogetbil
15 years ago
parent
acdb66fd59
commit
387a56dc36
@ -1 +1 @@
|
|||||||
jack-audio-connection-kit-0.118.0.tar.gz
|
jack-1.9.5.tar.bz2
|
||||||
|
|||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- jack-1.9.5/wscript~ 2010-02-12 05:58:08.000000000 -0500
|
||||||
|
+++ jack-1.9.5/wscript 2010-05-18 14:14:27.000000000 -0400
|
||||||
|
@@ -230,6 +230,8 @@
|
||||||
|
print Logs.colors.NORMAL,
|
||||||
|
print
|
||||||
|
|
||||||
|
+ conf.env.append_unique('LINKFLAGS', '-lm -lstdc++')
|
||||||
|
+
|
||||||
|
if Options.options.mixed == True:
|
||||||
|
env_variant2 = conf.env.copy()
|
||||||
|
conf.set_env_name('lib32', env_variant2)
|
||||||
@ -1,5 +0,0 @@
|
|||||||
<hr size="1"><address style="text-align: right;"><small>Generated for $projectname by
|
|
||||||
<a href="http://www.doxygen.org/index.html">
|
|
||||||
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>$doxygenversion</small></address>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
diff -rupN jack-1.9.5.old/doxyfile jack-1.9.5/doxyfile
|
||||||
|
--- jack-1.9.5.old/doxyfile 2010-02-12 05:57:30.000000000 -0500
|
||||||
|
+++ jack-1.9.5/doxyfile 2010-07-19 23:18:57.000000000 -0400
|
||||||
|
@@ -413,7 +413,7 @@ HTML_HEADER =
|
||||||
|
# each generated HTML page. If it is left blank doxygen will generate a
|
||||||
|
# standard footer.
|
||||||
|
|
||||||
|
-HTML_FOOTER =
|
||||||
|
+HTML_FOOTER = no_date_footer.html
|
||||||
|
|
||||||
|
# The HTML_STYLESHEET tag can be used to specify a user defined cascading
|
||||||
|
# style sheet that is used by each HTML page. It can be used to
|
||||||
|
diff -rupN jack-1.9.5.old/no_date_footer.html jack-1.9.5/no_date_footer.html
|
||||||
|
--- jack-1.9.5.old/no_date_footer.html 1969-12-31 19:00:00.000000000 -0500
|
||||||
|
+++ jack-1.9.5/no_date_footer.html 2010-07-19 23:19:19.000000000 -0400
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+<hr size="1"><address style="text-align: right;"><small>
|
||||||
|
+Generated for $projectname by <a href="http://www.doxygen.org/
|
||||||
|
+index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
|
||||||
|
+$doxygenversion</small></address>
|
||||||
|
+</body>
|
||||||
|
+</html>
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
diff -rupN jack-1.9.5.old/common/JackNetOneDriver.cpp jack-1.9.5/common/JackNetOneDriver.cpp
|
||||||
|
--- jack-1.9.5.old/common/JackNetOneDriver.cpp 2010-02-12 05:57:48.000000000 -0500
|
||||||
|
+++ jack-1.9.5/common/JackNetOneDriver.cpp 2010-07-20 01:26:44.000000000 -0400
|
||||||
|
@@ -709,9 +709,9 @@ JackNetOneDriver::render_payload_to_jack
|
||||||
|
|
||||||
|
CELTDecoder *decoder = (CELTDecoder *)src_node->data;
|
||||||
|
if( !packet_payload )
|
||||||
|
- celt_decode_float( decoder, NULL, net_period_down, buf );
|
||||||
|
+ celt_decode_float( decoder, NULL, net_period_down, buf, NULL );
|
||||||
|
else
|
||||||
|
- celt_decode_float( decoder, packet_bufX, net_period_down, buf );
|
||||||
|
+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, NULL );
|
||||||
|
|
||||||
|
src_node = jack_slist_next (src_node);
|
||||||
|
}
|
||||||
|
diff -rupN jack-1.9.5.old/common/netjack_packet.c jack-1.9.5/common/netjack_packet.c
|
||||||
|
--- jack-1.9.5.old/common/netjack_packet.c 2010-02-12 05:57:47.000000000 -0500
|
||||||
|
+++ jack-1.9.5/common/netjack_packet.c 2010-07-20 01:12:42.000000000 -0400
|
||||||
|
@@ -1428,9 +1428,9 @@ render_payload_to_jack_ports_celt (void
|
||||||
|
|
||||||
|
CELTDecoder *decoder = src_node->data;
|
||||||
|
if( !packet_payload )
|
||||||
|
- celt_decode_float( decoder, NULL, net_period_down, buf );
|
||||||
|
+ celt_decode_float( decoder, NULL, net_period_down, buf, NULL );
|
||||||
|
else
|
||||||
|
- celt_decode_float( decoder, packet_bufX, net_period_down, buf );
|
||||||
|
+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, NULL );
|
||||||
|
|
||||||
|
src_node = jack_slist_next (src_node);
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,56 @@
|
|||||||
|
diff -rupN jack-1.9.5.old/common/JackControlAPI.cpp jack-1.9.5/common/JackControlAPI.cpp
|
||||||
|
--- jack-1.9.5.old/common/JackControlAPI.cpp 2010-02-12 05:57:47.000000000 -0500
|
||||||
|
+++ jack-1.9.5/common/JackControlAPI.cpp 2010-07-20 00:42:55.000000000 -0400
|
||||||
|
@@ -32,6 +32,7 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <assert.h>
|
||||||
|
#include <signal.h>
|
||||||
|
+#include <sys/utsname.h>
|
||||||
|
|
||||||
|
#include "jslist.h"
|
||||||
|
#include "driver_interface.h"
|
||||||
|
@@ -675,7 +676,13 @@ EXPORT jackctl_server_t * jackctl_server
|
||||||
|
goto fail_free_parameters;
|
||||||
|
}
|
||||||
|
|
||||||
|
- value.i = 10;
|
||||||
|
+ struct utsname utsname;
|
||||||
|
+ int success;
|
||||||
|
+ success = uname( &utsname );
|
||||||
|
+ if( success == 0 && strstr( utsname.version, "ccrma" ) )
|
||||||
|
+ value.i = 60;
|
||||||
|
+ else
|
||||||
|
+ value.i = 20;
|
||||||
|
if (jackctl_add_parameter(
|
||||||
|
&server_ptr->parameters,
|
||||||
|
"realtime-priority",
|
||||||
|
diff -rupN jack-1.9.5.old/common/JackServerGlobals.cpp jack-1.9.5/common/JackServerGlobals.cpp
|
||||||
|
--- jack-1.9.5.old/common/JackServerGlobals.cpp 2010-02-12 05:57:47.000000000 -0500
|
||||||
|
+++ jack-1.9.5/common/JackServerGlobals.cpp 2010-07-20 00:40:43.000000000 -0400
|
||||||
|
@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
|
||||||
|
#include "shm.h"
|
||||||
|
#include <getopt.h>
|
||||||
|
#include <errno.h>
|
||||||
|
+#include <sys/utsname.h>
|
||||||
|
|
||||||
|
static char* server_name = NULL;
|
||||||
|
|
||||||
|
@@ -67,9 +68,17 @@ void JackServerGlobals::Delete()
|
||||||
|
|
||||||
|
bool JackServerGlobals::Init()
|
||||||
|
{
|
||||||
|
+ struct utsname utsname;
|
||||||
|
+ int success;
|
||||||
|
+ success = uname( &utsname );
|
||||||
|
+
|
||||||
|
int realtime = 0;
|
||||||
|
int client_timeout = 0; /* msecs; if zero, use period size. */
|
||||||
|
- int realtime_priority = 10;
|
||||||
|
+ int realtime_priority;
|
||||||
|
+ if( success == 0 && strstr( utsname.version, "ccrma" ) )
|
||||||
|
+ realtime_priority = 60;
|
||||||
|
+ else
|
||||||
|
+ realtime_priority = 20;
|
||||||
|
int verbose_aux = 0;
|
||||||
|
int do_mlock = 1;
|
||||||
|
unsigned int port_max = 128;
|
||||||
Loading…
Reference in new issue