From cc16cede59a00dadf7891b3cfe847ca9f57532c7 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 25 Aug 2010 16:38:01 +0200 Subject: [PATCH] libtriple: reduce some messages to debug, consolidate scart messages Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6aaa97c4233154c5ce61410e8cfd8582ab603c3e Author: Stefan Seyfried Date: 2010-08-25 (Wed, 25 Aug 2010) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- lib/libtriple/audio_td.cpp | 4 ++-- lib/libtriple/video_td.cpp | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/libtriple/audio_td.cpp b/lib/libtriple/audio_td.cpp index 555db92fc..49cf07db2 100644 --- a/lib/libtriple/audio_td.cpp +++ b/lib/libtriple/audio_td.cpp @@ -131,7 +131,7 @@ void cAudio::SetSyncMode(AVSYNC_TYPE /*Mode*/) void cAudio::SetStreamType(AUDIO_FORMAT type) { int bypass_disable; - fprintf(stderr, "cAudio::%s\n", __FUNCTION__); + lt_debug("cAudio::%s\n", __FUNCTION__); StreamType = type; if (StreamType != AUDIO_FMT_DOLBY_DIGITAL && StreamType != AUDIO_FMT_MPEG && StreamType != AUDIO_FMT_MPG1) @@ -172,7 +172,7 @@ int cAudio::StopClip() void cAudio::getAudioInfo(int &type, int &layer, int &freq, int &bitrate, int &mode) { - fprintf(stderr, "cAudio::%s\n", __FUNCTION__); + lt_debug("cAudio::%s\n", __FUNCTION__); unsigned int atype; static const int freq_mpg[] = {44100, 48000, 32000, 0}; static const int freq_ac3[] = {48000, 44100, 32000, 0}; diff --git a/lib/libtriple/video_td.cpp b/lib/libtriple/video_td.cpp index 8149deddf..718e696ae 100644 --- a/lib/libtriple/video_td.cpp +++ b/lib/libtriple/video_td.cpp @@ -620,26 +620,22 @@ void cVideo::routeVideo(int standby) to configure this, we can think more about this... */ if (standby) { - printf("[routeVideo] setting FASTBLANK to follow VCR SCART\n"); + printf("[%s] setting fastblank and pin8 to follow VCR SCART, route VCR to TV\n", __FUNCTION__); if (ioctl(avsfd, IOC_AVS_FASTBLANK_SET, (unsigned char)3) < 0) perror("IOC_AVS_FASTBLANK_SET, 3"); /* TODO: should probably depend on aspect ratio setting */ - printf("[routeVideo] setting SCART_PIN_8 to follow VCR SCART\n"); if (ioctl(avsfd, IOC_AVS_SCART_PIN8_FOLLOW_VCR) < 0) perror("IOC_AVS_SCART_PIN8_FOLLOW_VCR"); - printf("[routeVideo] routing VCR to TV SCART\n"); if (ioctl(avsfd, IOC_AVS_ROUTE_VCR2TV) < 0) perror("IOC_AVS_ROUTE_VCR2TV"); return; } unsigned char fblk = 1; - printf("[routeVideo] setting FASTBLANK to %d\n", fblk); + printf("[%s] setting fastblank to %d, pin8 to %dV, routing encoder to TV\n", __FUNCTION__, fblk, scartvoltage); if (ioctl(avsfd, IOC_AVS_FASTBLANK_SET, fblk) < 0) perror("IOC_AVS_FASTBLANK_SET, fblk"); - printf("[routeVideo] setting SCART_PIN_8 to %dV\n", scartvoltage); if (ioctl(avsfd, IOC_AVS_SCART_PIN8_SET, scartvoltage) < 0) perror("IOC_AVS_SCART_PIN8_SET"); - printf("[routeVideo] routing TV encoder to TV SCART\n"); if (ioctl(avsfd, IOC_AVS_ROUTE_ENC2TV) < 0) perror("IOC_AVS_ROUTE_ENC2TV"); close(avsfd);