Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/azatoth/minidlna.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Maggard <jmaggard@users.sourceforce.net>2012-03-08 22:09:54 +0400
committerJustin Maggard <jmaggard@users.sourceforce.net>2012-03-08 22:09:54 +0400
commit02bc88b56238ddfe2e1c16d0f9be606049b13c89 (patch)
tree9b1187331d9f57f3fbee869fdc862e8975f6214d
parentce504948ca1e0c9d6309a39ce01717ba5f5a60a1 (diff)
* Add a MAXDEBUG log level.
-rw-r--r--log.c1
-rw-r--r--log.h13
-rw-r--r--tagutils/tagutils-ogg.c26
3 files changed, 21 insertions, 19 deletions
diff --git a/log.c b/log.c
index 91aa564..a09e2cd 100644
--- a/log.c
+++ b/log.c
@@ -50,6 +50,7 @@ char *level_name[] = {
"warn", // E_WARN
"info", // E_INFO
"debug", // E_DEBUG
+ "maxdebug", // E_MAXDEBUG
0
};
diff --git a/log.h b/log.h
index 2cc0a53..0da691c 100644
--- a/log.h
+++ b/log.h
@@ -21,12 +21,13 @@
#ifndef __ERR_H__
#define __ERR_H__
-#define E_OFF 0
-#define E_FATAL 1
-#define E_ERROR 2
-#define E_WARN 3
-#define E_INFO 4
-#define E_DEBUG 5
+#define E_OFF 0
+#define E_FATAL 1
+#define E_ERROR 2
+#define E_WARN 3
+#define E_INFO 4
+#define E_DEBUG 5
+#define E_MAXDEBUG 6
enum _log_facility
{
diff --git a/tagutils/tagutils-ogg.c b/tagutils/tagutils-ogg.c
index 8a3396d..1a42547 100644
--- a/tagutils/tagutils-ogg.c
+++ b/tagutils/tagutils-ogg.c
@@ -106,17 +106,17 @@ _ogg_vorbis_process(ogg_stream_processor *stream, ogg_page *page,
{
if(ogg_page_granulepos(page) != 0 || ogg_stream_packetpeek(&stream->os, NULL) == 1)
DPRINTF(E_WARN, L_SCANNER, "No header in vorbis stream %d\n", stream->num);
- DPRINTF(E_DEBUG, L_SCANNER, "Vorbis headers parsed for stream %d, "
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Vorbis headers parsed for stream %d, "
"information follows...\n", stream->num);
- DPRINTF(E_DEBUG, L_SCANNER, "Channels: %d\n", inf->vi.channels);
- DPRINTF(E_DEBUG, L_SCANNER, "Rate: %ld\n\n", inf->vi.rate);
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Channels: %d\n", inf->vi.channels);
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Rate: %ld\n\n", inf->vi.rate);
psong->samplerate = inf->vi.rate;
psong->channels = inf->vi.channels;
if(inf->vi.bitrate_nominal > 0)
{
- DPRINTF(E_DEBUG, L_SCANNER, "Nominal bitrate: %f kb/s\n",
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Nominal bitrate: %f kb/s\n",
(double)inf->vi.bitrate_nominal / 1000.0);
psong->bitrate = inf->vi.bitrate_nominal / 1000;
}
@@ -124,7 +124,7 @@ _ogg_vorbis_process(ogg_stream_processor *stream, ogg_page *page,
{
int upper_rate, lower_rate;
- DPRINTF(E_DEBUG, L_SCANNER, "Nominal bitrate not set\n");
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Nominal bitrate not set\n");
//
upper_rate = 0;
@@ -132,24 +132,24 @@ _ogg_vorbis_process(ogg_stream_processor *stream, ogg_page *page,
if(inf->vi.bitrate_upper > 0)
{
- DPRINTF(E_DEBUG, L_SCANNER, "Upper bitrate: %f kb/s\n",
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Upper bitrate: %f kb/s\n",
(double)inf->vi.bitrate_upper / 1000.0);
upper_rate = inf->vi.bitrate_upper;
}
else
{
- DPRINTF(E_DEBUG, L_SCANNER, "Upper bitrate not set\n");
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Upper bitrate not set\n");
}
if(inf->vi.bitrate_lower > 0)
{
- DPRINTF(E_DEBUG, L_SCANNER, "Lower bitrate: %f kb/s\n",
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Lower bitrate: %f kb/s\n",
(double)inf->vi.bitrate_lower / 1000.0);
lower_rate = inf->vi.bitrate_lower;;
}
else
{
- DPRINTF(E_DEBUG, L_SCANNER, "Lower bitrate not set\n");
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Lower bitrate not set\n");
}
if(upper_rate && lower_rate)
@@ -163,7 +163,7 @@ _ogg_vorbis_process(ogg_stream_processor *stream, ogg_page *page,
}
if(inf->vc.comments > 0)
- DPRINTF(E_DEBUG, L_SCANNER,
+ DPRINTF(E_MAXDEBUG, L_SCANNER,
"User comments section follows...\n");
for(i = 0; i < inf->vc.comments; i++)
@@ -437,7 +437,7 @@ _get_oggfileinfo(char *filename, struct song_metadata *psong)
return -1;
}
- DPRINTF(E_INFO, L_SCANNER, "Processing file \"%s\"...\n\n", filename);
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Processing file \"%s\"...\n\n", filename);
ogg_sync_init(&sync);
@@ -482,7 +482,7 @@ _get_oggfileinfo(char *filename, struct song_metadata *psong)
if(p->isnew)
{
- DPRINTF(E_DEBUG, L_SCANNER, "New logical stream (#%d, serial: %08x): type %s\n",
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "New logical stream (#%d, serial: %08x): type %s\n",
p->num, p->serial, p->type);
if(!p->start)
DPRINTF(E_WARN, L_SCANNER,
@@ -514,7 +514,7 @@ _get_oggfileinfo(char *filename, struct song_metadata *psong)
{
if(p->process_end)
p->process_end(p, psong);
- DPRINTF(E_DEBUG, L_SCANNER, "Logical stream %d ended\n", p->num);
+ DPRINTF(E_MAXDEBUG, L_SCANNER, "Logical stream %d ended\n", p->num);
p->isillegal = 1;
p->constraint_violated = CONSTRAINT_PAGE_AFTER_EOS;
}