Browse Source

removed --tmpdir option

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@549 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
trutkin 22 years ago
parent
commit
458f4ebfac
4 changed files with 3 additions and 33 deletions
  1. +1
    -1
      configure.in
  2. +0
    -10
      jack/jack.h
  3. +2
    -12
      jackd/jackd.c
  4. +0
    -10
      libjack/client.c

+ 1
- 1
configure.in View File

@@ -15,7 +15,7 @@ dnl changes are made
dnl ---
JACK_MAJOR_VERSION=0
JACK_MINOR_VERSION=89
JACK_MICRO_VERSION=3
JACK_MICRO_VERSION=4

dnl ---
dnl HOWTO: updating the jack protocal version


+ 0
- 10
jack/jack.h View File

@@ -603,16 +603,6 @@ jack_nframes_t jack_frame_time (const jack_client_t *);
*/
float jack_cpu_load (jack_client_t *client);

/**
* Set the directory in which the server is expected
* to have put its communication FIFOs. A client
* will need to call this before calling
* jack_client_new() if the server was started
* with arguments telling it to use a non-standard
* directory.
*/
void jack_set_server_dir (const char *path);

/**
* Return the pthread ID of the thread running the JACK client
* side code.


+ 2
- 12
jackd/jackd.c View File

@@ -350,7 +350,6 @@ static void usage (FILE *file)
" [ --timeout OR -t client-timeout-in-msecs ]\n"
" [ --verbose OR -v ]\n"
" [ --silent OR -s ]\n"
" [ --tmpdir OR -D directory-for-temporary-files ]\n"
" [ --version OR -V ]\n"
" -d driver [ ... driver args ... ]\n");
}
@@ -379,12 +378,11 @@ main (int argc, char *argv[])

{
jack_driver_desc_t * desc;
const char *options = "-ad:D:P:vshVRFl:t:";
const char *options = "-ad:P:vshVRFl:t:";
struct option long_options[] =
{
{ "asio", 0, 0, 'a' },
{ "driver", 1, 0, 'd' },
{ "tmpdir", 1, 0, 'D' },
{ "verbose", 0, 0, 'v' },
{ "help", 0, 0, 'h' },
{ "realtime", 0, 0, 'R' },
@@ -451,10 +449,6 @@ main (int argc, char *argv[])
asio_mode = TRUE;
break;

case 'D':
jack_set_server_dir (optarg);
break;

case 'd':
seen_driver = 1;
driver_name = optarg;
@@ -485,8 +479,7 @@ main (int argc, char *argv[])
break;

default:
fprintf (stderr, "unknown option character %c\n",
optopt);
fprintf (stderr, "unknown option character %c\n", optopt);
/*fallthru*/
case 'h':
usage (stdout);
@@ -509,7 +502,6 @@ main (int argc, char *argv[])
exit (1);
}


drivers = jack_drivers_load ();
if (!drivers)
{
@@ -560,5 +552,3 @@ main (int argc, char *argv[])
exit (0);
}




+ 0
- 10
libjack/client.c View File

@@ -58,22 +58,12 @@
#include <jack/timestamps.h>
#endif /* WITH_TIMESTAMPS */




#ifdef DEFAULT_TMP_DIR
char *jack_server_dir = DEFAULT_TMP_DIR;
#else
char *jack_server_dir = "/tmp";
#endif

void
jack_set_server_dir (const char *path)
{
jack_server_dir = strdup (path);
}


static pthread_mutex_t client_lock;
static pthread_cond_t client_ready;
void *jack_zero_filled_buffer = NULL;


Loading…
Cancel
Save