Commit ccf2041c authored by sletz's avatar sletz
Browse files

Remove call to exit in library code.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3979 0c269be4-1314-0410-8aa9-9f06e86f4224
parent d23be3fd
......@@ -30,6 +30,10 @@ Arnold Krille
Jackdmp changes log
---------------------------
2010-04-07 Stephane Letz <letz@grame.fr>
* Remove call to exit in library code.
2010-03-26 Stephane Letz <letz@grame.fr>
* ffado-portname-sync.patch from ticket #163 applied.
......
......@@ -152,7 +152,7 @@ jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSL
fprintf (stderr, "Options for driver '%s':\n", desc->name);
jack_print_driver_options (desc, stderr);
exit (1);
return 1;
}
for (param_index = 0; param_index < desc->nparams; param_index++) {
......
......@@ -260,7 +260,7 @@ JackAlsaDriver::alsa_driver_hw_specific (alsa_driver_t *driver, int hw_monitorin
return 0;
}
void
int
JackAlsaDriver::alsa_driver_setup_io_function_pointers (alsa_driver_t *driver)
{
if (driver->playback_handle) {
......@@ -340,7 +340,7 @@ JackAlsaDriver::alsa_driver_setup_io_function_pointers (alsa_driver_t *driver)
default:
jack_error ("impossible sample width (%d) discovered!",
driver->playback_sample_bytes);
exit (1);
return -1;
}
}
}
......@@ -364,6 +364,8 @@ JackAlsaDriver::alsa_driver_setup_io_function_pointers (alsa_driver_t *driver)
break;
}
}
return 0;
}
int
......@@ -779,7 +781,7 @@ JackAlsaDriver::alsa_driver_set_parameters (alsa_driver_t *driver,
default:
jack_error ("programming error: unhandled format "
"type for playback");
exit (1);
return -1;
}
}
......@@ -797,7 +799,7 @@ JackAlsaDriver::alsa_driver_set_parameters (alsa_driver_t *driver,
default:
jack_error ("programming error: unhandled format "
"type for capture");
exit (1);
return -1;
}
}
......@@ -836,7 +838,8 @@ JackAlsaDriver::alsa_driver_set_parameters (alsa_driver_t *driver,
driver->user_nchannels = driver->playback_nchannels;
}
alsa_driver_setup_io_function_pointers (driver);
if (alsa_driver_setup_io_function_pointers (driver) != 0)
return -1;
/* Allocate and initialize structures that rely on the
channels counts.
......
......@@ -53,7 +53,7 @@ class JackAlsaDriver : public JackAudioDriver
int alsa_driver_generic_hardware(alsa_driver_t *driver);
int alsa_driver_hw_specific(alsa_driver_t *driver, int hw_monitoring,
int hw_metering);
void alsa_driver_setup_io_function_pointers (alsa_driver_t *driver);
int alsa_driver_setup_io_function_pointers (alsa_driver_t *driver);
int alsa_driver_configure_stream(alsa_driver_t *driver, char *device_name,
const char *stream_name,
snd_pcm_t *handle,
......
......@@ -7950,16 +7950,17 @@
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
CoreAudio,
"-framework",
CoreServices,
"-framework",
AudioUnit,
);
OTHER_REZFLAGS = "";
PREBINDING = NO;
......@@ -8000,8 +8001,13 @@
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
......@@ -8037,7 +8043,11 @@
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
"-framework",
Jackdmp,
......@@ -8087,17 +8097,19 @@
INSTALL_PATH = /usr/local/lib;
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
OTHER_CFLAGS = "-DJACK_32_64";
OTHER_CPLUSPLUSFLAGS = (
"-DJACK_32_64",
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"-DMACH_RPC_MACH_SEMA",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
CoreAudio,
"-framework",
CoreServices,
"-framework",
AudioUnit,
);
OTHER_REZFLAGS = "";
PREBINDING = NO;
......@@ -8137,10 +8149,13 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-DJACK_32_64";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"-DMACH_RPC_MACH_SEMA",
"-DJACK_32_64",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackservermp,
"-framework",
......@@ -8216,8 +8231,17 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = ../common;
OTHER_CFLAGS = "";
OTHER_CFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackmp,
"-framework",
......@@ -8249,8 +8273,17 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
HEADER_SEARCH_PATHS = ../common;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackmp,
"-framework",
......@@ -8280,6 +8313,11 @@
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = ../common;
OTHER_CFLAGS = "";
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
"-framework",
Jackmp,
......@@ -8311,8 +8349,13 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = ../common;
OTHER_CFLAGS = "";
OTHER_CFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackmp,
"-framework",
......@@ -8342,8 +8385,13 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
HEADER_SEARCH_PATHS = ../common;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_CFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
libcelt.a,
"-framework",
Jackmp,
"-framework",
......@@ -8372,7 +8420,15 @@
);
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = ../common;
OTHER_CFLAGS = "";
OTHER_CFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
"-framework",
Jackmp,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment