This fixes the video4linux/video4linux2 debug output, which had one \n too much
Original commit message from CVS: This fixes the video4linux/video4linux2 debug output, which had one \n too much
This commit is contained in:
parent
cd4572dbed
commit
45f6a1c5f0
@ -17,8 +17,6 @@
|
|||||||
* Boston, MA 02111-1307, USA.
|
* Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*#define DEBUG */
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
@ -29,6 +27,11 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "v4l_calls.h"
|
#include "v4l_calls.h"
|
||||||
|
|
||||||
|
#define DEBUG(format, args...) \
|
||||||
|
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
||||||
|
GST_ELEMENT(v4lelement), \
|
||||||
|
"V4L-overlay: " format, ##args)
|
||||||
|
|
||||||
|
|
||||||
/******************************************************
|
/******************************************************
|
||||||
* gst_v4l_set_overlay():
|
* gst_v4l_set_overlay():
|
||||||
@ -42,10 +45,7 @@ gst_v4l_set_overlay (GstV4lElement *v4lelement,
|
|||||||
{
|
{
|
||||||
gchar *buff;
|
gchar *buff;
|
||||||
|
|
||||||
#ifdef DEBUG
|
DEBUG("setting display to '%s'", display);
|
||||||
fprintf(stderr, "V4L: gst_v4l_set_overlay(), display = \'%s\'\n", display);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
GST_V4L_CHECK_NOT_OPEN(v4lelement);
|
GST_V4L_CHECK_NOT_OPEN(v4lelement);
|
||||||
|
|
||||||
/* start v4l-conf */
|
/* start v4l-conf */
|
||||||
@ -104,11 +104,8 @@ gst_v4l_set_window (GstV4lElement *v4lelement,
|
|||||||
gint x, gint y,
|
gint x, gint y,
|
||||||
gint w, gint h)
|
gint w, gint h)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
DEBUG("setting video window to position (x,y/wxh) = %d,%d/%dx%d",
|
||||||
fprintf(stderr, "V4L: gst_v4l_set_window(), position (x,y/wxh) = %d,%d/%dx%d\n",
|
|
||||||
x, y, w, h);
|
x, y, w, h);
|
||||||
#endif
|
|
||||||
|
|
||||||
GST_V4L_CHECK_OVERLAY(v4lelement);
|
GST_V4L_CHECK_OVERLAY(v4lelement);
|
||||||
|
|
||||||
v4lelement->vwin.clipcount = 0;
|
v4lelement->vwin.clipcount = 0;
|
||||||
@ -133,10 +130,7 @@ gst_v4l_set_clips (GstV4lElement *v4lelement,
|
|||||||
struct video_clip *clips,
|
struct video_clip *clips,
|
||||||
gint num_clips)
|
gint num_clips)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
DEBUG("setting video window clips");
|
||||||
fprintf(stderr, "V4L: gst_v4l_set_clips()\n");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
GST_V4L_CHECK_OPEN(v4lelement);
|
GST_V4L_CHECK_OPEN(v4lelement);
|
||||||
GST_V4L_CHECK_OVERLAY(v4lelement);
|
GST_V4L_CHECK_OVERLAY(v4lelement);
|
||||||
|
|
||||||
@ -167,11 +161,7 @@ gst_v4l_enable_overlay (GstV4lElement *v4lelement,
|
|||||||
{
|
{
|
||||||
gint doit = enable?1:0;
|
gint doit = enable?1:0;
|
||||||
|
|
||||||
#ifdef DEBUG
|
DEBUG("%s overlay", enable?"enabling":"disabling");
|
||||||
fprintf(stderr, "V4L: gst_v4l_enable_overlay(), enable = %s\n",
|
|
||||||
enable?"true":"false");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
GST_V4L_CHECK_OPEN(v4lelement);
|
GST_V4L_CHECK_OPEN(v4lelement);
|
||||||
GST_V4L_CHECK_OVERLAY(v4lelement);
|
GST_V4L_CHECK_OVERLAY(v4lelement);
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#define DEBUG(format, args...) \
|
#define DEBUG(format, args...) \
|
||||||
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
||||||
GST_ELEMENT(v4lelement), \
|
GST_ELEMENT(v4lelement), \
|
||||||
"V4L: " format "\n", ##args)
|
"V4L: " format, ##args)
|
||||||
|
|
||||||
|
|
||||||
char *picture_name[] = { "Hue", "Brightness", "Contrast", "Saturation", NULL };
|
char *picture_name[] = { "Hue", "Brightness", "Contrast", "Saturation", NULL };
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#define DEBUG(format, args...) \
|
#define DEBUG(format, args...) \
|
||||||
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
||||||
GST_ELEMENT(v4lmjpegsink), \
|
GST_ELEMENT(v4lmjpegsink), \
|
||||||
"V4LMJPEGSINK: " format "\n", ##args)
|
"V4LMJPEGSINK: " format, ##args)
|
||||||
|
|
||||||
|
|
||||||
/******************************************************
|
/******************************************************
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#define DEBUG(format, args...) \
|
#define DEBUG(format, args...) \
|
||||||
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
||||||
GST_ELEMENT(v4lmjpegsrc), \
|
GST_ELEMENT(v4lmjpegsrc), \
|
||||||
"V4LMJPEGSRC: " format "\n", ##args)
|
"V4LMJPEGSRC: " format, ##args)
|
||||||
|
|
||||||
|
|
||||||
char *input_name[] = { "Composite", "S-Video", "TV-Tuner", "Autodetect" };
|
char *input_name[] = { "Composite", "S-Video", "TV-Tuner", "Autodetect" };
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
#define DEBUG(format, args...) \
|
#define DEBUG(format, args...) \
|
||||||
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \
|
||||||
GST_ELEMENT(v4lsrc), \
|
GST_ELEMENT(v4lsrc), \
|
||||||
"V4LSRC: " format "\n", ##args)
|
"V4LSRC: " format, ##args)
|
||||||
|
|
||||||
/* palette names */
|
/* palette names */
|
||||||
char *palette_name[] = {
|
char *palette_name[] = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user