From 2fdb960c3c5df23757f9eb18d8c7d2210aa7fdc8 Mon Sep 17 00:00:00 2001 From: sletz Date: Tue, 5 Feb 2008 13:21:07 +0000 Subject: [PATCH] Replace printf with JackLog git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1832 0c269be4-1314-0410-8aa9-9f06e86f4224 --- linux/alsa/JackAlsaDriver.cpp | 37 ++++++++++++------------ macosx/Jackdmp.xcodeproj/project.pbxproj | 2 -- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 8188e8f9..5da5b940 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -122,7 +122,7 @@ JackAlsaDriver::alsa_driver_check_card_type (alsa_driver_t *driver) char tmp[5]; strncpy(tmp, strstr(driver->alsa_name_playback, "hw"), 4); tmp[4] = '\0'; - printf("control device %s\n", tmp); + JackLog("control device %s\n", tmp); ctl_name = strdup(tmp); } else { ctl_name = strdup(driver->alsa_name_playback); @@ -255,21 +255,21 @@ JackAlsaDriver::alsa_driver_setup_io_function_pointers (alsa_driver_t *driver) switch (driver->dither) { case Rectangular: - printf("Rectangular dithering at 16 bits\n"); + JackLog("Rectangular dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_rect_d16_sSs: sample_move_dither_rect_d16_sS; break; case Triangular: - printf("Triangular dithering at 16 bits\n"); + JackLog("Triangular dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_tri_d16_sSs: sample_move_dither_tri_d16_sS; break; case Shaped: - printf("Noise-shaped dithering at 16 bits\n"); + JackLog("Noise-shaped dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_shaped_d16_sSs: sample_move_dither_shaped_d16_sS; @@ -291,21 +291,21 @@ JackAlsaDriver::alsa_driver_setup_io_function_pointers (alsa_driver_t *driver) switch (driver->dither) { case Rectangular: - printf("Rectangular dithering at 16 bits\n"); + JackLog("Rectangular dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_rect_d24_sSs: sample_move_dither_rect_d24_sS; break; case Triangular: - printf("Triangular dithering at 16 bits\n"); + JackLog("Triangular dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_tri_d24_sSs: sample_move_dither_tri_d24_sS; break; case Shaped: - printf("Noise-shaped dithering at 16 bits\n"); + JackLog("Noise-shaped dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_shaped_d24_sSs: sample_move_dither_shaped_d24_sS; @@ -327,21 +327,21 @@ JackAlsaDriver::alsa_driver_setup_io_function_pointers (alsa_driver_t *driver) switch (driver->dither) { case Rectangular: - printf("Rectangular dithering at 16 bits\n"); + JackLog("Rectangular dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_rect_d32u24_sSs: sample_move_dither_rect_d32u24_sS; break; case Triangular: - printf("Triangular dithering at 16 bits\n"); + JackLog("Triangular dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_tri_d32u24_sSs: sample_move_dither_tri_d32u24_sS; break; case Shaped: - printf("Noise-shaped dithering at 16 bits\n"); + JackLog("Noise-shaped dithering at 16 bits\n"); driver->write_via_copy = driver->quirk_bswap? sample_move_dither_shaped_d32u24_sSs: sample_move_dither_shaped_d32u24_sS; @@ -1315,7 +1315,7 @@ JackAlsaDriver::alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *stat if (poll (driver->pfd, nfds, driver->poll_timeout) < 0) { if (errno == EINTR) { - printf ("poll interrupt\n"); + JackLog ("poll interrupt\n"); // this happens mostly when run // under gdb, or when exiting due to a signal // steph @@ -1840,8 +1840,7 @@ JackAlsaDriver::alsa_driver_new (const char *name, char *playback_alsa_device, int shorts_first, jack_nframes_t capture_latency, jack_nframes_t playback_latency, - alsa_midi_t *midi - ) + alsa_midi_t *midi) { int err; @@ -2629,7 +2628,7 @@ extern "C" capture = TRUE; if (strcmp (param->value.str, "none") != 0) { capture_pcm_name = strdup (param->value.str); - printf("capture device %s\n", capture_pcm_name); + JackLog("capture device %s\n", capture_pcm_name); } break; @@ -2637,7 +2636,7 @@ extern "C" playback = TRUE; if (strcmp (param->value.str, "none") != 0) { playback_pcm_name = strdup (param->value.str); - printf("playback device %s\n", playback_pcm_name); + JackLog("playback device %s\n", playback_pcm_name); } break; @@ -2649,8 +2648,8 @@ extern "C" case 'd': playback_pcm_name = strdup (param->value.str); capture_pcm_name = strdup (param->value.str); - printf("playback device %s\n", playback_pcm_name); - printf("capture device %s\n", capture_pcm_name); + JackLog("playback device %s\n", playback_pcm_name); + JackLog("capture device %s\n", capture_pcm_name); break; case 'H': @@ -2667,12 +2666,12 @@ extern "C" case 'r': srate = param->value.ui; - printf("apparent rate = %d\n", srate); + JackLog("apparent rate = %d\n", srate); break; case 'p': frames_per_interrupt = param->value.ui; - printf("frames per period = %d\n", frames_per_interrupt); + JackLog("frames per period = %d\n", frames_per_interrupt); break; case 'n': diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 962518f3..ce3ce93a 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -1014,7 +1014,6 @@ 4B0A2A650D524AB2002EFF74 /* jack_mp_thread_wait */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_mp_thread_wait; sourceTree = BUILT_PRODUCTS_DIR; }; 4B123D3308B3954300540632 /* JackGlobalsClient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackGlobalsClient.cpp; path = ../common/JackGlobalsClient.cpp; sourceTree = SOURCE_ROOT; }; 4B123D3608B3954A00540632 /* JackGlobalsServer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackGlobalsServer.cpp; path = ../common/JackGlobalsServer.cpp; sourceTree = SOURCE_ROOT; }; - 4B18CCEF0D537817008413EE /* jackctl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jackctl.cpp; path = ../common/jackctl.cpp; sourceTree = SOURCE_ROOT; }; 4B2C28F908DAD01E00249230 /* JackGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackGlobals.cpp; path = ../common/JackGlobals.cpp; sourceTree = SOURCE_ROOT; }; 4B35C4250D4731D1000DE7AE /* jackdmp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jackdmp; sourceTree = BUILT_PRODUCTS_DIR; }; 4B35C4830D4731D1000DE7AE /* Jackmp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackmp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1844,7 +1843,6 @@ isa = PBXGroup; children = ( 4B6C73780CC60A6D001AFFD4 /* jack */, - 4B18CCEF0D537817008413EE /* jackctl.cpp */, 4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */, 4BE4CC000CDA153400CCF5BB /* JackTools.h */, 4B66A8580934964500A89560 /* JackConstants.h */,