mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 15:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtriple: improve lt_debug

Browse Source 
* add current instance
* shorten lt_debug messages
This commit is contained in:
Stefan Seyfried
2011-10-02 21:48:41 +02:00
parent eff9a153df
commit dc5a44a365
9 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libtriple/audio_td.cpp
View File

@@ -9,8 +9,8 @@
#define AUDIO_DEVICE "/dev/" DEVICE_NAME_AUDIO
#include "audio_td.h"
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_AUDIO, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_AUDIO, args)
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_AUDIO, this, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_AUDIO, this, args)
#include <linux/soundcard.h>

4
libtriple/ca.cpp
View File

@@ -2,7 +2,7 @@
#include "ca.h"
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_CA, args)
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_CA, this, args)
static cCA *inst = NULL;
@@ -20,7 +20,7 @@ cCA::~cCA()
cCA *cCA::GetInstance()
{
lt_debug("%s\n", __FUNCTION__);
_lt_debug(TRIPLE_DEBUG_CA, NULL, "%s\n", __FUNCTION__);
if (inst == NULL)
inst = new cCA();

4
libtriple/dmx_td.cpp
View File

@@ -12,8 +12,8 @@
#include "dmx_td.h"
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, args)
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, this, args)
cDemux *videoDemux = NULL;
cDemux *audioDemux = NULL;

4
libtriple/init_td.cpp
View File

@@ -17,8 +17,8 @@ extern "C" {
}
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_INIT, args)
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_INIT, NULL, args)
static bool initialized = false;

11
libtriple/lt_debug.cpp
View File

@@ -12,17 +12,18 @@ static const char* lt_facility[] = {
"audio ",
"video ",
"demux ",
"record",
"play ",
"power ",
"init ",
"ca ",
"record",
NULL
};
void _lt_info(int facility, const char *fmt, ...)
void _lt_info(int facility, const void *func, const char *fmt, ...)
{
fprintf(stderr, "[libtriple:%s] ", lt_facility[facility]);
/* %p does print "(nil)" instead of 0x00000000 for NULL */
fprintf(stderr, "[LT:%08lx:%s] ", (long) func, lt_facility[facility]);
va_list args;
va_start(args, fmt);
vfprintf(stderr, fmt, args);
@@ -30,7 +31,7 @@ void _lt_info(int facility, const char *fmt, ...)
}
void _lt_debug(int facility, const char *fmt, ...)
void _lt_debug(int facility, const void *func, const char *fmt, ...)
{
if (debuglevel < 0)
fprintf(stderr, "lt_debug: debuglevel not initialized!\n");
@@ -38,7 +39,7 @@ void _lt_debug(int facility, const char *fmt, ...)
if (! ((1 << facility) & debuglevel))
return;
fprintf(stderr, "[libtriple:%s] ", lt_facility[facility]);
fprintf(stderr, "[LT:%08lx:%s] ", (long)func, lt_facility[facility]);
va_list args;
va_start(args, fmt);
vfprintf(stderr, fmt, args);

14
libtriple/lt_debug.h
View File

@@ -4,16 +4,16 @@
#define TRIPLE_DEBUG_AUDIO 0
#define TRIPLE_DEBUG_VIDEO 1
#define TRIPLE_DEBUG_DEMUX 2
#define TRIPLE_DEBUG_RECORD 3
#define TRIPLE_DEBUG_PLAYBACK 4
#define TRIPLE_DEBUG_PWRMNGR 5
#define TRIPLE_DEBUG_INIT 6
#define TRIPLE_DEBUG_CA 7
#define TRIPLE_DEBUG_PLAYBACK 3
#define TRIPLE_DEBUG_PWRMNGR 4
#define TRIPLE_DEBUG_INIT 5
#define TRIPLE_DEBUG_CA 6
#define TRIPLE_DEBUG_RECORD 7
#define TRIPLE_DEBUG_ALL ((1<<8)-1)
extern int debuglevel;
void _lt_debug(int facility, const char *fmt, ...);
void _lt_info(int facility, const char *fmt, ...);
void _lt_debug(int facility, const void *, const char *fmt, ...);
void _lt_info(int facility, const void *, const char *fmt, ...);
void lt_debug_init(void);
#endif

9
libtriple/playback_td.cpp
View File

@@ -11,8 +11,9 @@
#include "audio_td.h"
#include "video_td.h"
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_PLAYBACK, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_PLAYBACK, args)
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_PLAYBACK, this, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_PLAYBACK, this, args)
#define lt_info_c(args...) _lt_info(TRIPLE_DEBUG_PLAYBACK, NULL, args)
#include <tddevices.h>
#define DVR "/dev/" DEVICE_NAME_PVR
@@ -345,7 +346,7 @@ void cPlayback::playthread(void)
static void playthread_cleanup_handler(void *)
{
lt_info("%s\n", __FUNCTION__);
lt_info_c("%s\n", __FUNCTION__);
ioctl(audioDemux->getFD(), DEMUX_SELECT_SOURCE, INPUT_FROM_CHANNEL0);
audioDemux->Stop();
videoDemux->Stop();
@@ -1456,7 +1457,7 @@ static int mp_syncPES(uint8_t *buf, int len, bool quiet)
}
if (!quiet && len > 5) /* only warn if enough space was available... */
lt_info("%s No valid PES signature found. %d Bytes deleted.\n", __FUNCTION__, ret);
lt_info_c("%s No valid PES signature found. %d Bytes deleted.\n", __FUNCTION__, ret);
return -1;
}

2
libtriple/pwrmngr.cpp
View File

@@ -10,7 +10,7 @@
#include <avs/avs_inf.h>
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_PWRMNGR, args)
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_PWRMNGR, this, args)
void cCpuFreqManager::Up(void) { lt_debug("%s\n", __FUNCTION__); }
void cCpuFreqManager::Down(void) { lt_debug("%s\n", __FUNCTION__); }
void cCpuFreqManager::Reset(void) { lt_debug("%s\n", __FUNCTION__); }

4
libtriple/video_td.cpp
View File

@@ -37,8 +37,8 @@
#include <hardware/tddevices.h>
#define VIDEO_DEVICE "/dev/" DEVICE_NAME_VIDEO
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_VIDEO, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_VIDEO, args)
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_VIDEO, this, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_VIDEO, this, args)
#define fop(cmd, args...) ({ \
int _r; \