[libvidcap-commit] SF.net SVN: libvidcap: [41] trunk

[libvidcap c. m. <lib...@li...>]

Revision: 41
          http://libvidcap.svn.sourceforge.net/libvidcap/?rev=41&view=rev
Author:   jpgrayson
Date:     2007-10-06 12:43:23 -0700 (Sat, 06 Oct 2007)

Log Message:
-----------
Add vidcap_log_level_set() function to the api.
Set the default log level to VIDCAP_LOG_INFO.
Change some quicktime messages to debug level.

Modified Paths:
--------------
    trunk/include/vidcap/vidcap.h
    trunk/src/logging.c
    trunk/src/quicktime/sg_source.c
    trunk/src/sapi_qt.c
    trunk/src/vidcap.c

Modified: trunk/include/vidcap/vidcap.h
===================================================================
--- trunk/include/vidcap/vidcap.h	2007-10-06 19:10:17 UTC (rev 40)
+++ trunk/include/vidcap/vidcap.h	2007-10-06 19:43:23 UTC (rev 41)
@@ -38,6 +38,14 @@
 	VIDCAP_FOURCC_RGB32  = 102,
 };
 
+enum vidcap_log_level {
+	VIDCAP_LOG_NONE  = 0,
+	VIDCAP_LOG_ERROR = 10,
+	VIDCAP_LOG_WARN  = 20,
+	VIDCAP_LOG_INFO  = 30,
+	VIDCAP_LOG_DEBUG = 40
+};
+
 typedef void vidcap_state;
 typedef void vidcap_sapi;
 typedef void vidcap_src;
@@ -83,6 +91,9 @@
 vidcap_destroy(vidcap_state *);
 
 int
+vidcap_log_level_set(enum vidcap_log_level level);
+
+int
 vidcap_sapi_enumerate(vidcap_state *,
 		int index,
 		struct vidcap_sapi_info *);

Modified: trunk/src/logging.c
===================================================================
--- trunk/src/logging.c	2007-10-06 19:10:17 UTC (rev 40)
+++ trunk/src/logging.c	2007-10-06 19:43:23 UTC (rev 41)
@@ -38,7 +38,7 @@
 
 static FILE * logging_file = 0;
 
-static enum log_level logging_level = log_level_debug;
+static enum log_level logging_level = log_level_info;
 
 static void do_log(enum log_level level, const char * fmt, va_list ap)
 {

Modified: trunk/src/quicktime/sg_source.c
===================================================================
--- trunk/src/quicktime/sg_source.c	2007-10-06 19:10:17 UTC (rev 40)
+++ trunk/src/quicktime/sg_source.c	2007-10-06 19:43:23 UTC (rev 41)
@@ -149,7 +149,7 @@
 
 		src->native_pixel_format = (*compression_list)->cType;
 
-		log_info("native pixel format %c%c%c%c\n",
+		log_debug("native pixel format %c%c%c%c\n",
 				(char)(src->native_pixel_format >> 24),
 				(char)(src->native_pixel_format >> 16),
 				(char)(src->native_pixel_format >> 8),

Modified: trunk/src/sapi_qt.c
===================================================================
--- trunk/src/sapi_qt.c	2007-10-06 19:10:17 UTC (rev 40)
+++ trunk/src/sapi_qt.c	2007-10-06 19:43:23 UTC (rev 41)
@@ -202,7 +202,7 @@
 	}
 
 	if ( qt_src_ctx->frame_count == 1 )
-		log_info("capture time: %c%c%c%c  %s  %s  %s\n",
+		log_debug("capture time: %c%c%c%c  %s  %s  %s\n",
 				(char)(pixel_format >> 24),
 				(char)(pixel_format >> 16),
 				(char)(pixel_format >> 8),
@@ -287,7 +287,7 @@
 		return -1;
 	}
 
-	log_info("setup decomp: %c%c%c%c  %s  %s  %s\n",
+	log_debug("setup decomp: %c%c%c%c  %s  %s  %s\n",
 			(char)(pixel_format >> 24),
 			(char)(pixel_format >> 16),
 			(char)(pixel_format >> 8),

Modified: trunk/src/vidcap.c
===================================================================
--- trunk/src/vidcap.c	2007-10-06 19:10:17 UTC (rev 40)
+++ trunk/src/vidcap.c	2007-10-06 19:43:23 UTC (rev 41)
@@ -133,6 +133,36 @@
 }
 
 int
+vidcap_log_level_set(enum vidcap_log_level level)
+{
+	int log_level;
+
+	switch ( level )
+	{
+	case VIDCAP_LOG_NONE:
+		log_level = log_level_none;
+		break;
+	case VIDCAP_LOG_ERROR:
+		log_level = log_level_error;
+		break;
+	case VIDCAP_LOG_WARN:
+		log_level = log_level_warn;
+		break;
+	case VIDCAP_LOG_INFO:
+		log_level = log_level_info;
+		break;
+	case VIDCAP_LOG_DEBUG:
+		log_level = log_level_debug;
+	default:
+		return -1;
+	}
+
+	log_level_set(log_level);
+
+	return 0;
+}
+
+int
 vidcap_sapi_enumerate(vidcap_state * state,
 		int index,
 		struct vidcap_sapi_info * sapi_info)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.